diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..984e2d8c2
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,17 @@
+# minified
+*.min.js
+
+# test
+*actual*
+*expected*
+input.js
+
+# generated
+*dist*
+*generated*
+*.marko.js
+*.marko.*.js
+*.html.js
+~vdom.skip
+
+node_modules
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 000000000..c3c29e51a
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,14 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "prettier"
+  ],
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "globals": {
+    "document": true,
+    "ShadowRoot": true
+  }
+}
\ No newline at end of file
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 24408f9b2..43a80c9b1 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -3,20 +3,20 @@
 This project adheres to the [eBay Code of Conduct](http://ebay.github.io/codeofconduct).
 By participating in this project you agree to abide by its terms.
 
-- Be friendly and patient.
+* Be friendly and patient.
 
-- Be welcoming: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
+* Be welcoming: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
 
-- Be considerate: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we’re a world-wide community, so you might not be communicating in someone else’s primary language.
+* Be considerate: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we’re a world-wide community, so you might not be communicating in someone else’s primary language.
 
-- Be respectful: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
+* Be respectful: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
 
-- Be careful in the words that we choose: we are a community of professionals, and we conduct ourselves professionally.
+* Be careful in the words that we choose: we are a community of professionals, and we conduct ourselves professionally.
 
-- Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren’t acceptable.
+* Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren’t acceptable.
 
-- Try to understand why we disagree: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively.
+* Try to understand why we disagree: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively.
 
-- Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
+* Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
 
 Please visit http://ebay.github.io/codeofconduct for the full code of conduct.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ef3f4a9e5..15a11baf3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -10,9 +10,10 @@
 
 ## I just have a question
 
-Before you ask, check our [existing questions](https://github.com/marko-js/marko/issues?page=2&q=is%3Aissue+label%3Atype%3Aquestion&utf8=%E2%9C%93) to see if your question has already been answered.  If not, go ahead an open an issue or join us in [gitter](https://gitter.im/marko-js/marko) to ask a question.
+Before you ask, check our [existing questions](https://github.com/marko-js/marko/issues?page=2&q=is%3Aissue+label%3Atype%3Aquestion&utf8=%E2%9C%93) to see if your question has already been answered. If not, go ahead an open an issue or join us in [gitter](https://gitter.im/marko-js/marko) to ask a question.
 
 Please be sure to use [markdown code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/) when posting code on GitHub or Gitter:
+
 ````
 ```marko
 <div>some marko ${code}</div>
@@ -29,25 +30,27 @@ Not sure if that typo is worth a pull request? Found a bug and know how to fix i
 
 We are always thrilled to receive pull requests. We do our best to process them quickly. If your pull request is not accepted on the first try, don't get discouraged! We'll work with you to come to an acceptable solution.
 
-Prior to merging your PR, you will need to sign the [JS Foundation CLA](https://cla.js.foundation/marko-js/marko).  It's pretty straight-forward and only takes a minute.  You can even sign it now if you're thinking about contributing.
+Prior to merging your PR, you will need to sign the [JS Foundation CLA](https://cla.js.foundation/marko-js/marko). It's pretty straight-forward and only takes a minute. You can even sign it now if you're thinking about contributing.
 
 > **TIP:** If you're new to GitHub or open source you can check out this [free course](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github) on how to contribute to an open source project.
 
 ### Running tests
 
 Before submitting your PR, make sure that all new and previous tests pass and that [coverage](https://coveralls.io/github/marko-js/marko?branch=master) has not decreased:
+
 ```
 npm run test-coverage
 ```
 
 While developing you can run a single test group and use [grep](https://mochajs.org/#-g---grep-pattern) to filter the tests:
+
 ```
 npm run mocha -- --grep=lifecycle
 ```
 
 ### Adding tests
 
-Marko makes use of directory based test suites.  Take a look at the `render` test suite:
+Marko makes use of directory based test suites. Take a look at the `render` test suite:
 
 <pre>
 <a href="../test/">test/</a>
@@ -66,15 +69,16 @@ Marko makes use of directory based test suites.  Take a look at the `render` tes
 The `html.test.js` file will run and read all the directories under `render/fixtures` and for each directory (`attrs`, `for-tag`, etc.) it will run `test.js`, render `template.marko` and assert that it is equivalent to the content of `expected.html`.
 
 To add a new test, you'll find the appropriate test suite, copy a fixture, and modify it to add the new test.
+
 #### Skipping a test
 
-A few of the tests suites use the same fixtures for multiple test scenarios.  For example, the `component-browser` tests run once rendering the component in a browser environment and a second time rendering in a server environment, then hydrating in the browser.
+A few of the tests suites use the same fixtures for multiple test scenarios. For example, the `component-browser` tests run once rendering the component in a browser environment and a second time rendering in a server environment, then hydrating in the browser.
 
-For some tests, it might be necessary to skip the test in one of these scenarios.  This is done by exporting a `skipHydrate`  (or similiarly named) property from the fixture.  The value of the property should be a string explaining why the test is skipped.
+For some tests, it might be necessary to skip the test in one of these scenarios. This is done by exporting a `skipHydrate` (or similiarly named) property from the fixture. The value of the property should be a string explaining why the test is skipped.
 
 #### Adding a failing test case
 
-If you've discovered an issue and are able to reproduce it, but don't have a fix, consider submitting a PR with a failing test case.  You can mark a fixture as expected to fail by appending `.fails` to the directory name:
+If you've discovered an issue and are able to reproduce it, but don't have a fix, consider submitting a PR with a failing test case. You can mark a fixture as expected to fail by appending `.fails` to the directory name:
 
 ```
 ⤷ fixtures/
@@ -87,7 +91,8 @@ Expected failures won't cause [Travis CI](https://travis-ci.org/marko-js/marko)
 
 ### Debugging tests
 
-If you need to dig a bit deeper into a failing test, use the `--inspect-brk` flag, open Chrome DevTools, and click on the green nodejs icon (<img height="16" src="https://user-images.githubusercontent.com/1958812/37050480-d53e4276-2128-11e8-8c7a-f5d842956c98.png"/>) to start debugging.  Learn more about [debugging node](https://www.youtube.com/watch?v=Xb_0awoShR8&t=103s) from this video.
+If you need to dig a bit deeper into a failing test, use the `--inspect-brk` flag, open Chrome DevTools, and click on the green nodejs icon (<img height="16" src="https://user-images.githubusercontent.com/1958812/37050480-d53e4276-2128-11e8-8c7a-f5d842956c98.png"/>) to start debugging. Learn more about [debugging node](https://www.youtube.com/watch?v=Xb_0awoShR8&t=103s) from this video.
+
 ```
 npm run mocha -- --grep=test-name --inspect-brk
 ```
@@ -101,9 +106,9 @@ $ debugger;
 
 ### Updating snapshots
 
-A number of the test suites make use snapshot comparisons.  For example, the `render` tests compare the rendered html against a stored snapshot.  Similarly, the `compiler` tests compare the generated JavaScript module againt a stored snapshot.  Any changes compared to the snapshot should be looked at closely, but there are some cases where it is fine that the output has changed and the snapshot needs to be updated.
+A number of the test suites make use snapshot comparisons. For example, the `render` tests compare the rendered html against a stored snapshot. Similarly, the `compiler` tests compare the generated JavaScript module againt a stored snapshot. Any changes compared to the snapshot should be looked at closely, but there are some cases where it is fine that the output has changed and the snapshot needs to be updated.
 
-To update a snapshot, you can copy the contents from the `actual` file to the `expected` file in the fixture directory.  You can also use the `UPDATE_EXPECTATIONS` env variable to cause the test runner to update the `expected` file for all currently failing tests in a suite:
+To update a snapshot, you can copy the contents from the `actual` file to the `expected` file in the fixture directory. You can also use the `UPDATE_EXPECTATIONS` env variable to cause the test runner to update the `expected` file for all currently failing tests in a suite:
 
 ```
 UPDATE_EXPECTATIONS=1 npm run mocha
@@ -115,17 +120,17 @@ Comment on the issue and let us know you'd like to tackle it. If for some reason
 
 Here's some to get started with:
 
-- [good first issue](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22): great for new contributors
-- [help wanted](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) issues: won't be tackled in the near future by the maintainers... we need your help!
-- [unassigned](https://github.com/marko-js/marko/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20no%3Aassignee%20) issues: open issues that no one has claimed... yet
+* [good first issue](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22): great for new contributors
+* [help wanted](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) issues: won't be tackled in the near future by the maintainers... we need your help!
+* [unassigned](https://github.com/marko-js/marko/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20no%3Aassignee%20) issues: open issues that no one has claimed... yet
 
 ## Reporting bugs and other issues
 
-A great way to contribute to the project is to send a detailed report when you encounter an issue.  Even better: submit a PR with a failing test case ([see how](#adding-a-failing-test-case)).
+A great way to contribute to the project is to send a detailed report when you encounter an issue. Even better: submit a PR with a failing test case ([see how](#adding-a-failing-test-case)).
 
-Check that [our issue database](https://github.com/marko-js/marko/issues) doesn't already include that problem or suggestion before submitting an issue. If you find a match, you can use the "subscribe" button to get notified on updates. Rather than leaving a "+1" or "I have this too" comment, you can add a  [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)  to let us know that this is also affecting you without cluttering the conversation. However, if you have ways to reproduce the issue or have additional information that may help resolving the issue, please leave a comment.
+Check that [our issue database](https://github.com/marko-js/marko/issues) doesn't already include that problem or suggestion before submitting an issue. If you find a match, you can use the "subscribe" button to get notified on updates. Rather than leaving a "+1" or "I have this too" comment, you can add a [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) to let us know that this is also affecting you without cluttering the conversation. However, if you have ways to reproduce the issue or have additional information that may help resolving the issue, please leave a comment.
 
-We have an [ISSUE_TEMPLATE](ISSUE_TEMPLATE.md) that will populate your textarea  when you go to open an issue.  Use the relevant section and remove the rest.
+We have an [ISSUE_TEMPLATE](ISSUE_TEMPLATE.md) that will populate your textarea when you go to open an issue. Use the relevant section and remove the rest.
 
 Please provide as much detail as possible.
 
@@ -140,6 +145,7 @@ Security reports are greatly appreciated and we will publicly thank you for it.
 Once you post an issue, a maintainer will add one or more labels to it. Below is a guideline for the maintainers and anyone else who is interested in what the various labels mean.
 
 ### Type
+
 ![](https://img.shields.io/badge/type-bug-dd0000.svg)
 ![](https://img.shields.io/badge/type-unverified%20bug-aa3300.svg)
 ![](https://img.shields.io/badge/type-feature-0099dd.svg)
@@ -150,15 +156,16 @@ Once you post an issue, a maintainer will add one or more labels to it. Below is
 
 Every issue should be assigned one of these.
 
-- **bug**: A bug report
-- **unverified-bug**: A bug report that has not been verified
-- **feature**: A feature request
-- **question**: A question about how to do something in Marko
-- **community**: Related to community building, improving the contribution process, etc.
-- **tech debt**: Related to refactoring code, test structure, etc.
-- **docs**: Related to documentation/website
+* **bug**: A bug report
+* **unverified-bug**: A bug report that has not been verified
+* **feature**: A feature request
+* **question**: A question about how to do something in Marko
+* **community**: Related to community building, improving the contribution process, etc.
+* **tech debt**: Related to refactoring code, test structure, etc.
+* **docs**: Related to documentation/website
 
 ### Scope
+
 ![](https://img.shields.io/badge/scope-parser-5500cc.svg)
 ![](https://img.shields.io/badge/scope-compiler-cc0077.svg)
 ![](https://img.shields.io/badge/scope-runtime-eebb00.svg)
@@ -168,47 +175,51 @@ Every issue should be assigned one of these.
 
 What part of the Marko stack does this issue apply to? In most cases there should only be one of these.
 
-- **parser**: Relates to [`htmljs-parser`](https://github.com/marko-js/htmljs-parser)
-- **compiler**: Relates to the [compiler](../src/compiler) (server only)
-- **runtime**: Relates to the [runtime](../src/runtime) (isomorphic/universal)
-- **core-taglib**: Relates to [custom tags](../src/taglib) that ship with Marko
-- **components**: Relates to [components](../src/components)
-- **tools**: Relates to editor plugins, commandline tools, etc.
+* **parser**: Relates to [`htmljs-parser`](https://github.com/marko-js/htmljs-parser)
+* **compiler**: Relates to the [compiler](../src/compiler) (server only)
+* **runtime**: Relates to the [runtime](../src/runtime) (isomorphic/universal)
+* **core-taglib**: Relates to [custom tags](../src/taglib) that ship with Marko
+* **components**: Relates to [components](../src/components)
+* **tools**: Relates to editor plugins, commandline tools, etc.
 
 ### Status
+
 ![](https://img.shields.io/badge/status-backlog-223344.svg)
 ![](https://img.shields.io/badge/status-in%20progress-006b75.svg)
 ![](https://img.shields.io/badge/status-needs%20review-0e8a16.svg)
 
-In many cases, additional *actions* should be taken when applying one of these.
+In many cases, additional _actions_ should be taken when applying one of these.
 
-- **backlog**: Tasks planned to be worked on
-- **in progress**: This is currently being worked on.
-- **needs review**: This issue needs to be followed up on.
+* **backlog**: Tasks planned to be worked on
+* **in progress**: This is currently being worked on.
+* **needs review**: This issue needs to be followed up on.
 
 ### Reason closed
+
 ![](https://img.shields.io/badge/reason%20closed-resolved-99cc99.svg)
 ![](https://img.shields.io/badge/reason%20closed-duplicate-cc99cc.svg)
 ![](https://img.shields.io/badge/reason%20closed-declined-bb6666.svg)
 ![](https://img.shields.io/badge/reason%20closed-not%20a%20bug-997744.svg)
 ![](https://img.shields.io/badge/reason%20closed-inactivity-bfd4f2.svg)
 ![](https://img.shields.io/badge/reason%20closed-no%20issue-c5def5.svg)
-- **resolved**: The question was answered, the bug was fixed, or the feature was implemented. 
-- **duplicate**: Someone has already posted the same or a very similar issue.  A comment should be added that references the original issue.
-- **declined**: This feature will not be implemented.  
-- **not a bug**: This is not a bug, but either user error or intended behavior.
-- **inactivity**: There was not enough info to reproduce the bug or not enough interest in the feature to hash out an implementation plan and the conversation has stalled.
-- **no issue**: This wasn't so much an issue as a comment
+
+* **resolved**: The question was answered, the bug was fixed, or the feature was implemented.
+* **duplicate**: Someone has already posted the same or a very similar issue. A comment should be added that references the original issue.
+* **declined**: This feature will not be implemented.
+* **not a bug**: This is not a bug, but either user error or intended behavior.
+* **inactivity**: There was not enough info to reproduce the bug or not enough interest in the feature to hash out an implementation plan and the conversation has stalled.
+* **no issue**: This wasn't so much an issue as a comment
 
 ### Other
+
 ![](https://img.shields.io/badge/-good%20first%20issue-00cccc.svg)
 ![](https://img.shields.io/badge/-help%20wanted-33cc88.svg)
 ![](https://img.shields.io/badge/-blocked-6b0c0c.svg)
 ![](https://img.shields.io/badge/-needs%20more%20info-dd9944.svg)
 ![](https://img.shields.io/badge/-user%20land-e8c9c9.svg)
 
-- **good first issue**: Small tasks that would be good for first time contributors.
-- **help wanted**: Not on the roadmap, but we'd love for someone in the community to tackle it.
-- **blocked**: Cannot be completed until something else happens first.  This should be described in a comment with a link to the blocking issue.
-- **needs more info**: The original poster needs to provide more information before action can be taken.
-- **user land**: Something that probably won't be added to core, but could be implemented/proved out as a separate module.
+* **good first issue**: Small tasks that would be good for first time contributors.
+* **help wanted**: Not on the roadmap, but we'd love for someone in the community to tackle it.
+* **blocked**: Cannot be completed until something else happens first. This should be described in a comment with a link to the blocking issue.
+* **needs more info**: The original poster needs to provide more information before action can be taken.
+* **user land**: Something that probably won't be added to core, but could be implemented/proved out as a separate module.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 435d3a815..3c355c6a4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,40 +1,52 @@
 <!-----------------------------------------------------------------------
   |     IF BUG REPORT  (skip to next section for feature suggestion)    |
   ----------------------------------------------------------------------->
+
 ## Bug Report
 
 ### Marko Version: x.x.x
+
 <!--- Provide the exact version of marko in which you see the bug.  You can run `npm ls marko` to see this. -->
 
 ### Details
+
 <!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug.  How has this bug affected you? What were you trying to accomplish? -->
 
 ### Expected Behavior
+
 <!--- Tell us what should happen -->
 
 ### Actual Behavior
+
 <!--- Tell us what happens instead -->
 
 ### Possible Fix
+
 <!--- Not obligatory, but suggest a fix or reason for the bug -->
 
 <details><summary>Additional Info</summary>
 
 ### Your Environment
+
 <!-- Include as many relevant details about the environment you experienced the bug in -->
+
 * Environment name and version (e.g. Chrome 39, node.js 5.4):
 * Operating System and version (desktop or mobile):
 * Link to your project:
 
 ### Steps to Reproduce
+
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
+
 <!--- reproduce this bug include code to reproduce, if relevant -->
-1. 
-2. 
-3. 
-4. 
+
+1.  first...
+2.
+3.
+4.
 
 ### Stack Trace
+
 <!-- If an error is thrown, provide the stack trace here -->
 
 </details>
@@ -42,18 +54,25 @@
 <!--------------------------------
   |     IF FEATURE SUGGESTION    |
   -------------------------------->
+
 ## New Feature
 
 ### Description
+
 <!--- Provide a detailed description of the change or addition you are proposing -->
 
 ### Why
+
 <!--- Why is this change important to you? How would you use it? -->
+
 <!--- How can it benefit other users? -->
 
 ### Possible Implementation & Open Questions
+
 <!--- Not obligatory, but suggest an idea for implementing addition or change -->
+
 <!--- What still needs to be discussed -->
 
 ### Is this something you're interested in working on?
+
 <!--- Yes or no -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9cf1e68f6..7ce32087b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,21 +1,27 @@
 <!--- Provide a general summary of your changes in the Title above -->
 
 ## Description
+
 <!--- Describe your changes in detail -->
 
 ## Motivation and Context
+
 <!--- Why is this change required? What problem does it solve? -->
+
 <!--- If it fixes an open issue, please link to the issue here. -->
 
 ## Screenshots (if appropriate):
 
 ## Checklist:
+
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project.
-- [ ] I have updated/added documentation affected by my changes.
-- [ ] I have read the **CONTRIBUTING** document.
-- [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
+
+* [ ] My code follows the code style of this project.
+* [ ] I have updated/added documentation affected by my changes.
+* [ ] I have read the **CONTRIBUTING** document.
+* [ ] I have added tests to cover my changes.
+* [ ] All new and existing tests passed.
 
 _Disclaimer: Contributions via GitHub pull requests are gladly accepted from their original author. Along with any pull requests, please state that the contribution is your original work and that you license the work to the project under the project's open source license. Whether or not you state this explicitly, by submitting any copyrighted material via pull request, email, or other means you agree to license the material under the project's open source license and warrant that you have the legal authority to do so._
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 0c81e9505..000000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/taglibs/async/client-reorder-runtime.js
-/src/taglibs/async/client-reorder-runtime.min.js
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index f7e99cfc4..000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "predef": [
-        "document",
-        "ShadowRoot"
-    ],
-    "node" : true,
-    "esnext": true,
-    "boss" : false,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "eqeqeq": true,
-    "evil": true,
-    "forin": false,
-    "immed": true,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": false,
-    "white": false,
-    "eqeqeq": false,
-    "latedef": "func",
-    "unused": "vars",
-    "strict": false,
-    "eqnull": true
-}
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..5a531e2ac
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,22 @@
+# minfied
+*.min.js
+
+# tests
+*actual*
+*expected*
+input.*
+
+# generated
+/dist/
+/test-dist/
+/test-generated/
+*.marko.js
+*.html.js
+*.xml.js
+*.generated.js
+.nyc_output
+coverage
+
+# controlled by npm's formatter
+package-lock.json
+package.json
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4019920c..fa303dc34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
-Changelog
-=========
+# Changelog
 
 # 4.x
 
@@ -7,411 +6,410 @@ Changelog
 
 ### 4.9.0
 
-- Fixes related to hydration, split components, and the legacy compatibility layer [#1010](https://github.com/marko-js/marko/pull/1010)
+* Fixes related to hydration, split components, and the legacy compatibility layer [#1010](https://github.com/marko-js/marko/pull/1010)
 
-- Fix paths for vdom dependencies [#1011](https://github.com/marko-js/marko/pull/1011)
+* Fix paths for vdom dependencies [#1011](https://github.com/marko-js/marko/pull/1011)
 
 ## 4.8.x
 
 ### 4.8.0
 
-- Add `once-[event]` directive [#990](https://github.com/marko-js/marko/pull/990)
+* Add `once-[event]` directive [#990](https://github.com/marko-js/marko/pull/990)
 
-- Improve testing setup [#989](https://github.com/marko-js/marko/pull/989)
+* Improve testing setup [#989](https://github.com/marko-js/marko/pull/989)
 
 ## 4.7.x
 
 ### 4.7.5
 
-- Update docs for advanced attribute definition [#968](https://github.com/marko-js/marko/pull/968)
+* Update docs for advanced attribute definition [#968](https://github.com/marko-js/marko/pull/968)
 
-- Improve error message for async rendering [#958](https://github.com/marko-js/marko/pull/958)
+* Improve error message for async rendering [#958](https://github.com/marko-js/marko/pull/958)
 
 ### 4.7.4
 
-- Make jQuery optional for legacy components [#951](https://github.com/marko-js/marko/pull/951)
+* Make jQuery optional for legacy components [#951](https://github.com/marko-js/marko/pull/951)
 
 ### 4.7.3
 
-- Prevent onRender running on the server for legacy widgets
+* Prevent onRender running on the server for legacy widgets
 
 ### 4.7.2
 
-- Fixes [#946](https://github.com/marko-js/marko/issues/946) - don't put legacy init code in a separate lasso bundle
+* Fixes [#946](https://github.com/marko-js/marko/issues/946) - don't put legacy init code in a separate lasso bundle
 
-- Fixes allowing conditionally binding to different roots in a legacy widget [#944](https://github.com/marko-js/marko/pull/944)
+* Fixes allowing conditionally binding to different roots in a legacy widget [#944](https://github.com/marko-js/marko/pull/944)
 
 ### 4.7.1
 
-- Fix issue with multiple top level elements being removed twice. [#940](https://github.com/marko-js/marko/pull/940)
+* Fix issue with multiple top level elements being removed twice. [#940](https://github.com/marko-js/marko/pull/940)
 
 ### 4.7.0
 
-- Add jQuery legacy compatibility layer support [#937](https://github.com/marko-js/marko/pull/937)
+* Add jQuery legacy compatibility layer support [#937](https://github.com/marko-js/marko/pull/937)
 
-- Reorganize Marko tests [#934](https://github.com/marko-js/marko/pull/934)
+* Reorganize Marko tests [#934](https://github.com/marko-js/marko/pull/934)
 
-- Switch to using jsdom in test suite [#935](https://github.com/marko-js/marko/pull/935)
+* Switch to using jsdom in test suite [#935](https://github.com/marko-js/marko/pull/935)
 
-- Decouple component hydration from Lasso [#929](https://github.com/marko-js/marko/pull/929)
+* Decouple component hydration from Lasso [#929](https://github.com/marko-js/marko/pull/929)
 
 ## 4.6.x
 
 ### 4.6.0
 
-- Fixes [#914](https://github.com/marko-js/marko/issues/914) and [#920](https://github.com/marko-js/marko/issues/920) -
-Resolves top-level component bugs
+* Fixes [#914](https://github.com/marko-js/marko/issues/914) and [#920](https://github.com/marko-js/marko/issues/920) -
+  Resolves top-level component bugs
 
-- Setup `marko.load()` to prefer precompiled templates from [marko-cli](https://github.com/marko-js/marko-cli)
+* Setup `marko.load()` to prefer precompiled templates from [marko-cli](https://github.com/marko-js/marko-cli)
 
-- Various compiler changes to improve [marko-migrate](https://github.com/marko-js/marko-migrate)
+* Various compiler changes to improve [marko-migrate](https://github.com/marko-js/marko-migrate)
 
-- Fixes [#916](https://github.com/marko-js/marko/pull/916) - Add Marko debug mode.
-Adds babel plugin to remove and statically evaluate 'MARKO_DEBUG' literals for
-adding deprecation warnings and hints for the runtime without a performance
-penalty for production builds.
+* Fixes [#916](https://github.com/marko-js/marko/pull/916) - Add Marko debug mode.
+  Adds babel plugin to remove and statically evaluate 'MARKO_DEBUG' literals for
+  adding deprecation warnings and hints for the runtime without a performance
+  penalty for production builds.
 
 ## 4.5.x
 
 ### 4.5.6
 
-- Fixes [#909](https://github.com/marko-js/marko/issues/909) - Fix condition preventing bubbling DOM events from properly being attached to a component.
+* Fixes [#909](https://github.com/marko-js/marko/issues/909) - Fix condition preventing bubbling DOM events from properly being attached to a component.
 
 ### 4.5.5
 
-- Add 10 Awesome Marko Features article to documentation
+* Add 10 Awesome Marko Features article to documentation
 
 ### 4.5.4
 
-- Fixes [#904](https://github.com/marko-js/marko/issues/904) - The loop status variable is not compiling when the equal sign is padded in spacing
+* Fixes [#904](https://github.com/marko-js/marko/issues/904) - The loop status variable is not compiling when the equal sign is padded in spacing
 
 ### 4.5.3
 
-- Fixes [#903](https://github.com/marko-js/marko/issues/903) - Special unicode chars (\u2028 and \u2029) need to be escaped if within script tag
+* Fixes [#903](https://github.com/marko-js/marko/issues/903) - Special unicode chars (\u2028 and \u2029) need to be escaped if within script tag
 
 ### 4.5.2
 
-- Fixes [#899](https://github.com/marko-js/marko/issues/899) - Keyed element could be incorrectly removed after DOM diffing/patching in case of HTML element mismatch for elements with the same key. [PR #900](https://github.com/marko-js/marko/pull/900)
+* Fixes [#899](https://github.com/marko-js/marko/issues/899) - Keyed element could be incorrectly removed after DOM diffing/patching in case of HTML element mismatch for elements with the same key. [PR #900](https://github.com/marko-js/marko/pull/900)
 
 ### 4.5.1
 
-- Fixes [#893](https://github.com/marko-js/marko/issues/893) - Keyed element could be incorrectly removed after DOM diffing/patching in case of HTML element mismatch for elements with the same key. [PR #894](https://github.com/marko-js/marko/pull/894) by [@westtrade](https://github.com/westtrade)
+* Fixes [#893](https://github.com/marko-js/marko/issues/893) - Keyed element could be incorrectly removed after DOM diffing/patching in case of HTML element mismatch for elements with the same key. [PR #894](https://github.com/marko-js/marko/pull/894) by [@westtrade](https://github.com/westtrade)
 
 ### 4.5.0
 
 Summary of changes across all beta releases for the `4.5.0` release:
 
-- Fixes [#886](https://github.com/marko-js/marko/issues/886) - Write component initialization code when async out and all of its nested async outs finish
-- Fixes [#854](https://github.com/marko-js/marko/issues/854) - Make every .marko file a UI component ([PR #855](https://github.com/marko-js/marko/pull/855))
-- Added support for the `:scoped` modifier on attributes and deprecated `:key`:
+* Fixes [#886](https://github.com/marko-js/marko/issues/886) - Write component initialization code when async out and all of its nested async outs finish
+* Fixes [#854](https://github.com/marko-js/marko/issues/854) - Make every .marko file a UI component ([PR #855](https://github.com/marko-js/marko/pull/855))
+* Added support for the `:scoped` modifier on attributes and deprecated `:key`:
 
 ```marko
 <label for:scoped="name">Name</label>
 <input id:scoped="name" value="Frank"/>
 ```
 
-- Fixes [#817](https://github.com/marko-js/marko/issues/817) - Support dynamic root elements
-- Marko no longer attaches `id` attributes to elements for purposes of keyed matching
-    - Keyed elements are maintained in an internal, per-component lookup
-- Keys are now assigned to all custom tags and HTML elements at compile-time to improve reliability and performance of DOM diffing
-- Optimized internal bookkeeping required during rendering a UI component tree (no more UI component stack)
-- DOM diffing/patching changes:
-    - Significant performance improvements
-    - morphdom is now UI component-aware
+* Fixes [#817](https://github.com/marko-js/marko/issues/817) - Support dynamic root elements
+* Marko no longer attaches `id` attributes to elements for purposes of keyed matching
+  * Keyed elements are maintained in an internal, per-component lookup
+* Keys are now assigned to all custom tags and HTML elements at compile-time to improve reliability and performance of DOM diffing
+* Optimized internal bookkeeping required during rendering a UI component tree (no more UI component stack)
+* DOM diffing/patching changes:
+  * Significant performance improvements
+  * morphdom is now UI component-aware
 
 ### 4.5.0-beta.3
 
-- Fixes [#854](https://github.com/marko-js/marko/issues/854) - Make every .marko file a UI component ([PR #855](https://github.com/marko-js/marko/pull/855))
+* Fixes [#854](https://github.com/marko-js/marko/issues/854) - Make every .marko file a UI component ([PR #855](https://github.com/marko-js/marko/pull/855))
 
 ### 4.5.0-beta.2
 
-- Add ids for any key when component.elId/getElId is used as an attribute value
-- Use indexOf instead of includes to support Node 4
-- [docs] Fixes [#841](https://github.com/marko-js/marko/issues/841) - `docs/components.md` refers to deprecated "data" variable (#842)
+* Add ids for any key when component.elId/getElId is used as an attribute value
+* Use indexOf instead of includes to support Node 4
+* [docs] Fixes [#841](https://github.com/marko-js/marko/issues/841) - `docs/components.md` refers to deprecated "data" variable (#842)
 
 ### 4.5.0-beta.1
 
-- Add back (legacy) support for component.elId + key in template
-- Fixes [#837](https://github.com/marko-js/marko/issues/837) - Update esprima to the latest to support async/await and ES2017 inside of components. ([PR #839](https://github.com/marko-js/marko/pull/839))
-- Fixes key/scope for attributes that have dashes in the name
+* Add back (legacy) support for component.elId + key in template
+* Fixes [#837](https://github.com/marko-js/marko/issues/837) - Update esprima to the latest to support async/await and ES2017 inside of components. ([PR #839](https://github.com/marko-js/marko/pull/839))
+* Fixes key/scope for attributes that have dashes in the name
 
 ### 4.5.0-beta.0
 
-- Fixes [#817](https://github.com/marko-js/marko/issues/817) - Support dynamic root elements
-- Marko no longer attaches `id` attributes to elements for purposes of keyed matching
-    - Keyed elements are maintained in an internal, per-component lookup
-- Keys are now assigned to all custom tags and HTML elements at compile-time to improve reliability and performance of DOM diffing
-- Optimized internal bookkeeping required during rendering a UI component tree (no more UI component stack)
-- DOM diffing/patching changes:
-    - Significant performance improvements
-    - morphdom is now UI component-aware
+* Fixes [#817](https://github.com/marko-js/marko/issues/817) - Support dynamic root elements
+* Marko no longer attaches `id` attributes to elements for purposes of keyed matching
+  * Keyed elements are maintained in an internal, per-component lookup
+* Keys are now assigned to all custom tags and HTML elements at compile-time to improve reliability and performance of DOM diffing
+* Optimized internal bookkeeping required during rendering a UI component tree (no more UI component stack)
+* DOM diffing/patching changes:
+  * Significant performance improvements
+  * morphdom is now UI component-aware
 
 ## 4.4.x
 
 ### 4.4.28
 
-- fix undefined reference error in Component.js
-- Increase mocha timeout to avoid CI build's failing (#821)
+* fix undefined reference error in Component.js
+* Increase mocha timeout to avoid CI build's failing (#821)
 
 ### 4.4.27
 
-- Add ability to update globals by setting new input.
-- [docs] Remove uneeded command from installation docs
-- [docs] Update installing.md
+* Add ability to update globals by setting new input.
+* [docs] Remove uneeded command from installation docs
+* [docs] Update installing.md
 
 ### 4.4.26
 
-- Add better interop for importing modules with default exports (#803)
+* Add better interop for importing modules with default exports (#803)
 
 ### 4.4.25
 
-- Fixes #778 - Fix Marko compiler generating incorrect path for requires on Windows.
+* Fixes #778 - Fix Marko compiler generating incorrect path for requires on Windows.
 
 ### 4.4.24
 
-- [docs] Update installing.md
+* [docs] Update installing.md
 
 ### 4.4.23
 
-- Fixes #796 - Fix events for event targets that are SVGElementInstance types in IE11.
-- Used shortcut for escapeAtTags;
-- Added `escapeAtTags` options in order to render `<@tags>` as they are;
-- simplify a condition judgement in components-jquery
-- Fixes #790 - Class tag should not allow nested body content.
-- Update `compile/index.js` test description
-- Update handleRootNodes.js (#747)
-- [docs] Fix reference to lifecycle section in docs.
+* Fixes #796 - Fix events for event targets that are SVGElementInstance types in IE11.
+* Used shortcut for escapeAtTags;
+* Added `escapeAtTags` options in order to render `<@tags>` as they are;
+* simplify a condition judgement in components-jquery
+* Fixes #790 - Class tag should not allow nested body content.
+* Update `compile/index.js` test description
+* Update handleRootNodes.js (#747)
+* [docs] Fix reference to lifecycle section in docs.
 
 ### 4.4.22
 
-- Fixes #784 - Fix compiled preserve-attrs path.
-- [testing] Fix express tests (#779)
-- [docs] Update webpack.md
+* Fixes #784 - Fix compiled preserve-attrs path.
+* [testing] Fix express tests (#779)
+* [docs] Update webpack.md
 
 ### 4.4.21
 
-- Updated description in `package.json`
+* Updated description in `package.json`
 
 ### 4.4.20
 
-- update bindComponentVar to use dynamic location
-- updating location of bindComponent helper
+* update bindComponentVar to use dynamic location
+* updating location of bindComponent helper
 
 ### 4.4.19
 
-- [testing] Fix key suffix test assertions.
-- Address key suffix feedback. Additional tests.
-- [morphdom] Removed bad and unhelpful optimization to avoid infinite loops
-- [morphdom] Ensure `onBeforeNodeDiscarded` is only called once by looking to see if the node is still attached.
-- [morphdom] Infinite loop fix in morphdom
-- Fixes #761 - component.elId() does not work on the server
-- Fixes #755 - Allow diffing of HTML, head, and body. (#756)
-- [docs] Updated component docs
-- [docs] Use relative link for image
-- [testing] User default npm version for each Node.js version
+* [testing] Fix key suffix test assertions.
+* Address key suffix feedback. Additional tests.
+* [morphdom] Removed bad and unhelpful optimization to avoid infinite loops
+* [morphdom] Ensure `onBeforeNodeDiscarded` is only called once by looking to see if the node is still attached.
+* [morphdom] Infinite loop fix in morphdom
+* Fixes #761 - component.elId() does not work on the server
+* Fixes #755 - Allow diffing of HTML, head, and body. (#756)
+* [docs] Updated component docs
+* [docs] Use relative link for image
+* [testing] User default npm version for each Node.js version
 
 ### 4.4.18
 
-- Fixes #749 #690 - Do not rely on root node having an ID on rerender and properly handle style root nodes.
+* Fixes #749 #690 - Do not rely on root node having an ID on rerender and properly handle style root nodes.
 
 ### 4.4.17
 
-- Put package (`browser.json`) deps before others and parent deps before child deps (#750)
-- [docs] Fix typo in redux.md
-- [docs] Add redux document to structure.json
-- [docs] Add doc describing how to use Redux with Marko.
+* Put package (`browser.json`) deps before others and parent deps before child deps (#750)
+* [docs] Fix typo in redux.md
+* [docs] Add redux document to structure.json
+* [docs] Add doc describing how to use Redux with Marko.
 
 ### 4.4.16
 
-- Fix duplicate body variable
+* Fix duplicate body variable
 
 ### 4.4.15
 
-- Fixes #739 - Should not attempt to check instanceof of type Map if it does not exist in the browser.
-- Added build scripts
+* Fixes #739 - Should not attempt to check instanceof of type Map if it does not exist in the browser.
+* Added build scripts
 
 ### 4.4.14
 
-- Fixes issue with renderToString not rendering text nodes
+* Fixes issue with renderToString not rendering text nodes
 
 ### 4.4.13
 
-- Fixes #721 - Add a Code of Conduct
-- Fixes #655 - Implement renderToString in the browser.
+* Fixes #721 - Add a Code of Conduct
+* Fixes #655 - Implement renderToString in the browser.
 
 ### 4.4.12
 
-- Fixes #695 - Always ignore unrecognized tags for XML files when using the compiler.
-- Fixes #705 - Throw error when the root HTML element is a component and has a dynamic id attribute.
-- [testing] Additional test for root node with dynamic id of a component with a component.js file.
+* Fixes #695 - Always ignore unrecognized tags for XML files when using the compiler.
+* Fixes #705 - Throw error when the root HTML element is a component and has a dynamic id attribute.
+* [testing] Additional test for root node with dynamic id of a component with a component.js file.
 
 ### 4.4.11
 
-- Fixes #728 - Do not use module keyword because webpack compiles it to a custom object.
-- Fixes #719 - Support Express 4 and Express 5.
-- fixes #658 by removing empty style blocks (#715)
-- fixes #688 - add reference to browser.json in meta dependencies
-- [docs] Fix broken link
-- [docs] Fix Marko syntax in docs causing compilation errors on the website.
-- [docs] Change pixels to percent in doc images.
-- [testing] Purge express cache so that express tests both use correct module versions.
+* Fixes #728 - Do not use module keyword because webpack compiles it to a custom object.
+* Fixes #719 - Support Express 4 and Express 5.
+* fixes #658 by removing empty style blocks (#715)
+* fixes #688 - add reference to browser.json in meta dependencies
+* [docs] Fix broken link
+* [docs] Fix Marko syntax in docs causing compilation errors on the website.
+* [docs] Change pixels to percent in doc images.
+* [testing] Purge express cache so that express tests both use correct module versions.
 
 ### 4.4.9
 
-- Revert "Fixes #705 - Throw error when the root HTML element has a dynamic id …"
-- [testing] Only run Node 4, 6, & 8 in travis
+* Revert "Fixes #705 - Throw error when the root HTML element has a dynamic id …"
+* [testing] Only run Node 4, 6, & 8 in travis
 
 ### 4.4.8
 
-- [docs] Clean up why-is-marko-fast.md
-- [docs] Clean up marko-vs-react.md
+* [docs] Clean up why-is-marko-fast.md
+* [docs] Clean up marko-vs-react.md
 
 ### 4.4.7
 
-- Add silent option to browser-refresh and hot-reload
-- Check id attribute for Literal. Update error message to include error page.
-- Fixes #705 - Throw error when the root HTML element has a dynamic id attribute.
-- [docs] Clean up components.md
-- [docs] Fix typo in webpack.md
-- [testing] give extra time for test timing out in travis
-- [testing] run tests on node 8
-- [testing] ignore test-dist from coverage
+* Add silent option to browser-refresh and hot-reload
+* Check id attribute for Literal. Update error message to include error page.
+* Fixes #705 - Throw error when the root HTML element has a dynamic id attribute.
+* [docs] Clean up components.md
+* [docs] Fix typo in webpack.md
+* [testing] give extra time for test timing out in travis
+* [testing] run tests on node 8
+* [testing] ignore test-dist from coverage
 
 ### 4.4.6
 
-- Fixes #693 - [SSR] Improved handling of top-level UI components with renderBody func
-- Switching to using `prepublish` with npm@5
+* Fixes #693 - [SSR] Improved handling of top-level UI components with renderBody func
+* Switching to using `prepublish` with npm@5
 
 ### 4.4.3
 
-- Use parent module to require express patch (#701)
-- [docs] Reference app should point to "marko-lasso" because "ui-components-playground" does not contain lasso
-- [docs] Add articles section to docs.
+* Use parent module to require express patch (#701)
+* [docs] Reference app should point to "marko-lasso" because "ui-components-playground" does not contain lasso
+* [docs] Add articles section to docs.
 
 ### 4.4.2
 
-- Build fixes related to compiler
+* Build fixes related to compiler
 
 ### 4.4.0
 
-- Improve no-update-if condition check
-- Compatibility improvements for Try Online
-- Code size reduction
-- Introduced src/ and dist/ folders for optimized production builds
-- Fixes #695 - Default to ignoring unrecognized tags for XML files.
+* Improve no-update-if condition check
+* Compatibility improvements for Try Online
+* Code size reduction
+* Introduced src/ and dist/ folders for optimized production builds
+* Fixes #695 - Default to ignoring unrecognized tags for XML files.
 
 ## 4.3.x
 
 ### 4.3.1
 
-- Add basic test for ensuring that res.marko returns a promise.
-- enable res.marko can catch a error safe
+* Add basic test for ensuring that res.marko returns a promise.
+* enable res.marko can catch a error safe
 
 ### 4.3.0
 
-- [compiler] Added more control over how attributes are targeted to props
-- Don't add root markers to tags that don't produce output
-- [docs] Added docs for Marko + Huncwot integration
-- [AST] Added `node.removeChildren()`
-- Extend marko globals with defaults
+* [compiler] Added more control over how attributes are targeted to props
+* Don't add root markers to tags that don't produce output
+* [docs] Added docs for Marko + Huncwot integration
+* [AST] Added `node.removeChildren()`
+* Extend marko globals with defaults
 
 ### 4.3.0-beta.4
 
-- Fixes #673 - Circular dependency is causing problems with Webpack
+* Fixes #673 - Circular dependency is causing problems with Webpack
 
 ### 4.3.0-beta.3
 
-- Changes related to #670 - Globals must be serialized earlier to allow early mount of UI components in
-- [docs] Improved docs for SSR
+* Changes related to #670 - Globals must be serialized earlier to allow early mount of UI components in
+* [docs] Improved docs for SSR
 
 ### 4.3.0-beta.2
 
-- Fixes for #670 - Add support for serialized globals and retain globals on re-render
+* Fixes for #670 - Add support for serialized globals and retain globals on re-render
 
 ## 4.2.x
 
-
 ### 4.2.8
 
-- Bug: Fixes [#661](https://github.com/marko-js/marko/issues/661) - Component initialization code may end up in the wrong place
-- Bug: Fixes [#668](https://github.com/marko-js/marko/issues/668) - Declarative event listeners are now allowed on the `<include>` tag
+* Bug: Fixes [#661](https://github.com/marko-js/marko/issues/661) - Component initialization code may end up in the wrong place
+* Bug: Fixes [#668](https://github.com/marko-js/marko/issues/668) - Declarative event listeners are now allowed on the `<include>` tag
 
 ### 4.2.7
 
-- Bug: Fixes [#650](https://github.com/marko-js/marko/issues/650) - The tag "await" does not support attribute "unless"
-- Improvements to legacy state
+* Bug: Fixes [#650](https://github.com/marko-js/marko/issues/650) - The tag "await" does not support attribute "unless"
+* Improvements to legacy state
 
 ### 4.2.6
 
-- Bug: Fixes [#654](https://github.com/marko-js/marko/issues/654) - Bug: components implementing a `key` attribute break in Marko v4
-- Improvements to legacy compatibility layer
+* Bug: Fixes [#654](https://github.com/marko-js/marko/issues/654) - Bug: components implementing a `key` attribute break in Marko v4
+* Improvements to legacy compatibility layer
 
 ### 4.2.5
 
-- Improved support for UI components implemented using native JavaScript class in a separate file
-- Improved how legacy layout tags are handled by Marko v4
+* Improved support for UI components implemented using native JavaScript class in a separate file
+* Improved how legacy layout tags are handled by Marko v4
 
 ### 4.2.4
 
-- Bug: Fixes [#653](https://github.com/marko-js/marko/issues/653) - Event handlers are no longer bound in edge case
+* Bug: Fixes [#653](https://github.com/marko-js/marko/issues/653) - Event handlers are no longer bound in edge case
 
 ### 4.2.3
 
-- Bug: Fixes [#649](https://github.com/marko-js/marko/issues/649) - New line always added to `textarea` and other elements for single line/delimited HTML blocks
+* Bug: Fixes [#649](https://github.com/marko-js/marko/issues/649) - New line always added to `textarea` and other elements for single line/delimited HTML blocks
 
 ### 4.2.2
 
-- Bug: Fixes [#648](https://github.com/marko-js/marko/issues/648) - Style attribute object and lengths not handled properly
+* Bug: Fixes [#648](https://github.com/marko-js/marko/issues/648) - Style attribute object and lengths not handled properly
 
 ### 4.2.1
 
-- Bug: Fixed [#644](https://github.com/marko-js/marko/issues/644) - Attribute not rendered by Marko is not preserved if component first rendered on the server
-- [Performance] Escaping is not needed for the `data-marko` attribute
+* Bug: Fixed [#644](https://github.com/marko-js/marko/issues/644) - Attribute not rendered by Marko is not preserved if component first rendered on the server
+* [Performance] Escaping is not needed for the `data-marko` attribute
 
 ### 4.2.0
 
-- Bug: Fixed [#629](https://github.com/marko-js/marko/issues/629) - VDOM: Rendering unescaped HTML produces non-functioning HTML input controls
-- Bug: Fixed [#634](https://github.com/marko-js/marko/issues/634) - writeInitComponentsCode is not a function
-- Enhancement: Added support to allow improved precompiling of templates
-- Enhancement: Fixed [#636](https://github.com/marko-js/marko/issues/636) - Add error when macro with duplicate name is found
-- Performance: Optimized diffing/patching to avoid indexing entire tree to find keyed elements
-- Performance: Optimized how event handlers are attached to VDOM nodes (separated from attributes)
+* Bug: Fixed [#629](https://github.com/marko-js/marko/issues/629) - VDOM: Rendering unescaped HTML produces non-functioning HTML input controls
+* Bug: Fixed [#634](https://github.com/marko-js/marko/issues/634) - writeInitComponentsCode is not a function
+* Enhancement: Added support to allow improved precompiling of templates
+* Enhancement: Fixed [#636](https://github.com/marko-js/marko/issues/636) - Add error when macro with duplicate name is found
+* Performance: Optimized diffing/patching to avoid indexing entire tree to find keyed elements
+* Performance: Optimized how event handlers are attached to VDOM nodes (separated from attributes)
 
 ## 4.1.x
 
 ### 4.1.3
 
-- Bug: Fixed losing cursor position in Edge (see [morphdom PR #100](https://github.com/patrick-steele-idem/morphdom/pull/100) by [@zastavnitskiy](https://github.com/zastavnitskiy))
-- Bug: Ignore `xmlns` attributes when virtualizing real DOM nodes (needed when inserting an HTML string when rendering to a VDOM)
+* Bug: Fixed losing cursor position in Edge (see [morphdom PR #100](https://github.com/patrick-steele-idem/morphdom/pull/100) by [@zastavnitskiy](https://github.com/zastavnitskiy))
+* Bug: Ignore `xmlns` attributes when virtualizing real DOM nodes (needed when inserting an HTML string when rendering to a VDOM)
 
 ### 4.1.2
 
-- Bug: Fixed [#623](https://github.com/marko-js/marko/issues/623) - Uncaught TypeError: `toEl.$__hasAttribute` is not a function
-- Bug: Fixed [#619](https://github.com/marko-js/marko/issues/619) - Deprecated `constructor()` for UI component classes
+* Bug: Fixed [#623](https://github.com/marko-js/marko/issues/623) - Uncaught TypeError: `toEl.$__hasAttribute` is not a function
+* Bug: Fixed [#619](https://github.com/marko-js/marko/issues/619) - Deprecated `constructor()` for UI component classes
 
 ### 4.1.1
 
-- Added `"use strict";` to restore Node.js compatibility for Node.js v4 and v5
+* Added `"use strict";` to restore Node.js compatibility for Node.js v4 and v5
 
 ### 4.1.0
 
-- Bug: Fixes [#611](https://github.com/marko-js/marko/issues/611) - Component IDs are not being assigned correctly when intermediate non-component is rendered
-- Performance: SVG namespaced elements are now resolved determined at compile-time
-- Performance: Merged in `morphdom` and optimized for Marko
-- Performance: Optimized diffing/patching of elements with only simple attributes in the following set: `class`, `id` and `style`
+* Bug: Fixes [#611](https://github.com/marko-js/marko/issues/611) - Component IDs are not being assigned correctly when intermediate non-component is rendered
+* Performance: SVG namespaced elements are now resolved determined at compile-time
+* Performance: Merged in `morphdom` and optimized for Marko
+* Performance: Optimized diffing/patching of elements with only simple attributes in the following set: `class`, `id` and `style`
 
 ## 4.0.x
 
 ### 4.0.1
 
-- Bug: Fixes [#612](https://github.com/marko-js/marko/issues/612) - Compile error when class method has empty `return`
-- Bug: Fixes [#604](https://github.com/marko-js/marko/issues/604) - `no-update` attributes error when first rendered on the server
-- Bug: Fixes [#608](https://github.com/marko-js/marko/issues/608) - Component losing `renderBody` input on a particular redraw
-- Enhancement: Fixes [#606](https://github.com/marko-js/marko/issues/606) - named single-file component doesn't work
+* Bug: Fixes [#612](https://github.com/marko-js/marko/issues/612) - Compile error when class method has empty `return`
+* Bug: Fixes [#604](https://github.com/marko-js/marko/issues/604) - `no-update` attributes error when first rendered on the server
+* Bug: Fixes [#608](https://github.com/marko-js/marko/issues/608) - Component losing `renderBody` input on a particular redraw
+* Enhancement: Fixes [#606](https://github.com/marko-js/marko/issues/606) - named single-file component doesn't work
 
 ### 4.0.0
 
-- Marko v4! [Release Announcement](https://medium.com/@mlrawlings/marko-4-0-is-here-837884c5f60d)
+* Marko v4! [Release Announcement](https://medium.com/@mlrawlings/marko-4-0-is-here-837884c5f60d)
 
 # 3.x
 
@@ -419,11 +417,11 @@ Summary of changes across all beta releases for the `4.5.0` release:
 
 ### 3.13.2
 
-- Fixed [#478](TagLookup fails when merging taglibs) - TagLookup fails when merging taglibs
+* Fixed [#478](TagLookup fails when merging taglibs) - TagLookup fails when merging taglibs
 
 ### 3.13.1
 
-- Fixes [#465](https://github.com/marko-js/marko/issues/465)
+* Fixes [#465](https://github.com/marko-js/marko/issues/465)
 
 ### 3.13.0
 
@@ -431,53 +429,53 @@ Summary of changes across all beta releases for the `4.5.0` release:
 
 ### 3.12.0
 
-- Added warnings for using render methods when you want string output ([Pull Request #450](https://github.com/marko-js/marko/pull/450) by [@mlrawlings](https://github.com/mlrawlings))
+* Added warnings for using render methods when you want string output ([Pull Request #450](https://github.com/marko-js/marko/pull/450) by [@mlrawlings](https://github.com/mlrawlings))
 
 ## 3.11.x
 
 ### 3.11.8
 
-- Fixes [#382](https://github.com/marko-js/marko/issues/382) - Local variable for tag should have prefix or suffix to avoid conflict
+* Fixes [#382](https://github.com/marko-js/marko/issues/382) - Local variable for tag should have prefix or suffix to avoid conflict
 
 ### 3.11.7
 
-- Fixes [#381](https://github.com/marko-js/marko/issues/381) - `$global` broken when using `template.stream()`
+* Fixes [#381](https://github.com/marko-js/marko/issues/381) - `$global` broken when using `template.stream()`
 
 ### 3.11.6
 
-- Internal change: `AsyncWriter` → `AsyncStream`
+* Internal change: `AsyncWriter` → `AsyncStream`
 
 ### 3.11.5
 
-- (no changes)
+* (no changes)
 
 ### 3.11.4
 
-- Update to `async-writer@2`
+* Update to `async-writer@2`
 
 ### 3.11.3
 
-- Silently ignore errors when parsing tag definition code inlined in JavaScript
+* Silently ignore errors when parsing tag definition code inlined in JavaScript
 
 ### 3.11.2
 
-- Fixed [#318](https://github.com/marko-js/marko/issues/318) - Use compiler options passed to require hook to configure marko globally
+* Fixed [#318](https://github.com/marko-js/marko/issues/318) - Use compiler options passed to require hook to configure marko globally
 
 ```javascript
-require('marko/node-require').install({
-    compilerOptions: {
-        writeToDisk: false
-    }
+require("marko/node-require").install({
+  compilerOptions: {
+    writeToDisk: false
+  }
 });
 ```
 
 ### 3.11.1
 
-- Fixed [#370](https://github.com/marko-js/marko/issues/370) - HTML characters in loop separator string should not be escaped
+* Fixed [#370](https://github.com/marko-js/marko/issues/370) - HTML characters in loop separator string should not be escaped
 
 ### 3.11.0
 
-- Introduced the `<include-html(path)>` tag for including static HTML:
+* Introduced the `<include-html(path)>` tag for including static HTML:
 
 ```xml
 <include-html('./foo.html')>
@@ -487,92 +485,92 @@ require('marko/node-require').install({
 
 ### 3.10.1
 
-- Fixed [#44](https://github.com/marko-js/marko/issues/44) - Webpack compatibility fixes. Also see [marko-loader](https://github.com/marko-js/marko-loader) (A marko loader for webpack)
+* Fixed [#44](https://github.com/marko-js/marko/issues/44) - Webpack compatibility fixes. Also see [marko-loader](https://github.com/marko-js/marko-loader) (A marko loader for webpack)
 
 ### 3.10.0
 
-- Fixed [#357](https://github.com/marko-js/marko/issues/357)  - Deprecate `empty`/`notEmpty` in Marko v3
+* Fixed [#357](https://github.com/marko-js/marko/issues/357) - Deprecate `empty`/`notEmpty` in Marko v3
 
 ## 3.9.x
 
 ### 3.9.4
 
-- Fixed [#355](https://github.com/marko-js/marko/issues/355) - `status-var`/`separator` options not handled when looping over properties
-- Fixed [#354](https://github.com/marko-js/marko/issues/354) - regular expressions used in attribute values are not being handled correctly
-- Fixed [#353](https://github.com/marko-js/marko/issues/353) - `body-only-if` attribute does not work with custom tags (only HTML tags)
+* Fixed [#355](https://github.com/marko-js/marko/issues/355) - `status-var`/`separator` options not handled when looping over properties
+* Fixed [#354](https://github.com/marko-js/marko/issues/354) - regular expressions used in attribute values are not being handled correctly
+* Fixed [#353](https://github.com/marko-js/marko/issues/353) - `body-only-if` attribute does not work with custom tags (only HTML tags)
 
 ### 3.9.3
 
-- Upgraded to `raptor-util@^2`
+* Upgraded to `raptor-util@^2`
 
 ### 3.9.2
 
-- Fixed [#327](https://github.com/marko-js/marko/issues/327) - alt attribute with empty string should be allowed ([Pull Request #350](https://github.com/marko-js/marko/pull/350) by [@mlrawlings](https://github.com/mlrawlings))
+* Fixed [#327](https://github.com/marko-js/marko/issues/327) - alt attribute with empty string should be allowed ([Pull Request #350](https://github.com/marko-js/marko/pull/350) by [@mlrawlings](https://github.com/mlrawlings))
 
 ### 3.9.1
 
-- Fixed [#348](https://github.com/marko-js/marko/issues/348) - exclude all `*.orig` and other files from published npm package
+* Fixed [#348](https://github.com/marko-js/marko/issues/348) - exclude all `*.orig` and other files from published npm package
 
 ### 3.9.0
 
-- Fixed [#231](https://github.com/marko-js/marko/issues/231) - Allow <assign count++>
-- Fixed [#345](https://github.com/marko-js/marko/issues/345) - Whitespace preservation now applies to all deeply nested text nodes
-- Fixed [#344](https://github.com/marko-js/marko/issues/344) - Introduced [defineRenderer](./docs/javascript-api.md#requiremarkodefinerenderer) for Marko
-- Docs: Added docs for excluding directories from taglib discovery ([@mlrawlings](https://github.com/mlrawlings))
-- Docs: Added docs for component autodiscovery ([@mlrawlings](https://github.com/mlrawlings))
-- Docs: Added docs for passing a data object to a custom tag
+* Fixed [#231](https://github.com/marko-js/marko/issues/231) - Allow <assign count++>
+* Fixed [#345](https://github.com/marko-js/marko/issues/345) - Whitespace preservation now applies to all deeply nested text nodes
+* Fixed [#344](https://github.com/marko-js/marko/issues/344) - Introduced [defineRenderer](./docs/javascript-api.md#requiremarkodefinerenderer) for Marko
+* Docs: Added docs for excluding directories from taglib discovery ([@mlrawlings](https://github.com/mlrawlings))
+* Docs: Added docs for component autodiscovery ([@mlrawlings](https://github.com/mlrawlings))
+* Docs: Added docs for passing a data object to a custom tag
 
 ## 3.8.x
 
 ### 3.8.1
 
-- Fixed [#342](https://github.com/marko-js/marko/issues/342) - `await:finish` event not emitted for async fragments with client reorder and that complete synchronously
+* Fixed [#342](https://github.com/marko-js/marko/issues/342) - `await:finish` event not emitted for async fragments with client reorder and that complete synchronously
 
 ### 3.8.0
 
-- Fixed [#329](https://github.com/marko-js/marko/issues/329) - Add autodiscover of components/ directory ([Pull Request #338](https://github.com/marko-js/marko/pull/338) by [@mlrawlings](https://github.com/mlrawlings))
+* Fixed [#329](https://github.com/marko-js/marko/issues/329) - Add autodiscover of components/ directory ([Pull Request #338](https://github.com/marko-js/marko/pull/338) by [@mlrawlings](https://github.com/mlrawlings))
 
 ## 3.7.x
 
 ### 3.7.4
 
-- Fixed [#339](https://github.com/marko-js/marko/issues/339) - Tag transformers are not being applied to tags with a dynamic tag name (fixes [#146](https://github.com/marko-js/marko-components/issues/146) for Marko Components)
+* Fixed [#339](https://github.com/marko-js/marko/issues/339) - Tag transformers are not being applied to tags with a dynamic tag name (fixes [#146](https://github.com/marko-js/marko-components/issues/146) for Marko Components)
 
 ### 3.7.3
 
-- Fixed [#332](https://github.com/marko-js/marko/issues/332) and [#333](https://github.com/marko-js/marko/issues/333) - Correct values for `literalUndefined` and `literalFalse` in the Builder API [@bkuri](https://github.com/bkuri)
-- Fixed [#336](https://github.com/marko-js/marko/issues/336) - Upgraded to latest version of `minimatch`
+* Fixed [#332](https://github.com/marko-js/marko/issues/332) and [#333](https://github.com/marko-js/marko/issues/333) - Correct values for `literalUndefined` and `literalFalse` in the Builder API [@bkuri](https://github.com/bkuri)
+* Fixed [#336](https://github.com/marko-js/marko/issues/336) - Upgraded to latest version of `minimatch`
 
 ### 3.7.2
 
-- Fixed [#328](https://github.com/marko-js/marko/issues/328) - Improve error reporting when taglib/tag definition fails to load
-- Additional change to disable escaping for dynamic `Text` nodes added to body of `<script>` tag to fix [issue #326](https://github.com/marko-js/marko/issues/326)
+* Fixed [#328](https://github.com/marko-js/marko/issues/328) - Improve error reporting when taglib/tag definition fails to load
+* Additional change to disable escaping for dynamic `Text` nodes added to body of `<script>` tag to fix [issue #326](https://github.com/marko-js/marko/issues/326)
 
 ### 3.7.1
 
-- Improved escaping within the `<script>` tag to fix [issue #322](https://github.com/marko-js/marko/issues/322). Special HTML characters will no longer be escaped within the context of the `<script>` tag since browsers do not decode HTML entities within the `<script>` tag. Instead, only the ending `</script>` tag sequence is escaped using JavaScript string escaping sequences.
+* Improved escaping within the `<script>` tag to fix [issue #322](https://github.com/marko-js/marko/issues/322). Special HTML characters will no longer be escaped within the context of the `<script>` tag since browsers do not decode HTML entities within the `<script>` tag. Instead, only the ending `</script>` tag sequence is escaped using JavaScript string escaping sequences.
 
 ### 3.7.0
 
-- Made change to make configuration a true singleton shared across all instances of `marko` loaded at runtime ([commit](https://github.com/marko-js/marko/commit/cd797322adf80f2890015de7b8f62301c2921a0a))
+* Made change to make configuration a true singleton shared across all instances of `marko` loaded at runtime ([commit](https://github.com/marko-js/marko/commit/cd797322adf80f2890015de7b8f62301c2921a0a))
 
 ## 3.6.x
 
 ### 3.6.2
 
-- Improved support for hot reloading by automatically disabling `assumeUpToDate` if hot reload is enabled. ([Pull Request #320](https://github.com/marko-js/marko/pull/320) by [@ianvonholt](https://github.com/ianvonholt))
+* Improved support for hot reloading by automatically disabling `assumeUpToDate` if hot reload is enabled. ([Pull Request #320](https://github.com/marko-js/marko/pull/320) by [@ianvonholt](https://github.com/ianvonholt))
 
 ### 3.6.1
 
-- Fixed a bug that was causing transforms to be run on detached nodes.  This was manifesting itself in the `<async-fragment>` to `<await>` transform if an `if()` attribute was present (or other core attributes that end up wrapping the tag it is defined on).
+* Fixed a bug that was causing transforms to be run on detached nodes. This was manifesting itself in the `<async-fragment>` to `<await>` transform if an `if()` attribute was present (or other core attributes that end up wrapping the tag it is defined on).
 
 ### 3.6.0
 
-- Introduced a new and simpler `<await>` tag that should be used instead of the now deprecated `<async-fragment>` tag (see deprecation details below) ([Pull Request #312](https://github.com/marko-js/marko/pull/312) by [@mlrawlings](https://github.com/mlrawlings))
+* Introduced a new and simpler `<await>` tag that should be used instead of the now deprecated `<async-fragment>` tag (see deprecation details below) ([Pull Request #312](https://github.com/marko-js/marko/pull/312) by [@mlrawlings](https://github.com/mlrawlings))
 
 #### Deprecations
 
-- Deprecated the `<async-fragment var="<var>" data-provider=<data-provider>>` tag in favor of the `<await(<var> from <data-provider>)>` tag:
+* Deprecated the `<async-fragment var="<var>" data-provider=<data-provider>>` tag in favor of the `<await(<var> from <data-provider>)>` tag:
 
 OLD:
 
@@ -620,10 +618,10 @@ Finally, the nested tags for providing content for the placeholder, error and ti
 
 ### 3.5.1
 
-- Fixes #316 - Autocomplete for tags is not updated when tag files updated despite clearing cache. This improves the [autocomplete-marko](https://github.com/marko-js/atom-autocomplete-marko) plugin for Atom.
-- Fixes #314 - Remove hyphens from include props
-- Deprecated:
-    - Properties passed in using the `<include>` tag should not be access using hyphens.
+* Fixes #316 - Autocomplete for tags is not updated when tag files updated despite clearing cache. This improves the [autocomplete-marko](https://github.com/marko-js/atom-autocomplete-marko) plugin for Atom.
+* Fixes #314 - Remove hyphens from include props
+* Deprecated:
+  * Properties passed in using the `<include>` tag should not be access using hyphens.
 
 For example, given the following template:
 
@@ -640,153 +638,153 @@ var firstName = input.firstName;
 
 ### 3.5.0
 
-- Added functionality to exclude specific directory or package from taglib finder ([Pull Request #309](https://github.com/marko-js/marko/pull/309) by [@oxala](https://github.com/oxala))
+* Added functionality to exclude specific directory or package from taglib finder ([Pull Request #309](https://github.com/marko-js/marko/pull/309) by [@oxala](https://github.com/oxala))
 
 ## 3.4.x
 
 ### 3.4.9
 
-- Fixed [https://github.com/marko-js/marko/issues/307] - Marko concise syntax, with multiple class names ([Pull Request #308](https://github.com/marko-js/marko/pull/308) by [@mlrawlings](https://github.com/mlrawlings))
+* Fixed [https://github.com/marko-js/marko/issues/307] - Marko concise syntax, with multiple class names ([Pull Request #308](https://github.com/marko-js/marko/pull/308) by [@mlrawlings](https://github.com/mlrawlings))
 
 ### 3.4.8
 
-- Added support for an "enum" attribute value
+* Added support for an "enum" attribute value
 
 ### 3.4.7
 
-- Async fragment improvements ([Pull Request #305](https://github.com/marko-js/marko/pull/305) by [@mlrawlings](https://github.com/mlrawlings))
-    - Adds additional event info (finished/timedout) to the data emitted from <async-fragment> tags.
-    - Ensures that renderBody() is not called again if the fragment has already finished (timed out).
-    - Fixes `npm run test-async`
-    - Removes a redundant `async-fragment` timeout related test
+* Async fragment improvements ([Pull Request #305](https://github.com/marko-js/marko/pull/305) by [@mlrawlings](https://github.com/mlrawlings))
+  * Adds additional event info (finished/timedout) to the data emitted from <async-fragment> tags.
+  * Ensures that renderBody() is not called again if the fragment has already finished (timed out).
+  * Fixes `npm run test-async`
+  * Removes a redundant `async-fragment` timeout related test
 
 ### 3.4.6
 
-- Updated autocomplete information
+* Updated autocomplete information
 
 ### 3.4.5
 
-- Fixes #304 - async-fragment-tag-transformer.js being loaded by PhantomJS
-- Updated taglibs with additional information to support tooling
-- Added [Michael Rawlings](https://github.com/mlrawlings) as a maintainer
+* Fixes #304 - async-fragment-tag-transformer.js being loaded by PhantomJS
+* Updated taglibs with additional information to support tooling
+* Added [Michael Rawlings](https://github.com/mlrawlings) as a maintainer
 
 ### 3.4.4
 
-- Fixes #303 - `addStaticVar` is not generating unique variable names correctly
+* Fixes #303 - `addStaticVar` is not generating unique variable names correctly
 
 ### 3.4.3
 
-- Improved validation for macros ([@mlrawlings](https://github.com/mlrawlings), [PR #300](https://github.com/marko-js/marko/pull/300))
-- Added code coverage reporting ([@mlrawlings](https://github.com/mlrawlings), [PR #301](https://github.com/marko-js/marko/pull/301))
+* Improved validation for macros ([@mlrawlings](https://github.com/mlrawlings), [PR #300](https://github.com/marko-js/marko/pull/300))
+* Added code coverage reporting ([@mlrawlings](https://github.com/mlrawlings), [PR #301](https://github.com/marko-js/marko/pull/301))
 
 ### 3.4.2
 
-- Improved error reporting in cases when code generation fails ([@mlrawlings](https://github.com/mlrawlings))
+* Improved error reporting in cases when code generation fails ([@mlrawlings](https://github.com/mlrawlings))
 
 ### 3.4.1
 
-- Additional tweaks for #298 - Always emit correct events for async fragments
+* Additional tweaks for #298 - Always emit correct events for async fragments
 
 ### 3.4.0
 
-- Fixes #298 - Always emit correct events for async fragments
-- Updated docs
+* Fixes #298 - Always emit correct events for async fragments
+* Updated docs
 
 ## 3.3.x
 
 ### 3.3.0
 
-- Include async fragment name in the `asyncFragmentFinish` events ([@kprakasam](https://github.com/kprakasam))
+* Include async fragment name in the `asyncFragmentFinish` events ([@kprakasam](https://github.com/kprakasam))
 
 ## 3.2.x
 
 ### 3.2.0
 
-- Fixes #286 - Add res.marko(templateData) for use with Express ([@mlrawlings](https://github.com/mlrawlings))
+* Fixes #286 - Add res.marko(templateData) for use with Express ([@mlrawlings](https://github.com/mlrawlings))
 
 ## 3.1.x
 
 ### 3.1.9
 
-- Fixes #288 - Provide API for discovering custom tags and attributes for autocomplete/tooling purposes
-- Documentation improvements
+* Fixes #288 - Provide API for discovering custom tags and attributes for autocomplete/tooling purposes
+* Documentation improvements
 
 ### 3.1.8
 
-- Fixes #280 - Switch from jsonminify to strip-json-comments
-- Updated docs for Koa and Hapi
-- Additional tests for Node.js v6
+* Fixes #280 - Switch from jsonminify to strip-json-comments
+* Updated docs for Koa and Hapi
+* Additional tests for Node.js v6
 
 ### 3.1.7
 
-- Fixes #274 - marko-compiler-options tag is not properly ended when using raw parsing (for prettyprint)
+* Fixes #274 - marko-compiler-options tag is not properly ended when using raw parsing (for prettyprint)
 
 ### 3.1.6
 
-- Fixes #268 - this.write is not a function for empty ArrayExpression
+* Fixes #268 - this.write is not a function for empty ArrayExpression
 
 ### 3.1.5
 
-- Fixes #262 - node-require module removes `.marko` extension from filenames in compiled code
+* Fixes #262 - node-require module removes `.marko` extension from filenames in compiled code
 
 ### 3.1.4
 
-- Fixes #267 - Shorthand CSS class name cannot be combined with object/array class names
+* Fixes #267 - Shorthand CSS class name cannot be combined with object/array class names
 
 ### 3.1.3
 
-- Fixed #266 - Hot reloading fails if original template is deleted
+* Fixed #266 - Hot reloading fails if original template is deleted
 
 ### 3.1.2
 
-- Fixed error reporting when using `compiler.parseRaw()`
-- Added test for #262
+* Fixed error reporting when using `compiler.parseRaw()`
+* Added test for #262
 
 ### 3.1.1
 
-- Improved whitespace removal for text nodes directly below the root
+* Improved whitespace removal for text nodes directly below the root
 
 ### 3.1.0
 
-- Fixes #254 - Allow preserve whitespace to be enabled at the global level
+* Fixes #254 - Allow preserve whitespace to be enabled at the global level
 
 ## 3.0.x
 
 ### 3.0.7
 
-- Fixes #240 - Always trim start and end of template (even if preserveWhitespace is true)
-- Fixes #260 - Circular custom tags causes infinite recursion when writeToDisk is set to false
-- Minor internal cleanup
+* Fixes #240 - Always trim start and end of template (even if preserveWhitespace is true)
+* Fixes #260 - Circular custom tags causes infinite recursion when writeToDisk is set to false
+* Minor internal cleanup
 
 ### 3.0.6
 
-- Don't wrap exception in `parseJavaScript` if error object was not created by Esprima
+* Don't wrap exception in `parseJavaScript` if error object was not created by Esprima
 
 ### 3.0.5
 
-- Fixes #257 - Placeholders don't render for out-of-order async fragments
+* Fixes #257 - Placeholders don't render for out-of-order async fragments
 
 ### 3.0.4
 
-- Fixes #256 - Convert attributes to title case if no attributes are declared for a custom tag
-- Use `<noscript>` for out-of-order async fragment placeholders
+* Fixes #256 - Convert attributes to title case if no attributes are declared for a custom tag
+* Use `<noscript>` for out-of-order async fragment placeholders
 
 ### 3.0.3
 
-- Make renderSync behave if no context was supplied ([PR #250](https://github.com/marko-js/marko/pull/250) by [@jsumners](https://github.com/jsumners))
+* Make renderSync behave if no context was supplied ([PR #250](https://github.com/marko-js/marko/pull/250) by [@jsumners](https://github.com/jsumners))
 
 ### 3.0.2
 
-- Store `tagDef` with `HtmlElement` node (needed for pretty printing)
+* Store `tagDef` with `HtmlElement` node (needed for pretty printing)
 
 ### 3.0.1
 
-- Docs: Fixed minor issues in docs
-- Reintroduced support for the `MARKO_CLEAN` environment variable: `MARK_CLEAN=true node server.js`
+* Docs: Fixed minor issues in docs
+* Reintroduced support for the `MARKO_CLEAN` environment variable: `MARK_CLEAN=true node server.js`
 
 ### 3.0.0
 
-- See: [What's New in Marko v3](http://markojs.com/docs/marko/what-is-new-marko-v3/)
+* See: [What's New in Marko v3](http://markojs.com/docs/marko/what-is-new-marko-v3/)
 
 # 2.x
 
@@ -794,54 +792,52 @@ var firstName = input.firstName;
 
 ### 2.8.4
 
-- Fixes circular dependency issue between runtime/index.js and hot-reload/index.js
+* Fixes circular dependency issue between runtime/index.js and hot-reload/index.js
 
 ### 2.8.3
 
-- Fixes circular dependency issue between runtime/index.js and hot-reload/index.js
+* Fixes circular dependency issue between runtime/index.js and hot-reload/index.js
 
 ### 2.8.2
 
-- Fixes #203 - Incorrect behavior when attrs is used on a standard HTML tag with a tag def
+* Fixes #203 - Incorrect behavior when attrs is used on a standard HTML tag with a tag def
 
 ### 2.8.1
 
--  Fixes #202 - Pass along options to compiler when loading a template
+* Fixes #202 - Pass along options to compiler when loading a template
 
 ### 2.8.0
 
--  Added support for automatically discovering taglibs from installed packages that are scoped. ([PR #183](https://github.com/marko-js/marko/pull/183) by [@tropperstyle](https://github.com/tropperstyle))
+* Added support for automatically discovering taglibs from installed packages that are scoped. ([PR #183](https://github.com/marko-js/marko/pull/183) by [@tropperstyle](https://github.com/tropperstyle))
 
 ### 2.8.3
 
-- Fixes circular dependency issue between `hot-reload/index.js` and `runtime/index.js`
+* Fixes circular dependency issue between `hot-reload/index.js` and `runtime/index.js`
 
 ## 2.7.x
 
 ### 2.7.31
 
-- Fixes #167 - Nested tags only work one level deep
+* Fixes #167 - Nested tags only work one level deep
 
 ### 2.7.30
 
-- docs: don't exclude docs in .npmignore
+* docs: don't exclude docs in .npmignore
 
 ### 2.7.29
 
-- Fixes #161 - Nested tags with no body content are not handled correctly
+* Fixes #161 - Nested tags with no body content are not handled correctly
 
 ### 2.7.28
 
-- Fixes #140 - Also de-dupe cached taglibs in finder
+* Fixes #140 - Also de-dupe cached taglibs in finder
 
 ### 2.7.27
 
-- Make loading template from String template source easier:
+* Make loading template from String template source easier:
 
 ```javascript
-var template = marko.load(
-    templatePath,
-    'Hello $!{data.name}!');
+var template = marko.load(templatePath, "Hello $!{data.name}!");
 ```
 
 _NOTE: Loading directly from source only works on the server_
@@ -850,14 +846,14 @@ See [Pull Request #153](https://github.com/marko-js/marko/pull/153)
 
 ### 2.7.26
 
-- Use shorter relative paths in error messages
+* Use shorter relative paths in error messages
 
 ### 2.7.25
 
-- Fixes #150 - Provide option to prevent writing compiled templates to disk. Example usage:
+* Fixes #150 - Provide option to prevent writing compiled templates to disk. Example usage:
 
 ```javascript
-require('marko/compiler').defaultOptions.writeToDisk = false;
+require("marko/compiler").defaultOptions.writeToDisk = false;
 ```
 
 NOTE: If you disable writing compiled templates to disk then it will be a little harder to debug errors in templates on the server since the stack trace will refer to a file that has not been written to disk.
@@ -866,123 +862,123 @@ For a more complete list of compiler options please see: http://markojs.com/docs
 
 ### 2.7.24
 
-- Fixes #140 - De-dupe taglibs by module name
-- Documentation: Miscellaneous changes
+* Fixes #140 - De-dupe taglibs by module name
+* Documentation: Miscellaneous changes
 
 ### 2.7.23
 
-- Fixed a typo for `rendererFunc` `in helpers.js` (commit: 0205a47f04911f34ca4d458970d710f81a143987)
+* Fixed a typo for `rendererFunc` `in helpers.js` (commit: 0205a47f04911f34ca4d458970d710f81a143987)
 
 ### 2.7.22
 
-- New language feature: [`unless` support added](http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse)
+* New language feature: [`unless` support added](http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse)
 
 ### 2.7.21
 
-- Automatically enable hot-reload and browser-refresh if launched using [browser-refresh](https://github.com/patrick-steele-idem/browser-refresh)
+* Automatically enable hot-reload and browser-refresh if launched using [browser-refresh](https://github.com/patrick-steele-idem/browser-refresh)
 
 ### 2.7.20
 
-- Documentation: Miscellaneous changes
+* Documentation: Miscellaneous changes
 
 ### 2.7.19
 
-- Fixes #137 - adds support for dynamic HTML tag names
+* Fixes #137 - adds support for dynamic HTML tag names
 
 ### 2.7.18
 
-- Improvement: Better resolving of tag renderer
-- Compiler: Fix to make compiler work in the browser
+* Improvement: Better resolving of tag renderer
+* Compiler: Fix to make compiler work in the browser
 
 ### 2.7.17
 
-- Fixes #135 Allow "attrs" attribute on custom tags
+* Fixes #135 Allow "attrs" attribute on custom tags
 
 ### 2.7.16
 
-- Improved handling of imports
-- Better handling of loading taglibs with circular dependencies
+* Improved handling of imports
+* Better handling of loading taglibs with circular dependencies
 
 ### 2.7.15
 
-- Handle circular taglib imports
+* Handle circular taglib imports
 
 ### 2.7.14
 
-- Fixes #131 - Recursively handle taglib imports
+* Fixes #131 - Recursively handle taglib imports
 
 ### 2.7.13
 
-- Added a `.npmignore` file
-- Fixed licensing header in source
-- Documentation: improved docs for input.renderBody()
-- Documentation: Miscellaneous changes
+* Added a `.npmignore` file
+* Fixed licensing header in source
+* Documentation: improved docs for input.renderBody()
+* Documentation: Miscellaneous changes
 
 ### 2.7.12
 
-- Fixes #122 Don't allow invalid attributes when using shorthand
-- Fixes #122 Typo in hasAttributes
-- Fixes #127 - Make sure all possible input files are accounted for when checking if a compiled template is up-to-date
-- Use `browser.json` files instead of `optimizer.json` files
-- Documentation: Improved docs for async taglib
-- Documentation: Added empty() and notEmpty() helpers to the readme
-- Added Martin Aberer as a maintainer
-- Documentation: Miscellaneous changes
+* Fixes #122 Don't allow invalid attributes when using shorthand
+* Fixes #122 Typo in hasAttributes
+* Fixes #127 - Make sure all possible input files are accounted for when checking if a compiled template is up-to-date
+* Use `browser.json` files instead of `optimizer.json` files
+* Documentation: Improved docs for async taglib
+* Documentation: Added empty() and notEmpty() helpers to the readme
+* Added Martin Aberer as a maintainer
+* Documentation: Miscellaneous changes
 
 ### 2.7.11
 
-- New logo!
+* New logo!
 
 ### 2.7.10
 
-- Fixes #118 Better error when parsing JSON file for tag
-- Testing: More test cases related to empty attributes
-- Documentation: Clarification for the Node.js require extension
-- Documentation: doc reference for `getLength()` of loop `status-var`
-- Documentation: Added reference to [sublime-marko](https://github.com/merwan7/sublime-marko) under the tools section.
+* Fixes #118 Better error when parsing JSON file for tag
+* Testing: More test cases related to empty attributes
+* Documentation: Clarification for the Node.js require extension
+* Documentation: doc reference for `getLength()` of loop `status-var`
+* Documentation: Added reference to [sublime-marko](https://github.com/merwan7/sublime-marko) under the tools section.
 
 ### 2.7.9
 
-- Fixes #109 - Allow `compiler.createNode('div')`
-- Fixes #108 - Improve how the `MARKO_CLEAN` env variable is handled
+* Fixes #109 - Allow `compiler.createNode('div')`
+* Fixes #108 - Improve how the `MARKO_CLEAN` env variable is handled
 
 ### 2.7.8
 
-- Minor documentation changes
+* Minor documentation changes
 
 ### 2.7.7
 
-- Allow `.html` extension for layouts (Fix for https://github.com/raptorjs/marko-layout/issues/2)
+* Allow `.html` extension for layouts (Fix for https://github.com/raptorjs/marko-layout/issues/2)
 
 ### 2.7.6
 
-- Make require('marko/node-require').install() a noop in the browser
+* Make require('marko/node-require').install() a noop in the browser
 
 ### 2.7.5
 
-- Improvement: Allow `template-data` to be combined with other attributes on the `<include>` tag
-- Documentation: Fixes #98 - docs for `<include template-data="...">`
+* Improvement: Allow `template-data` to be combined with other attributes on the `<include>` tag
+* Documentation: Fixes #98 - docs for `<include template-data="...">`
 
 ### 2.7.4
 
-- Fixes #96 - Allow relative, dynamic include paths
+* Fixes #96 - Allow relative, dynamic include paths
 
 ### 2.7.3
 
-- Internal change: Additional test cases added for using promises with async fragments
+* Internal change: Additional test cases added for using promises with async fragments
 
 ### 2.7.2
 
-- Fixes #73 - Prevent same taglib from being loaded multiple times
+* Fixes #73 - Prevent same taglib from being loaded multiple times
 
 ### 2.7.1
 
-- Fixes #88 - Assign global data to the correct out
+* Fixes #88 - Assign global data to the correct out
 
 ### 2.7.0
 
-- Fixes [#27](https://github.com/raptorjs/marko/issues/27) - IE conditional comments (e.g., `<!--[if lt IE 9]><div><![endif]-->`) are automatically preserved. Previously, all HTML comments were stripped out when loading a template. For example:
-- Added support for `<compiler-options comments="preserve"/>` to enable comments to preserved in a template. For example:
+* Fixes [#27](https://github.com/raptorjs/marko/issues/27) - IE conditional comments (e.g., `<!--[if lt IE 9]><div><![endif]-->`) are automatically preserved. Previously, all HTML comments were stripped out when loading a template. For example:
+* Added support for `<compiler-options comments="preserve"/>` to enable comments to preserved in a template. For example:
 
 ```xml
 <compiler-options comments="preserve"/>
@@ -1003,61 +999,61 @@ World
 
 ### 2.6.0
 
-- Performance improvements
-    - `'use strict';`
-    - Optimized render code paths
-- Code cleanup
-- Compatibility fixes for Node.js 0.12
-    - Bad: `fs.readFile(path, 'utf8')`
-    - Good: `fs.readFile(path, {encoding: 'utf8'})`
+* Performance improvements
+  * `'use strict';`
+  * Optimized render code paths
+* Code cleanup
+* Compatibility fixes for Node.js 0.12
+  * Bad: `fs.readFile(path, 'utf8')`
+  * Good: `fs.readFile(path, {encoding: 'utf8'})`
 
 ## 2.5.x
 
 ### 2.5.0
 
-- Fixes #78 - Custom Node.js require extension for Marko template files. Example usage:
+* Fixes #78 - Custom Node.js require extension for Marko template files. Example usage:
 
 ```javascript
 // Install the Node.js require extension in your application's main script (server-side only)
-require('marko/node-require').install();
+require("marko/node-require").install();
 
 // Now you can require `*.marko` files just like any other JavaScript module
-var template = require('./hello.marko');
-var html = template.renderSync({ name: 'Frank' });
+var template = require("./hello.marko");
+var html = template.renderSync({ name: "Frank" });
 ```
 
-- Compiled templates now export a loaded Template instance. In the previous version of marko, compiled templates exported a function that could be used to create a loaded Template instance.
+* Compiled templates now export a loaded Template instance. In the previous version of marko, compiled templates exported a function that could be used to create a loaded Template instance.
 
 ## 2.4.x
 
 ### 2.4.3
 
-- Fixes edge case: More precise regular expression for decoding HTML entities
+* Fixes edge case: More precise regular expression for decoding HTML entities
 
 ### 2.4.2
 
-- Internal: Fixes #75 Always assign the tag property to custom tag nodes
+* Internal: Fixes #75 Always assign the tag property to custom tag nodes
 
 ### 2.4.1
 
-- Improvement to allow taglibs to be imported from other taglibs ([commit](https://github.com/raptorjs/marko/commit/73e9a3420a1bac3e2c201d4dcadf21c0701b5222))
+* Improvement to allow taglibs to be imported from other taglibs ([commit](https://github.com/raptorjs/marko/commit/73e9a3420a1bac3e2c201d4dcadf21c0701b5222))
 
 ### 2.4.0
 
-- Added support for short-hand tags and attributes
+* Added support for short-hand tags and attributes
 
 Old `marko-taglib.json`:
 
 ```json
 {
-    "tags": {
-        "my-hello": {
-            "renderer": "./hello-renderer",
-            "attributes": {
-                "name": "string"
-            }
-        }
+  "tags": {
+    "my-hello": {
+      "renderer": "./hello-renderer",
+      "attributes": {
+        "name": "string"
+      }
     }
+  }
 }
 ```
 
@@ -1065,14 +1061,14 @@ Short-hand `marko-taglib.json`:
 
 ```json
 {
-    "<my-hello>": {
-        "renderer": "./hello-renderer",
-        "@name": "string"
-    }
+  "<my-hello>": {
+    "renderer": "./hello-renderer",
+    "@name": "string"
+  }
 }
 ```
 
-- Fixes #61 Simplify parent/child relationships
+* Fixes #61 Simplify parent/child relationships
 
 Marko now supports custom tags in the following format: `<parent_tag.nested_tag>`
 
@@ -1092,50 +1088,52 @@ Example usage:
 </ui-tabs>
 ```
 
-___ui-tabs/marko-tag.json___
+**_ui-tabs/marko-tag.json_**
 
 ```json
 {
-    "@orientation": "string",
-    "@tabs <tab>[]": {
-        "@title": "string"
-    }
+  "@orientation": "string",
+  "@tabs <tab>[]": {
+    "@title": "string"
+  }
 }
 ```
 
-___ui-tabs/renderer.js___
+**_ui-tabs/renderer.js_**
 
 ```javascript
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 exports.renderer = function(input, out) {
-    var tabs = input.tabs;
+  var tabs = input.tabs;
 
-    // Tabs will be in the following form:
-    // [
-    //     {
-    //         title: 'Home',
-    //         renderBody: function(out) { ... }
-    //     },
-    //     {
-    //         title: 'Profile',
-    //         renderBody: function(out) { ... }
-    //     },
-    //     {
-    //         title: 'Messages',
-    //         renderBody: function(out) { ... }
-    //     }
-    // ]
-    console.log(tabs.length); // Output: 3
-
-    template.render({
-        tabs: tabs
-    }, out);
+  // Tabs will be in the following form:
+  // [
+  //     {
+  //         title: 'Home',
+  //         renderBody: function(out) { ... }
+  //     },
+  //     {
+  //         title: 'Profile',
+  //         renderBody: function(out) { ... }
+  //     },
+  //     {
+  //         title: 'Messages',
+  //         renderBody: function(out) { ... }
+  //     }
+  // ]
+  console.log(tabs.length); // Output: 3
 
+  template.render(
+    {
+      tabs: tabs
+    },
+    out
+  );
 };
 ```
 
-___ui-tabs/template.marko___
+**_ui-tabs/template.marko_**
 
 ```html
 <div class="tabs">
@@ -1162,12 +1160,12 @@ Fixes #66 - Allow circular dependencies when loading templates
 
 ### 2.3.1
 
-- Testing framework changes
-- Fixes #65 - Generated variable name is an empty string in some cases
+* Testing framework changes
+* Fixes #65 - Generated variable name is an empty string in some cases
 
 ### 2.3.0
 
-- Fixes #53 Merge c-input with attr props
+* Fixes #53 Merge c-input with attr props
 
 ## 2.2.x
 
@@ -1177,100 +1175,100 @@ Fixes #60 Don't replace special operators for body functions
 
 ### 2.2.1
 
-- Fixes #58 Added support for MARKO_CLEAN env variable (force recompile of all loaded templates). Example usage:
+* Fixes #58 Added support for MARKO_CLEAN env variable (force recompile of all loaded templates). Example usage:
 
 ```bash
 MARKO_CLEAN=true node run.js
 ```
 
-- Code formatting: add spaces in var code
+* Code formatting: add spaces in var code
 
 ### 2.2.0
 
-- Fixes #51 Allow body content to be mapped to a String input property
-- Fixes #52 Remove JavaScript comments from JSON taglib files before parsing
+* Fixes #51 Allow body content to be mapped to a String input property
+* Fixes #52 Remove JavaScript comments from JSON taglib files before parsing
 
 ## 2.1.x
 
 ### 2.1.6
 
-- Fixes #50 Initialize the loader after the runtime is fully initialized
+* Fixes #50 Initialize the loader after the runtime is fully initialized
 
 ### 2.1.5
 
-- Fixes #50 Ensure that all instances of marko have hot-reload and browser-refresh enabled
+* Fixes #50 Ensure that all instances of marko have hot-reload and browser-refresh enabled
 
 ### 2.1.4
 
-- Allowing complex var names (i.e. LHS) for the `<assign>` tag.
+* Allowing complex var names (i.e. LHS) for the `<assign>` tag.
 
 ### 2.1.3
 
-- Minor change: Slight improvement to code to resolve tag handler
+* Minor change: Slight improvement to code to resolve tag handler
 
 ### 2.1.2
 
-- Minor change: Improve how renderer is resolved
+* Minor change: Improve how renderer is resolved
 
 ### 2.1.1
 
-- Fixes #48 name in marko-tag.json should override default name given during discovery
+* Fixes #48 name in marko-tag.json should override default name given during discovery
 
 ### 2.1.0
 
-- Fixes #47 - Added support for "taglib-imports"
+* Fixes #47 - Added support for "taglib-imports"
 
 ## 2.0.x
 
 ### 2.0.12
 
-- Fixes #31 - Add support for providing prefix when scanning for tags
-- Allow "code" to be a function that lazily evaluates to a code string during code generation
+* Fixes #31 - Add support for providing prefix when scanning for tags
+* Allow "code" to be a function that lazily evaluates to a code string during code generation
 
 ### 2.0.11
 
-- Added method for custom node compilers to get access to the `escapeXml` function at runtime
+* Added method for custom node compilers to get access to the `escapeXml` function at runtime
 
 ### 2.0.10
 
-- Fixes #39 - Added missing return when using hot-reload
+* Fixes #39 - Added missing return when using hot-reload
 
 ### 2.0.9
 
-- Fixed bad publish
+* Fixed bad publish
 
 ### 2.0.8
 
-- Better merging of tags when loading and merging taglibs
+* Better merging of tags when loading and merging taglibs
 
 ### 2.0.7
 
-- Changes to avoid problems associated with the same taglib being found multiple times in the search path
+* Changes to avoid problems associated with the same taglib being found multiple times in the search path
 
 ### 2.0.6
 
-- `renderBody` function is only added if tag has children
+* `renderBody` function is only added if tag has children
 
 ### 2.0.5
 
-- Fixed #36 - Don't use `invokeBody()` in the cache taglib
+* Fixed #36 - Don't use `invokeBody()` in the cache taglib
 
 ### 2.0.4
 
-- :exclamation: Fixed #36 - Deprecated - When using `<include>` with body content, nested body content is now passed in as `String` property named `body`. Old behavior: nested content would be passed in as a `Function` property named `invokeBody` that would return the `String` value of the nested content. `invokeBody()` has been deprecated.
+* :exclamation: Fixed #36 - Deprecated - When using `<include>` with body content, nested body content is now passed in as `String` property named `body`. Old behavior: nested content would be passed in as a `Function` property named `invokeBody` that would return the `String` value of the nested content. `invokeBody()` has been deprecated.
 
 ### 2.0.3
 
-- Fixed #36 - Don't use `invokeBody()` in test code and the HTML comments tag
+* Fixed #36 - Don't use `invokeBody()` in test code and the HTML comments tag
 
 ### 2.0.2
 
-- :exclamation: Fixed #36 - Deprecated `input.invokeBody()` in favor of `input.renderBody(out)`
-- Fixed #37 - Duplicate input property for custom tag renderers
+* :exclamation: Fixed #36 - Deprecated `input.invokeBody()` in favor of `input.renderBody(out)`
+* Fixed #37 - Duplicate input property for custom tag renderers
 
 ### 2.0.1
 
-- Fixed #35 - Added support for `<compiler-options>`. Example:
+* Fixed #35 - Added support for `<compiler-options>`. Example:
 
 ```html
 <compiler-options whitespace="preserve" />
@@ -1281,17 +1279,16 @@ C
 
 ### 2.0.0
 
-
-- Dynamic attributes for scanned tags without a tag will have dashes removed by default.
-    - :exclamation: When using `tags-dir` to discover tags that do not have a `marko-tag.json`, the previous behavior was to allow all attributes and to use the actual attribute name as the input property name. For example, when using `<hello first-name="John">`, first name would need to be read in as `input['first-name']`. This was changed such that the first name property should now be read in as `input.firstName` (dashes removed and converted to camel case)
-- Changes to allow UI component to be put into a single JS file:
-    - Updated taglib directory scanner to use `index.js` if found. New search order:
-        1. `renderer.js` (use `renderer.js` if it exists)
-        2. `index.js` (use `index.js` if it exists and assume it exports a `renderer` or `render` property)
-        3. `template.marko` (use the template as the renderer if no `renderer.js` or `index.js`)
-    - :exclamation: Changes to the taglib directory scanner could break existing code. Specifically, if a UI component directory had an `index.js` file and a `template.marko` file then in in `marko@<2` the `template.marko` file would have been selected as the renderer. In `marko@2.x`, the `index.js` will be selected as the tag renderer.
-- :exclamation: Removed support for mapping a tag renderer to a module with a `process` method
-- Removed sub-module `marko/renderer` that exports [raptor-renderer](https://github.com/raptorjs/raptor-renderer)
+* Dynamic attributes for scanned tags without a tag will have dashes removed by default.
+  * :exclamation: When using `tags-dir` to discover tags that do not have a `marko-tag.json`, the previous behavior was to allow all attributes and to use the actual attribute name as the input property name. For example, when using `<hello first-name="John">`, first name would need to be read in as `input['first-name']`. This was changed such that the first name property should now be read in as `input.firstName` (dashes removed and converted to camel case)
+* Changes to allow UI component to be put into a single JS file:
+  * Updated taglib directory scanner to use `index.js` if found. New search order:
+    1.  `renderer.js` (use `renderer.js` if it exists)
+    2.  `index.js` (use `index.js` if it exists and assume it exports a `renderer` or `render` property)
+    3.  `template.marko` (use the template as the renderer if no `renderer.js` or `index.js`)
+  * :exclamation: Changes to the taglib directory scanner could break existing code. Specifically, if a UI component directory had an `index.js` file and a `template.marko` file then in in `marko@<2` the `template.marko` file would have been selected as the renderer. In `marko@2.x`, the `index.js` will be selected as the tag renderer.
+* :exclamation: Removed support for mapping a tag renderer to a module with a `process` method
+* Removed sub-module `marko/renderer` that exports [raptor-renderer](https://github.com/raptorjs/raptor-renderer)
 
 # 1.x
 
@@ -1299,31 +1296,30 @@ C
 
 ### 1.6.1
 
-- Added back code to allow the new marko runtime to load templates compiled by an earlier compiler that used `module.exports`
+* Added back code to allow the new marko runtime to load templates compiled by an earlier compiler that used `module.exports`
 
 ### 1.6.0
 
-- Fixed #32. Switched from `module.exports = function create(__helpers) { ... }` to `exports.create = function(__helpers) { ... }` to avoid circular dependency problems
-
+* Fixed #32. Switched from `module.exports = function create(__helpers) { ... }` to `exports.create = function(__helpers) { ... }` to avoid circular dependency problems
 
 ## 1.5.x
 
 ### 1.5.8
 
-- Added support for adding "static" code to the top of a compiled template (helpful for initializing variables or running code once).
+* Added support for adding "static" code to the top of a compiled template (helpful for initializing variables or running code once).
 
 ### 1.5.7
 
-- Added sub-module `marko/renderer` that exports [raptor-renderer](https://github.com/raptorjs/raptor-renderer)
+* Added sub-module `marko/renderer` that exports [raptor-renderer](https://github.com/raptorjs/raptor-renderer)
 
 ### 1.5.6
 
-- Changes to avoid unoptimized code in V8
+* Changes to avoid unoptimized code in V8
 
 ### 1.5.5
 
-- Handle case where template was loaded before hot-reload was enabled
+* Handle case where template was loaded before hot-reload was enabled
 
 ## 1.5.4
 
-- Added support for `$global` in `renderSync`
+* Added support for `$global` in `renderSync`
diff --git a/README.md b/README.md
index aeba9442a..60ea380b9 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ Learn more on [markojs.com](http://markojs.com/), and even [Try Marko Online!](h
 
 # Get Involved
 
-- **Contributing**: Pull requests are welcome!
-    - Read [`CONTRIBUTING.md`](.github/CONTRIBUTING.md) and check out our [bite-sized](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3Adifficulty%3Abite-sized) and [help-wanted](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Ahelp-wanted) issues
-    - Submit github issues for any feature enhancements, bugs or documentation problems
-- **Support**: Join our [gitter chat](https://gitter.im/marko-js/marko) to ask questions to get support from the maintainers and other Marko developers
-    - Questions/comments can also be posted as [github issues](https://github.com/marko-js/marko/issues)
-- **Discuss**: Tweet using the `#MarkoJS` hashtag and follow [@MarkoDevTeam](https://twitter.com/MarkoDevTeam)
+* **Contributing**: Pull requests are welcome!
+  * Read [`CONTRIBUTING.md`](.github/CONTRIBUTING.md) and check out our [bite-sized](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3Adifficulty%3Abite-sized) and [help-wanted](https://github.com/marko-js/marko/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Ahelp-wanted) issues
+  * Submit github issues for any feature enhancements, bugs or documentation problems
+* **Support**: Join our [gitter chat](https://gitter.im/marko-js/marko) to ask questions to get support from the maintainers and other Marko developers
+  * Questions/comments can also be posted as [github issues](https://github.com/marko-js/marko/issues)
+* **Discuss**: Tweet using the `#MarkoJS` hashtag and follow [@MarkoDevTeam](https://twitter.com/MarkoDevTeam)
 
 # Installation
 
@@ -39,7 +39,8 @@ the Marko.js website.
 The following single-file component renders a button and a counter with the
 number of times the button has been clicked. [Try this example now!](http://markojs.com/try-online/?file=%2Fcomponents%2Fcomponents%2Fclick-count%2Findex.marko)
 
-__click-count.marko__
+**click-count.marko**
+
 ```marko
 class {
     onCreate() {
@@ -75,7 +76,8 @@ The same component as above split into an `index.marko` template file,
 `component.js` containing your component logic, and `style.css` containing your
 component style:
 
-__index.marko__
+**index.marko**
+
 ```marko
 <div.count>
     ${state.count}
@@ -85,27 +87,29 @@ __index.marko__
 </button>
 ```
 
-__component.js__
+**component.js**
+
 ```js
 module.exports = {
-    onCreate() {
-        this.state = { count:0 };
-    },
-    increment() {
-        this.state.count++;
-    }
+  onCreate() {
+    this.state = { count: 0 };
+  },
+  increment() {
+    this.state.count++;
+  }
 };
 ```
 
-__style.css__
+**style.css**
+
 ```css
 .count {
-    color:#09c;
-    font-size:3em;
+  color: #09c;
+  font-size: 3em;
 }
 .example-button {
-    font-size:1em;
-    padding:0.5em;
+  font-size: 1em;
+  padding: 0.5em;
 }
 ```
 
diff --git a/benchmark/.eslintrc.json b/benchmark/.eslintrc.json
new file mode 100644
index 000000000..f52999d74
--- /dev/null
+++ b/benchmark/.eslintrc.json
@@ -0,0 +1,8 @@
+{
+    "rules": {
+        "no-console": 0
+    },
+    "parserOptions": {
+        "sourceType": "module"
+    }
+}
diff --git a/benchmark/.jshintrc b/benchmark/.jshintrc
deleted file mode 100644
index a1e141b89..000000000
--- a/benchmark/.jshintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "predef": [
-
-    ],
-
-    "globals": {
-        "define": true,
-        "require": true
-    },
-
-    "node" : true,
-    "esnext" : true,
-    "browser" : true,
-    "boss" : false,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "eqeqeq": true,
-    "evil": true,
-    "forin": false,
-    "immed": true,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": false,
-    "white": false,
-    "eqeqeq": false,
-    "latedef": false,
-    "unused": "vars",
-    "jquery": true,
-    "strict": false,
-    "eqnull": true
-}
\ No newline at end of file
diff --git a/benchmark/patch-module.js b/benchmark/patch-module.js
index 23ceed184..265436c30 100644
--- a/benchmark/patch-module.js
+++ b/benchmark/patch-module.js
@@ -1,20 +1,21 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-var Module = require('module').Module;
+var Module = require("module").Module;
 var oldResolveFilename = Module._resolveFilename;
 
-var rootDir = nodePath.join(__dirname, '../');
+var rootDir = nodePath.join(__dirname, "../");
 
 Module._resolveFilename = function(request, parent, isMain) {
-    if (request.charAt(0) !== '.') {
-       var firstSlash = request.indexOf('/');
-       var targetPackageName = firstSlash === -1 ? request : request.substring(0, firstSlash);
+    if (request.charAt(0) !== ".") {
+        var firstSlash = request.indexOf("/");
+        var targetPackageName =
+            firstSlash === -1 ? request : request.substring(0, firstSlash);
 
-       if (targetPackageName === 'marko') {
-           request = request.substring('marko'.length);
-           request = rootDir + request;
-       }
-   }
+        if (targetPackageName === "marko") {
+            request = request.substring("marko".length);
+            request = rootDir + request;
+        }
+    }
 
     return oldResolveFilename.call(this, request, parent, isMain);
-};
\ No newline at end of file
+};
diff --git a/benchmark/size/inferno/rollup.config.js b/benchmark/size/inferno/rollup.config.js
index 5038a800c..75d1d1eec 100644
--- a/benchmark/size/inferno/rollup.config.js
+++ b/benchmark/size/inferno/rollup.config.js
@@ -1,37 +1,32 @@
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import babelPlugin from 'rollup-plugin-babel';
-import envify from 'envify';
-import path from 'path';
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import babelPlugin from "rollup-plugin-babel";
+import envify from "envify";
+import path from "path";
 
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = "production";
 
 // NODE_ENV=production browserify -t envify -t markoify --extension='.marko' --global-transform minprops/browserify -o build/bundles/marko.js marko/client.js
 
-
 export default {
-    entry: path.join(__dirname, 'client.jsx'),
-    format: 'iife',
-    moduleName: 'app',
+    entry: path.join(__dirname, "client.jsx"),
+    format: "iife",
+    moduleName: "app",
     plugins: [
         babelPlugin({
             include: [],
             babelrc: false,
-            "presets": [
-                ["es2015", { "loose": true, "modules": false }],
-                "stage-0"
-            ],
-            "plugins": ["inferno"]
+            presets: [["es2015", { loose: true, modules: false }], "stage-0"],
+            plugins: ["inferno"]
         }),
         browserifyPlugin(envify),
         nodeResolvePlugin({
-            jsnext: false,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
+            jsnext: false, // Default: false
+            main: true, // Default: true
+            browser: true, // Default: false
             preferBuiltins: false,
-            extensions: [ '.js', '.jsx' ]
+            extensions: [".js", ".jsx"]
         })
     ],
-    dest: path.join(__dirname, '../build/bundles/inferno.js')
+    dest: path.join(__dirname, "../build/bundles/inferno.js")
 };
diff --git a/benchmark/size/marko/client.js b/benchmark/size/marko/client.js
index 26d4b3eca..527d7a2d6 100644
--- a/benchmark/size/marko/client.js
+++ b/benchmark/size/marko/client.js
@@ -1,6 +1,7 @@
-var app = require('./components/app');
-app.renderSync({
-        name: 'Frank',
-        colors: ['red', 'green', 'blue']
+var app = require("./components/app");
+app
+    .renderSync({
+        name: "Frank",
+        colors: ["red", "green", "blue"]
     })
-    .appendTo(document.body);
\ No newline at end of file
+    .appendTo(document.body);
diff --git a/benchmark/size/marko/main.js b/benchmark/size/marko/main.js
index d11ebcac5..649b5d918 100644
--- a/benchmark/size/marko/main.js
+++ b/benchmark/size/marko/main.js
@@ -1,3 +1,3 @@
-var helpers = require('marko/src/runtime/vdom/helpers');
+var helpers = require("marko/src/runtime/vdom/helpers");
 
-console.log('HELPERS:', helpers);
+console.log("HELPERS:", helpers);
diff --git a/benchmark/size/marko/rollup.config.js b/benchmark/size/marko/rollup.config.js
index d2fee9d22..bda4bece5 100644
--- a/benchmark/size/marko/rollup.config.js
+++ b/benchmark/size/marko/rollup.config.js
@@ -1,35 +1,34 @@
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = "production";
 
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import markoify from 'markoify';
-import envify from 'envify';
-import minpropsify from 'minprops/browserify';
-import path from 'path';
+import commonjsPlugin from "rollup-plugin-commonjs";
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import markoify from "markoify";
+import envify from "envify";
+import minpropsify from "minprops/browserify";
+import path from "path";
 
 // NODE_ENV=production browserify -t envify -t markoify --extension='.marko' --global-transform minprops/browserify -o build/bundles/marko.js marko/client.js
 
-
 export default {
-    entry: path.join(__dirname, 'client.js'),
-    format: 'iife',
-    moduleName: 'app',
+    entry: path.join(__dirname, "client.js"),
+    format: "iife",
+    moduleName: "app",
     plugins: [
         browserifyPlugin(markoify),
         browserifyPlugin(envify),
         browserifyPlugin(minpropsify),
         nodeResolvePlugin({
-            jsnext: false,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
+            jsnext: false, // Default: false
+            main: true, // Default: true
+            browser: true, // Default: false
             preferBuiltins: false,
-            extensions: [ '.js', '.marko' ]
+            extensions: [".js", ".marko"]
         }),
         commonjsPlugin({
             include: [],
-            extensions: [ '.js', '.marko' ]
+            extensions: [".js", ".marko"]
         })
     ],
-    dest: path.join(__dirname, '../build/bundles/marko.js')
+    dest: path.join(__dirname, "../build/bundles/marko.js")
 };
diff --git a/benchmark/size/minify.js b/benchmark/size/minify.js
index c1fead3dc..d34d7b880 100644
--- a/benchmark/size/minify.js
+++ b/benchmark/size/minify.js
@@ -1,28 +1,30 @@
-console.log('Minifying JavaScript bundles...');
+console.log("Minifying JavaScript bundles...");
 
-const fs = require('fs');
-const path = require('path');
-const zlib = require('zlib');
+const fs = require("fs");
+const path = require("path");
+const zlib = require("zlib");
 const UglifyJS = require("uglify-js");
-const formatNumber = require('format-number')();
+const formatNumber = require("format-number")();
 
-var buildDir = path.join(__dirname, 'build');
-var bundlesDir = path.join(__dirname, 'build/bundles');
-var bundlesMinDir = path.join(__dirname, 'build/bundles.min');
+var buildDir = path.join(__dirname, "build");
+var bundlesDir = path.join(__dirname, "build/bundles");
+var bundlesMinDir = path.join(__dirname, "build/bundles.min");
 
 try {
     fs.mkdirSync(bundlesMinDir);
-} catch(e) {}
+} catch (e) {
+    /* ignore error */
+}
 
 var promiseChain = Promise.resolve();
 
 function getVersion(name) {
-    return require(name + '/package.json').version;
+    return require(name + "/package.json").version;
 }
 
 function leftPad(str, padding) {
     if (str.length < padding) {
-        str = new Array(padding - str.length).join(' ') + str;
+        str = new Array(padding - str.length).join(" ") + str;
     }
 
     return str;
@@ -30,10 +32,10 @@ function leftPad(str, padding) {
 
 var minifiers = {
     gcc: function minifyGCC(src, file) {
-        const gcc = require('google-closure-compiler-js');
+        const gcc = require("google-closure-compiler-js");
         const options = {
-            jsCode: [{src: src}],
-            languageIn: 'ES5'
+            jsCode: [{ src: src }],
+            languageIn: "ES5"
         };
 
         const out = gcc.compile(options);
@@ -49,7 +51,7 @@ var minifiers = {
             return UglifyJS.minify(src, {
                 fromString: true
             }).code;
-        } catch(e) {
+        } catch (e) {
             if (e.line != null) {
                 console.error(`Failed to minify ${file}`);
                 console.error(` Location: ${file}:${e.line}:${e.col}`);
@@ -58,7 +60,6 @@ var minifiers = {
             }
             throw e;
         }
-
     },
     both: function(src, file) {
         var withGCC = minifiers.gcc(src, file);
@@ -75,14 +76,14 @@ var sizes = {};
 
 var targetLib = process.argv[2];
 
-bundleFiles.forEach((filename) => {
-    if (!filename.endsWith('.js')) {
+bundleFiles.forEach(filename => {
+    if (!filename.endsWith(".js")) {
         return;
     }
 
     var file = path.join(bundlesDir, filename);
     var ext = path.extname(filename);
-    var lib = filename.slice(0, 0-ext.length);
+    var lib = filename.slice(0, 0 - ext.length);
 
     if (targetLib && lib !== targetLib) {
         return;
@@ -90,16 +91,16 @@ bundleFiles.forEach((filename) => {
 
     console.log(`Minifying ${file}...`);
 
-    var src = fs.readFileSync(file, { encoding: 'utf8' });
+    var src = fs.readFileSync(file, { encoding: "utf8" });
 
     var minifiedSrc = minifier(src, file);
 
     console.log(`Done minifying ${file}`);
 
     var minFile = path.join(bundlesMinDir, filename);
-    fs.writeFileSync(minFile, minifiedSrc, { encoding: 'utf8' });
+    fs.writeFileSync(minFile, minifiedSrc, { encoding: "utf8" });
 
-    var sizeInfo = sizes[lib] = {};
+    var sizeInfo = (sizes[lib] = {});
 
     promiseChain = promiseChain.then(() => {
         return new Promise((resolve, reject) => {
@@ -110,16 +111,21 @@ bundleFiles.forEach((filename) => {
                 }
 
                 // Compare the sizes
-                var minifiedBuffer = new Buffer(minifiedSrc, 'utf8');
+                var minifiedBuffer = new Buffer(minifiedSrc, "utf8");
                 // console.log(nodePath.basename(templateInfo.outputCompileMinifiedFile) + ': ' + gzippedBuffer.length + ' bytes gzipped (' + minifiedBuffer.length + ' bytes uncompressed)');
 
                 sizeInfo.gzipped = gzippedBuffer.length;
                 sizeInfo.min = minifiedBuffer.length;
 
                 var libVersion = getVersion(lib);
-                var sizeFilename = lib + (libVersion ? '-' + libVersion : '') + '.json';
+                var sizeFilename =
+                    lib + (libVersion ? "-" + libVersion : "") + ".json";
 
-                fs.writeFileSync(path.join(buildDir, sizeFilename), JSON.stringify(sizeInfo, null, 4), { encoding: 'utf8' });
+                fs.writeFileSync(
+                    path.join(buildDir, sizeFilename),
+                    JSON.stringify(sizeInfo, null, 4),
+                    { encoding: "utf8" }
+                );
 
                 resolve();
             });
@@ -132,11 +138,15 @@ promiseChain.then(() => {
 
     for (var lib in sizes) {
         var sizeInfo = sizes[lib];
-        console.log('[' + lib + ']');
-        console.log('  gzip: ' + leftPad(formatNumber(sizeInfo.gzipped), 8) + ' bytes');
-        console.log('   min: ' + leftPad(formatNumber(sizeInfo.min), 8) + ' bytes');
+        console.log("[" + lib + "]");
+        console.log(
+            "  gzip: " + leftPad(formatNumber(sizeInfo.gzipped), 8) + " bytes"
+        );
+        console.log(
+            "   min: " + leftPad(formatNumber(sizeInfo.min), 8) + " bytes"
+        );
         console.log();
     }
 
-    console.log('Minification complete.');
+    console.log("Minification complete.");
 });
diff --git a/benchmark/size/package.json b/benchmark/size/package.json
index 36dfff9bb..fdcccb227 100644
--- a/benchmark/size/package.json
+++ b/benchmark/size/package.json
@@ -1,65 +1,70 @@
 {
-  "name": "size-benchmark",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "setup": "npm install --silent && npm link ../../",
-    "build": "npm run bundle --silent && npm run minify --silent",
-    "build-marko": "npm run bundle-marko --silent && node minify.js marko",
-    "build-vue": "npm run bundle-vue --silent && node minify.js vue",
-    "build-react": "npm run bundle-react --silent && node minify.js react",
-    "build-inferno": "npm run bundle-inferno --silent && node minify.js inferno",
-    "bundle": "mkdir -p build/bundles && npm run bundle-marko && npm run bundle-react && npm run bundle-vue && npm run bundle-preact && npm run bundle-inferno",
-    "bundle-marko": "node ../../scripts/build src && NODE_ENV=production rollup -c marko/rollup.config.js",
-    "bundle-react": "NODE_ENV=production rollup -c react/rollup.config.js",
-    "bundle-preact": "NODE_ENV=production rollup -c preact/rollup.config.js",
-    "bundle-vue": "NODE_ENV=production rollup -c vue/rollup.config.js",
-    "bundle-inferno": "NODE_ENV=production rollup -c inferno/rollup.config.js",
-    "minify": "node minify.js",
-    "http-server": "http-server"
-  },
-  "author": "Patrick Steele-Idem <pnidem@gmail.com>",
-  "license": "MIT",
-  "dependencies": {
-    "babel-plugin-inferno": "^1.8.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.21.0",
-    "babel-plugin-transform-react-constant-elements": "^6.9.1",
-    "babel-plugin-transform-react-jsx": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-es2015-loose": "^8.0.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-0": "^6.16.0",
-    "babelify": "^7.3.0",
-    "envify": "^4.0.0",
-    "format-number": "^2.0.1",
-    "google-closure-compiler-js": "^20161201.0.0",
-    "http-server": "^0.9.0",
-    "inferno": "^1.3.0-rc.1",
-    "inferno-component": "^1.3.0-rc.1",
-    "inferno-server": "^1.3.0-rc.1",
-    "markoify": "^2.1.1",
-    "minprops": "^1.0.0",
-    "preact": "^7.1.0",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "rollup": "^0.41.6",
-    "rollup-plugin-babel": "^2.7.1",
-    "rollup-plugin-browserify-transform": "^0.1.0",
-    "rollup-plugin-commonjs": "^8.0.2",
-    "rollup-plugin-marko": "0.0.2",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "uglify-js": "^2.7.5",
-    "vue": "^2.1.6",
-    "vueify": "^9.4.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/marko-js/marko.git"
-  },
-  "browser": {
-    "events": "events-light"
-  },
-  "devDependencies": {}
+    "name": "size-benchmark",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+        "setup": "npm install --silent && npm link ../../",
+        "build": "npm run bundle --silent && npm run minify --silent",
+        "build-marko": "npm run bundle-marko --silent && node minify.js marko",
+        "build-vue": "npm run bundle-vue --silent && node minify.js vue",
+        "build-react": "npm run bundle-react --silent && node minify.js react",
+        "build-inferno":
+            "npm run bundle-inferno --silent && node minify.js inferno",
+        "bundle":
+            "mkdir -p build/bundles && npm run bundle-marko && npm run bundle-react && npm run bundle-vue && npm run bundle-preact && npm run bundle-inferno",
+        "bundle-marko":
+            "node ../../scripts/build src && NODE_ENV=production rollup -c marko/rollup.config.js",
+        "bundle-react": "NODE_ENV=production rollup -c react/rollup.config.js",
+        "bundle-preact":
+            "NODE_ENV=production rollup -c preact/rollup.config.js",
+        "bundle-vue": "NODE_ENV=production rollup -c vue/rollup.config.js",
+        "bundle-inferno":
+            "NODE_ENV=production rollup -c inferno/rollup.config.js",
+        "minify": "node minify.js",
+        "http-server": "http-server"
+    },
+    "author": "Patrick Steele-Idem <pnidem@gmail.com>",
+    "license": "MIT",
+    "dependencies": {
+        "babel-plugin-inferno": "^1.8.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.21.0",
+        "babel-plugin-transform-react-constant-elements": "^6.9.1",
+        "babel-plugin-transform-react-jsx": "^6.8.0",
+        "babel-plugin-transform-runtime": "^6.15.0",
+        "babel-preset-es2015": "^6.18.0",
+        "babel-preset-es2015-loose": "^8.0.0",
+        "babel-preset-react": "^6.16.0",
+        "babel-preset-stage-0": "^6.16.0",
+        "babelify": "^7.3.0",
+        "envify": "^4.0.0",
+        "format-number": "^2.0.1",
+        "google-closure-compiler-js": "^20161201.0.0",
+        "http-server": "^0.9.0",
+        "inferno": "^1.3.0-rc.1",
+        "inferno-component": "^1.3.0-rc.1",
+        "inferno-server": "^1.3.0-rc.1",
+        "markoify": "^2.1.1",
+        "minprops": "^1.0.0",
+        "preact": "^7.1.0",
+        "react": "^15.4.1",
+        "react-dom": "^15.4.1",
+        "rollup": "^0.41.6",
+        "rollup-plugin-babel": "^2.7.1",
+        "rollup-plugin-browserify-transform": "^0.1.0",
+        "rollup-plugin-commonjs": "^8.0.2",
+        "rollup-plugin-marko": "0.0.2",
+        "rollup-plugin-node-resolve": "^3.0.0",
+        "uglify-js": "^2.7.5",
+        "vue": "^2.1.6",
+        "vueify": "^9.4.0"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/marko-js/marko.git"
+    },
+    "browser": {
+        "events": "events-light"
+    },
+    "devDependencies": {}
 }
diff --git a/benchmark/size/preact/rollup.config.js b/benchmark/size/preact/rollup.config.js
index 47f8870df..d21b21371 100644
--- a/benchmark/size/preact/rollup.config.js
+++ b/benchmark/size/preact/rollup.config.js
@@ -1,35 +1,34 @@
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import babelPlugin from 'rollup-plugin-babel';
-import envify from 'envify';
-import path from 'path';
+import commonjsPlugin from "rollup-plugin-commonjs";
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import babelPlugin from "rollup-plugin-babel";
+import envify from "envify";
+import path from "path";
 
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = "production";
 
 // NODE_ENV=production browserify -t envify -t markoify --extension='.marko' --global-transform minprops/browserify -o build/bundles/marko.js marko/client.js
 
-
 export default {
-    entry: path.join(__dirname, 'client.jsx'),
-    format: 'iife',
-    moduleName: 'app',
+    entry: path.join(__dirname, "client.jsx"),
+    format: "iife",
+    moduleName: "app",
     plugins: [
         babelPlugin({
             // include: ['node_modules/**', '**/*.js', '**/*.jsx']
         }),
         browserifyPlugin(envify),
         nodeResolvePlugin({
-            jsnext: false,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
+            jsnext: false, // Default: false
+            main: true, // Default: true
+            browser: true, // Default: false
             preferBuiltins: false,
-            extensions: [ '.js', '.jsx' ]
+            extensions: [".js", ".jsx"]
         }),
         commonjsPlugin({
             include: [],
-            extensions: [ '.js', '.jsx' ]
+            extensions: [".js", ".jsx"]
         })
     ],
-    dest: path.join(__dirname, '../build/bundles/preact.js')
+    dest: path.join(__dirname, "../build/bundles/preact.js")
 };
diff --git a/benchmark/size/react/rollup.config.js b/benchmark/size/react/rollup.config.js
index 581dc23a7..921d798e3 100644
--- a/benchmark/size/react/rollup.config.js
+++ b/benchmark/size/react/rollup.config.js
@@ -1,35 +1,34 @@
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import babelPlugin from 'rollup-plugin-babel';
-import envify from 'envify';
-import path from 'path';
+import commonjsPlugin from "rollup-plugin-commonjs";
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import babelPlugin from "rollup-plugin-babel";
+import envify from "envify";
+import path from "path";
 
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = "production";
 
 // NODE_ENV=production browserify -t envify -t markoify --extension='.marko' --global-transform minprops/browserify -o build/bundles/marko.js marko/client.js
 
-
 export default {
-    entry: path.join(__dirname, 'client.jsx'),
-    format: 'iife',
-    moduleName: 'app',
+    entry: path.join(__dirname, "client.jsx"),
+    format: "iife",
+    moduleName: "app",
     plugins: [
         babelPlugin({
-            exclude: 'node_modules/**'
+            exclude: "node_modules/**"
         }),
         browserifyPlugin(envify),
         nodeResolvePlugin({
-            jsnext: true,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
+            jsnext: true, // Default: false
+            main: true, // Default: true
+            browser: true, // Default: false
             preferBuiltins: false,
-            extensions: [ '.js', '.jsx' ]
+            extensions: [".js", ".jsx"]
         }),
         commonjsPlugin({
             include: [],
-            extensions: [ '.js', '.jsx' ]
+            extensions: [".js", ".jsx"]
         })
     ],
-    dest: path.join(__dirname, '../build/bundles/react.js')
+    dest: path.join(__dirname, "../build/bundles/react.js")
 };
diff --git a/benchmark/size/vue/client.js b/benchmark/size/vue/client.js
index 2696faca2..d852db9bd 100644
--- a/benchmark/size/vue/client.js
+++ b/benchmark/size/vue/client.js
@@ -1,5 +1,5 @@
-var Vue = require('vue');
-var App = require('./components/App');
+var Vue = require("vue");
+var App = require("./components/App");
 
 // var app = new App({
 //     el: document.body,
@@ -11,7 +11,7 @@ var App = require('./components/App');
 
 new Vue({
     el: document.body,
-    render: function (createElement) {
+    render: function(createElement) {
         return createElement(App);
     }
-});
\ No newline at end of file
+});
diff --git a/benchmark/size/vue/rollup.config.js b/benchmark/size/vue/rollup.config.js
index b3a9268f7..1091f76b0 100644
--- a/benchmark/size/vue/rollup.config.js
+++ b/benchmark/size/vue/rollup.config.js
@@ -1,33 +1,32 @@
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import vueify from 'vueify';
-import envify from 'envify';
-import minpropsify from 'minprops/browserify';
-import path from 'path';
-
-process.env.NODE_ENV = 'production';
+import commonjsPlugin from "rollup-plugin-commonjs";
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import vueify from "vueify";
+import envify from "envify";
+import minpropsify from "minprops/browserify";
+import path from "path";
 
+process.env.NODE_ENV = "production";
 
 export default {
-    entry: path.join(__dirname, 'client.js'),
-    format: 'iife',
-    moduleName: 'app',
+    entry: path.join(__dirname, "client.js"),
+    format: "iife",
+    moduleName: "app",
     plugins: [
         browserifyPlugin(vueify),
         browserifyPlugin(envify),
         browserifyPlugin(minpropsify),
         nodeResolvePlugin({
-            jsnext: true,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
+            jsnext: true, // Default: false
+            main: true, // Default: true
+            browser: true, // Default: false
             preferBuiltins: false,
-            extensions: [ '.js', '.vue' ]
+            extensions: [".js", ".vue"]
         }),
         commonjsPlugin({
             include: [],
-            extensions: [ '.js', '.vue' ]
+            extensions: [".js", ".vue"]
         })
     ],
-    dest: path.join(__dirname, '../build/bundles/vue.js')
+    dest: path.join(__dirname, "../build/bundles/vue.js")
 };
diff --git a/benchmark/vdom/.eslintrc b/benchmark/vdom/.eslintrc
new file mode 100644
index 000000000..5c3f02e1a
--- /dev/null
+++ b/benchmark/vdom/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "env": {
+        "browser": true
+    }
+}
\ No newline at end of file
diff --git a/benchmark/vdom/benchmark-create.js b/benchmark/vdom/benchmark-create.js
index 2ce5ad7cc..027765fb5 100644
--- a/benchmark/vdom/benchmark-create.js
+++ b/benchmark/vdom/benchmark-create.js
@@ -1,24 +1,24 @@
 module.exports = function(app) {
     var Suite = window.Benchmark.Suite;
 
-    var names = [
-        'dom',
-        'dom-innerHTML',
-        'marko-vdom',
-        'react'
-    ];
+    var names = ["dom", "dom-innerHTML", "marko-vdom", "react"];
 
-    var htmlFiles = ['todomvc', 'marko-docs', 'tabs'];
+    var htmlFiles = ["todomvc", "marko-docs", "tabs"];
 
     function loadScripts() {
-
         window.createBenchmarks = {};
 
         var scripts = [];
 
         names.forEach(function(name) {
             htmlFiles.forEach(function(htmlFile) {
-                scripts.push('./codegen-create/benchmark-' + htmlFile + '-' + name + '.js');
+                scripts.push(
+                    "./codegen-create/benchmark-" +
+                        htmlFile +
+                        "-" +
+                        name +
+                        ".js"
+                );
             });
         });
 
@@ -26,18 +26,17 @@ module.exports = function(app) {
     }
 
     function runForHtmlFile(htmlFile) {
-        return loadScripts(htmlFile)
-            .then(function() {
-                var suite = new Suite('create-' + htmlFile);
+        return loadScripts(htmlFile).then(function() {
+            var suite = new Suite("create-" + htmlFile);
 
-                names.forEach(function(name) {
-                    suite.add(name, function() {
-                        return window.createBenchmarks[htmlFile + '-' + name]();
-                    });
+            names.forEach(function(name) {
+                suite.add(name, function() {
+                    return window.createBenchmarks[htmlFile + "-" + name]();
                 });
-
-                return app.runSuite(suite);
             });
+
+            return app.runSuite(suite);
+        });
     }
 
     var loadScriptsPromise = loadScripts();
diff --git a/benchmark/vdom/benchmark-walk.js b/benchmark/vdom/benchmark-walk.js
index 96dc1bd72..a8fb5417c 100644
--- a/benchmark/vdom/benchmark-walk.js
+++ b/benchmark/vdom/benchmark-walk.js
@@ -2,16 +2,15 @@ module.exports = function(app) {
     var Suite = window.Benchmark.Suite;
     var MarkoVDOM = app.vdom;
 
-    var suite = new Suite('walk');
+    var suite = new Suite("walk");
 
-    var todomvcDOM = document.getElementById('todoapp');
+    var todomvcDOM = document.getElementById("todoapp");
     var todomvcDOMVirtual = MarkoVDOM.virtualize(todomvcDOM);
 
     function toHTML(node) {
-
         // NOTE: We don't use XMLSerializer because we need to sort the attributes to correctly compare output HTML strings
         // BAD: return (new XMLSerializer()).serializeToString(node);
-        var html = '';
+        var html = "";
         function serializeHelper(node, indent) {
             if (node.nodeType === 1) {
                 serializeElHelper(node, indent);
@@ -20,7 +19,7 @@ module.exports = function(app) {
             } else if (node.nodeType === 8) {
                 serializeCommentHelper(node, indent);
             } else {
-                console.log('Invalid node:', node);
+                console.log("Invalid node:", node);
                 html += indent + `INVALID NODE TYPE ${node.nodeType}\n`;
                 // throw new Error('Unexpected node type');
             }
@@ -29,66 +28,68 @@ module.exports = function(app) {
         function serializeElHelper(el, indent) {
             var tagName = el.nodeName;
 
-            if (el.namespaceURI === 'http://www.w3.org/2000/svg') {
-                tagName = 'svg:' + tagName;
-            } else if (el.namespaceURI === 'http://www.w3.org/1998/Math/MathML') {
-                tagName = 'math:' + tagName;
+            if (el.namespaceURI === "http://www.w3.org/2000/svg") {
+                tagName = "svg:" + tagName;
+            } else if (
+                el.namespaceURI === "http://www.w3.org/1998/Math/MathML"
+            ) {
+                tagName = "math:" + tagName;
             }
 
-            html += indent + '<' + tagName;
+            html += indent + "<" + tagName;
 
             var attributes = el.attributes;
             var attributesArray = [];
 
-            for (var i=0; i<attributes.length; i++) {
+            for (var i = 0; i < attributes.length; i++) {
                 var attr = attributes[i];
                 var attrName = attr.name;
                 if (attr.namespaceURI) {
-                    attrName = attr.namespaceURI + ':' + attrName;
+                    attrName = attr.namespaceURI + ":" + attrName;
                 }
-                attributesArray.push(' ' + attrName + '="' + attr.value + '"');
+                attributesArray.push(" " + attrName + '="' + attr.value + '"');
             }
 
             attributesArray.sort();
 
-            html += attributesArray.join('');
+            html += attributesArray.join("");
 
-            html += '>\n';
+            html += ">\n";
 
-            if (tagName.toUpperCase() === 'TEXTAREA') {
-                html += indent + '  VALUE: ' + JSON.stringify(el.value) + '\n';
+            if (tagName.toUpperCase() === "TEXTAREA") {
+                html += indent + "  VALUE: " + JSON.stringify(el.value) + "\n";
             } else {
                 var curChild = el.firstChild;
-                while(curChild) {
-                    serializeHelper(curChild, indent + '  ');
+                while (curChild) {
+                    serializeHelper(curChild, indent + "  ");
                     curChild = curChild.nextSibling;
                 }
             }
         }
 
         function serializeTextHelper(node, indent) {
-            html += indent + JSON.stringify(node.nodeValue) + '\n';
+            html += indent + JSON.stringify(node.nodeValue) + "\n";
         }
 
         function serializeCommentHelper(node, indent) {
-            html += indent + '<!--' + JSON.stringify(node.nodeValue) + '-->\n';
+            html += indent + "<!--" + JSON.stringify(node.nodeValue) + "-->\n";
         }
 
-        serializeHelper(node, '');
+        serializeHelper(node, "");
 
         return html;
     }
 
     // add tests
-    suite.add('real DOM', function() {
+    suite.add("real DOM", function() {
         return toHTML(todomvcDOM);
     });
 
-    suite.add('marko-vdom', function() {
+    suite.add("marko-vdom", function() {
         return toHTML(todomvcDOMVirtual);
     });
 
     return function() {
         return app.runSuite(suite);
     };
-};
\ No newline at end of file
+};
diff --git a/benchmark/vdom/browser.json b/benchmark/vdom/browser.json
index d54fdadf4..84f7e19ff 100644
--- a/benchmark/vdom/browser.json
+++ b/benchmark/vdom/browser.json
@@ -6,13 +6,15 @@
         },
         {
             "type": "js",
-            "url": "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
+            "url":
+                "https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.js"
         },
         {
             "type": "js",
-            "url": "https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
+            "url":
+                "https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.2/benchmark.js"
         },
         "benchmark/benchmark.js",
         "require-run: ./client.js"
     ]
-}
\ No newline at end of file
+}
diff --git a/benchmark/vdom/client.js b/benchmark/vdom/client.js
index 304da86c8..d4806e173 100644
--- a/benchmark/vdom/client.js
+++ b/benchmark/vdom/client.js
@@ -1,17 +1,17 @@
-var HTMLElement = require('../../runtime/vdom/HTMLElement');
-var Text = require('../../runtime/vdom/Text');
-var Comment = require('../../runtime/vdom/Comment');
-var DocumentFragment = require('../../runtime/vdom/DocumentFragment');
+var HTMLElement = require("../../runtime/vdom/HTMLElement");
+var Text = require("../../runtime/vdom/Text");
+var Comment = require("../../runtime/vdom/Comment");
+var DocumentFragment = require("../../runtime/vdom/DocumentFragment");
 
-var resultsEl = document.getElementById('results');
+var resultsEl = document.getElementById("results");
 var running = false;
 var benchmarks = {};
 
 function loadScript(path) {
     return new Promise(function(resolve, reject) {
-        var script = document.createElement('script');
+        var script = document.createElement("script");
         script.src = path;
-        script.onload = function () {
+        script.onload = function() {
             resolve();
         };
 
@@ -24,9 +24,11 @@ function loadScript(path) {
 }
 
 function loadScripts(paths) {
-    return Promise.all(paths.map(function(path) {
-        return loadScript(path);
-    }));
+    return Promise.all(
+        paths.map(function(path) {
+            return loadScript(path);
+        })
+    );
 }
 
 function runSuite(suite) {
@@ -38,33 +40,36 @@ function runSuite(suite) {
         running = true;
 
         suite
-            .on('start', function(event) {
+            .on("start", function() {
                 resultsEl.innerHTML += 'Running "' + suite.name + '"...\n';
             })
-            .on('cycle', function(event) {
-                resultsEl.innerHTML += String(event.target) + '\n';
+            .on("cycle", function(event) {
+                resultsEl.innerHTML += String(event.target) + "\n";
             })
-            .on('complete', function() {
-                resultsEl.innerHTML += 'Fastest is ' + this.filter('fastest').map('name') + '\n\n--------------\n\n';
+            .on("complete", function() {
+                resultsEl.innerHTML +=
+                    "Fastest is " +
+                    this.filter("fastest").map("name") +
+                    "\n\n--------------\n\n";
 
                 running = false;
 
-                suite.off('start cycle complete');
+                suite.off("start cycle complete");
                 resolve();
             })
-            .on('error', function(e) {
+            .on("error", function(e) {
                 running = false;
 
-                suite.off('start cycle complete error');
+                suite.off("start cycle complete error");
                 reject(e.target.error);
             })
             // run async
-            .run({ 'async': true });
+            .run({ async: true });
     });
 }
 
-var vdom = window.MarkoVDOM = {
-    virtualize: require('../../runtime/vdom/virtualize'),
+var vdom = (window.MarkoVDOM = {
+    virtualize: require("../../runtime/vdom/virtualize"),
 
     createElement: function(tagName, attrs, childCount, constId) {
         return new HTMLElement(tagName, attrs, childCount, constId);
@@ -78,7 +83,7 @@ var vdom = window.MarkoVDOM = {
     createDocumentFragment: function() {
         return new DocumentFragment();
     }
-};
+});
 
 var app = {
     loadScript,
@@ -91,19 +96,19 @@ function registerBenchmark(name, func) {
     benchmarks[name] = func(app);
 }
 
-registerBenchmark('create', require('./benchmark-create'));
-registerBenchmark('walk', require('./benchmark-walk'));
+registerBenchmark("create", require("./benchmark-create"));
+registerBenchmark("walk", require("./benchmark-walk"));
 
-document.body.addEventListener('click', function(event) {
+document.body.addEventListener("click", function(event) {
     if (running) {
         return;
     }
     var target = event.target;
-    var benchmarkName = target.getAttribute('data-benchmark');
+    var benchmarkName = target.getAttribute("data-benchmark");
     if (benchmarkName) {
         var oldButtonLabel = target.innerHTML;
-        target.innerHTML = oldButtonLabel + ' - running...';
-        resultsEl.innerHTML  = '';
+        target.innerHTML = oldButtonLabel + " - running...";
+        resultsEl.innerHTML = "";
 
         var benchmarkFunc = benchmarks[benchmarkName];
 
@@ -111,7 +116,7 @@ document.body.addEventListener('click', function(event) {
             .then(function() {
                 target.innerHTML = oldButtonLabel;
 
-                resultsEl.innerHTML += '\nDONE!';
+                resultsEl.innerHTML += "\nDONE!";
             })
             .catch(function(e) {
                 target.innerHTML = oldButtonLabel;
@@ -119,4 +124,4 @@ document.body.addEventListener('click', function(event) {
                 resultsEl.innerHTML = e.toString();
             });
     }
-});
\ No newline at end of file
+});
diff --git a/benchmark/vdom/codegen-create/codegen-dom-innerHTML.js b/benchmark/vdom/codegen-create/codegen-dom-innerHTML.js
index abc890118..00c50bdfb 100644
--- a/benchmark/vdom/codegen-create/codegen-dom-innerHTML.js
+++ b/benchmark/vdom/codegen-create/codegen-dom-innerHTML.js
@@ -1,4 +1,4 @@
-module.exports = function(node, html) {
+module.exports = function() {
     return `
     var fragment = range.createContextualFragment(html);
     return fragment.childNodes[0];`;
@@ -10,4 +10,4 @@ var range = document.createRange();
 range.selectNode(document.body);
 var html = ${JSON.stringify(html)};
 `;
-};
\ No newline at end of file
+};
diff --git a/benchmark/vdom/codegen-create/codegen-dom.js b/benchmark/vdom/codegen-create/codegen-dom.js
index 1149d7d0f..b00330706 100644
--- a/benchmark/vdom/codegen-create/codegen-dom.js
+++ b/benchmark/vdom/codegen-create/codegen-dom.js
@@ -1,29 +1,33 @@
 module.exports = function(node) {
-
     var nextId = 0;
 
-    var code = '';
+    var code = "";
 
     function codegenEl(node, level) {
-        var varName = level === 0 ? 'root' : `node${nextId++}`;
+        var varName = level === 0 ? "root" : `node${nextId++}`;
 
-        code += `var ${varName} = document.createElement(${JSON.stringify(node.nodeName)})\n`;
+        code += `var ${varName} = document.createElement(${JSON.stringify(
+            node.nodeName
+        )})\n`;
 
         var attributes = node.attributes;
 
-        for (var i=0; i<attributes.length; i++) {
+        for (var i = 0; i < attributes.length; i++) {
             var attr = attributes[i];
-            code += `${varName}.setAttribute(${JSON.stringify(attr.name)}, ${JSON.stringify(attr.value)})\n`;
+            code += `${varName}.setAttribute(${JSON.stringify(
+                attr.name
+            )}, ${JSON.stringify(attr.value)})\n`;
         }
 
         var curChild = node.firstChild;
-        while(curChild) {
-
+        while (curChild) {
             if (curChild.nodeType === 1) {
                 var childVarName = codegenEl(curChild, level + 1);
                 code += `${varName}.appendChild(${childVarName})\n`;
             } else if (curChild.nodeType === 3) {
-                code += `${varName}.appendChild(document.createTextNode(${JSON.stringify(curChild.nodeValue)}))\n`;
+                code += `${varName}.appendChild(document.createTextNode(${JSON.stringify(
+                    curChild.nodeValue
+                )}))\n`;
             }
 
             curChild = curChild.nextSibling;
@@ -34,7 +38,7 @@ module.exports = function(node) {
 
     codegenEl(node, 0);
 
-    code += '\nreturn root;\n';
+    code += "\nreturn root;\n";
 
     return code;
-};
\ No newline at end of file
+};
diff --git a/benchmark/vdom/codegen-create/codegen-marko-vdom.js b/benchmark/vdom/codegen-create/codegen-marko-vdom.js
index fef9a1cd5..3f3d66627 100644
--- a/benchmark/vdom/codegen-create/codegen-marko-vdom.js
+++ b/benchmark/vdom/codegen-create/codegen-marko-vdom.js
@@ -1,40 +1,42 @@
 function indentStr(level) {
-    var str = '';
-    for (var i=0; i<level; i++) {
-        str += '  ';
+    var str = "";
+    for (var i = 0; i < level; i++) {
+        str += "  ";
     }
 
     return str;
 }
 module.exports = function(node) {
-    var code = '';
+    var code = "";
 
     function codegenEl(node, level) {
         if (level === 0) {
-            code += 'createElement';
+            code += "createElement";
         } else {
-            code += '.e';
+            code += ".e";
         }
 
         var attrsMap = {};
 
         var attributes = node.attributes;
-        for (var i=0; i<attributes.length; i++) {
+        for (var i = 0; i < attributes.length; i++) {
             var attr = attributes[i];
             attrsMap[attr.name] = attr.value;
         }
 
-        code += `(${JSON.stringify(node.nodeName)}, ${JSON.stringify(attrsMap)}, ${node.childNodes.length})\n`;
+        code += `(${JSON.stringify(node.nodeName)}, ${JSON.stringify(
+            attrsMap
+        )}, ${node.childNodes.length})\n`;
         // codegenAttrs(node.attributes, level + 1);
 
         var curChild = node.firstChild;
-        while(curChild) {
+        while (curChild) {
             codegen(curChild, level + 1);
             curChild = curChild.nextSibling;
         }
     }
 
-    function codegenText(node, level) {
+    function codegenText(node) {
         code += `.t(${JSON.stringify(node.nodeValue)})\n`;
     }
 
@@ -50,14 +52,12 @@ module.exports = function(node) {
 
     codegen(node, 0);
 
-    return 'return ' + code + '\n';
+    return "return " + code + "\n";
 };
 
-module.exports.generateInitCode = function(node, html) {
+module.exports.generateInitCode = function() {
     return `
     var MarkoVDOM = window.MarkoVDOM;
     var createElement = MarkoVDOM.createElement;
 `;
-
 };
-
diff --git a/benchmark/vdom/codegen-create/codegen-react.js b/benchmark/vdom/codegen-create/codegen-react.js
index d1b44b7ad..79ea51376 100644
--- a/benchmark/vdom/codegen-create/codegen-react.js
+++ b/benchmark/vdom/codegen-create/codegen-react.js
@@ -1,7 +1,7 @@
 function indentStr(level) {
-    var str = '';
-    for (var i=0; i<level; i++) {
-        str += '  ';
+    var str = "";
+    for (var i = 0; i < level; i++) {
+        str += "  ";
     }
 
     return str;
@@ -9,54 +9,55 @@ function indentStr(level) {
 
 module.exports = function(node) {
     function codegenChildNodes(node, level) {
-
         var curChild = node.firstChild;
         if (!curChild) {
-            return 'null';
+            return "null";
         }
 
-        var code = '[\n';
-
+        var code = "[\n";
 
         var childLevel = level + 2;
-        while(curChild) {
+        while (curChild) {
             code += indentStr(childLevel) + codegen(curChild, childLevel);
             curChild = curChild.nextSibling;
 
             if (curChild) {
-                code += ',\n';
+                code += ",\n";
             } else {
-                code += '\n';
+                code += "\n";
             }
         }
 
-        code += indentStr(level + 1) + ']';
+        code += indentStr(level + 1) + "]";
 
         return code;
     }
 
     function codegenEl(node, level) {
-
         var attributesMap = null;
 
         var attributes = node.attributes;
         if (attributes.length) {
             attributesMap = {};
 
-            for (var i=0; i<attributes.length; i++) {
+            for (var i = 0; i < attributes.length; i++) {
                 var attr = attributes[i];
                 var attrName = attr.name;
                 var attrValue = attr.value;
 
-                if (attrName === 'class') {
-                    attrName = 'className';
+                if (attrName === "class") {
+                    attrName = "className";
                 }
                 attributesMap[attrName] = attrValue;
             }
         }
 
-
-        return  `React.createElement(${JSON.stringify(node.nodeName)}, ${JSON.stringify(attributesMap)}, ${codegenChildNodes(node, level)})`;
+        return `React.createElement(${JSON.stringify(
+            node.nodeName
+        )}, ${JSON.stringify(attributesMap)}, ${codegenChildNodes(
+            node,
+            level
+        )})`;
     }
 
     function codegen(node, level) {
@@ -67,5 +68,5 @@ module.exports = function(node) {
         }
     }
 
-    return 'return ' + codegen(node, 0) + '\n';
-};
\ No newline at end of file
+    return "return " + codegen(node, 0) + "\n";
+};
diff --git a/benchmark/vdom/codegen-create/run.js b/benchmark/vdom/codegen-create/run.js
index 2d920f514..19775f782 100644
--- a/benchmark/vdom/codegen-create/run.js
+++ b/benchmark/vdom/codegen-create/run.js
@@ -1,13 +1,14 @@
 var jsdom = require("jsdom").jsdom;
-var fs = require('fs');
-var path = require('path');
+var fs = require("fs");
+var path = require("path");
 
 function generateCode(name, htmlFile, rootNode, html) {
-    var generator = require('./codegen-' + name);
-
+    var generator = require("./codegen-" + name);
 
     var code = generator(rootNode, html);
-    var wrappedCode = `window.createBenchmarks[${JSON.stringify(htmlFile+'-'+name)}]=function() {\n${code}\n}`;
+    var wrappedCode = `window.createBenchmarks[${JSON.stringify(
+        htmlFile + "-" + name
+    )}]=function() {\n${code}\n}`;
 
     var generateInitCode = generator.generateInitCode;
 
@@ -18,24 +19,24 @@ ${generateInitCode(rootNode, html)}
 ${wrappedCode}
 }())`;
     }
-    fs.writeFileSync(path.join(__dirname, `benchmark-${htmlFile}-${name}.js`), wrappedCode, { encoding: 'utf8' });
+    fs.writeFileSync(
+        path.join(__dirname, `benchmark-${htmlFile}-${name}.js`),
+        wrappedCode,
+        { encoding: "utf8" }
+    );
 }
 
-var methods = [
-    'dom',
-    'dom-innerHTML',
-    'marko-vdom',
-    'react'
-];
+var methods = ["dom", "dom-innerHTML", "marko-vdom", "react"];
 
-var htmlFiles = fs.readdirSync(__dirname)
-    .filter(function(name) {
-        return name.startsWith('html-');
-    });
+var htmlFiles = fs.readdirSync(__dirname).filter(function(name) {
+    return name.startsWith("html-");
+});
 
 htmlFiles.forEach(function(htmlFile) {
-    var name = htmlFile.substring('html-'.length).slice(0, 0-'.html'.length);
-    var html = fs.readFileSync(path.join(__dirname, htmlFile), { encoding: 'utf8' });
+    var name = htmlFile.substring("html-".length).slice(0, 0 - ".html".length);
+    var html = fs.readFileSync(path.join(__dirname, htmlFile), {
+        encoding: "utf8"
+    });
 
     var doc = jsdom(html);
 
diff --git a/benchmark/vdom/run.js b/benchmark/vdom/run.js
index d8a51a88f..3665d0beb 100644
--- a/benchmark/vdom/run.js
+++ b/benchmark/vdom/run.js
@@ -1,32 +1,32 @@
-require('../patch-module');
+require("../patch-module");
 
-require('marko/node-require');
-require('marko/express');
+require("marko/node-require");
+require("marko/express");
 
-var isProduction = process.env.NODE_ENV === 'production';
+var isProduction = process.env.NODE_ENV === "production";
 
-require('lasso').configure({
-    outputDir: __dirname + '/static',
+require("lasso").configure({
+    outputDir: __dirname + "/static",
     bundlingEnabled: isProduction,
     fingerprintsEnabled: isProduction,
     minify: isProduction
 });
 
-var express = require('express');
+var express = require("express");
 
 var app = express();
 
-var serveStatic = require('serve-static');
+var serveStatic = require("serve-static");
 
-require('./codegen-create/run');
+require("./codegen-create/run");
 
-var template = require('./index.marko');
+var template = require("./index.marko");
 
-app.use('/codegen-create', serveStatic(__dirname + '/codegen-create'));
+app.use("/codegen-create", serveStatic(__dirname + "/codegen-create"));
 
-app.use(require('lasso/middleware').serveStatic());
+app.use(require("lasso/middleware").serveStatic());
 
-app.get('/', function(req, res) {
+app.get("/", function(req, res) {
     res.marko(template);
 });
 
@@ -35,5 +35,5 @@ app.listen(8080, function(err) {
         throw err;
     }
 
-    console.log('Server ready:\nhttp://localhost:8080');
+    console.log("Server ready:\nhttp://localhost:8080");
 });
diff --git a/bin/markoc.js b/bin/markoc.js
index ac3e060c2..2c90f64b6 100644
--- a/bin/markoc.js
+++ b/bin/markoc.js
@@ -1,36 +1,42 @@
-var fs = require('fs');
-var nodePath = require('path');
+/* eslint-disable no-console */
+
+var fs = require("fs");
+var nodePath = require("path");
 var cwd = process.cwd();
-var resolveFrom = require('resolve-from');
+var resolveFrom = require("resolve-from");
 
 // Try to use the Marko compiler installed with the project
 var markoCompilerPath;
-const markocPkgVersion = require('../package.json').version;
+const markocPkgVersion = require("../package.json").version;
 
 var markoPkgVersion;
 try {
-    var markoPkgPath = resolveFrom(process.cwd(), 'marko/package.json');
+    var markoPkgPath = resolveFrom(process.cwd(), "marko/package.json");
     markoPkgVersion = require(markoPkgPath).version;
-} catch(e) {}
+} catch (e) {
+    /* ignore error */
+}
 
 try {
-    markoCompilerPath = resolveFrom(process.cwd(), 'marko/compiler');
-} catch(e) {}
+    markoCompilerPath = resolveFrom(process.cwd(), "marko/compiler");
+} catch (e) {
+    /* ignore error */
+}
 
 var markoCompiler;
 
 if (markoCompilerPath) {
     markoCompiler = require(markoCompilerPath);
 } else {
-    markoCompiler = require('../compiler');
+    markoCompiler = require("../compiler");
 }
 
-var Minimatch = require('minimatch').Minimatch;
+var Minimatch = require("minimatch").Minimatch;
 
-var appModulePath = require('app-module-path');
+var appModulePath = require("app-module-path");
 
-require('raptor-polyfill/string/startsWith');
-require('raptor-polyfill/string/endsWith');
+require("raptor-polyfill/string/startsWith");
+require("raptor-polyfill/string/endsWith");
 
 markoCompiler.defaultOptions.checkUpToDate = false;
 
@@ -42,58 +48,65 @@ var mmOptions = {
 
 function relPath(path) {
     if (path.startsWith(cwd)) {
-        return path.substring(cwd.length+1);
+        return path.substring(cwd.length + 1);
     }
 }
 
-var args = require('argly').createParser({
-        '--help': {
-            type: 'boolean',
-            description: 'Show this help message'
+var args = require("argly")
+    .createParser({
+        "--help": {
+            type: "boolean",
+            description: "Show this help message"
         },
-        '--files --file -f *': {
-            type: 'string[]',
-            description: 'A set of directories or files to compile'
+        "--files --file -f *": {
+            type: "string[]",
+            description: "A set of directories or files to compile"
         },
-        '--ignore -i': {
-            type: 'string[]',
-            description: 'An ignore rule (default: --ignore "/node_modules" ".*")'
+        "--ignore -i": {
+            type: "string[]",
+            description:
+                'An ignore rule (default: --ignore "/node_modules" ".*")'
         },
-        '--clean -c': {
-            type: 'boolean',
-            description: 'Clean all of the *.marko.js files'
+        "--clean -c": {
+            type: "boolean",
+            description: "Clean all of the *.marko.js files"
         },
-        '--force': {
-            type: 'boolean',
-            description: 'Force template recompilation even if unchanged'
+        "--force": {
+            type: "boolean",
+            description: "Force template recompilation even if unchanged"
         },
-        '--paths -p': {
-            type: 'string[]',
-            description: 'Additional directories to add to the Node.js module search path'
+        "--paths -p": {
+            type: "string[]",
+            description:
+                "Additional directories to add to the Node.js module search path"
         },
-        '--vdom -V': {
-            type: 'boolean',
-            description: 'VDOM output'
+        "--vdom -V": {
+            type: "boolean",
+            description: "VDOM output"
         },
-        '--version -v': {
-            type: 'boolean',
-            description: 'Print markoc and marko compiler versions to the console'
+        "--version -v": {
+            type: "boolean",
+            description:
+                "Print markoc and marko compiler versions to the console"
         }
     })
-    .usage('Usage: $0 <pattern> [options]')
-    .example('Compile a single template', '$0 template.marko')
-    .example('Compile all templates in the current directory', '$0 .')
-    .example('Compile multiple templates', '$0 template.marko src/ foo/')
-    .example('Delete all *.marko.js files in the current directory', '$0 . --clean')
+    .usage("Usage: $0 <pattern> [options]")
+    .example("Compile a single template", "$0 template.marko")
+    .example("Compile all templates in the current directory", "$0 .")
+    .example("Compile multiple templates", "$0 template.marko src/ foo/")
+    .example(
+        "Delete all *.marko.js files in the current directory",
+        "$0 . --clean"
+    )
     .validate(function(result) {
         if (result.help) {
             this.printUsage();
             process.exit(0);
         } else if (result.version) {
-            console.log('markoc@' + markocPkgVersion);
+            console.log("markoc@" + markocPkgVersion);
 
             if (markoPkgVersion) {
-                console.log('marko@' + markoPkgVersion);
+                console.log("marko@" + markoPkgVersion);
             }
 
             process.exit(0);
@@ -114,20 +127,19 @@ var args = require('argly').createParser({
     })
     .parse();
 
-var output = 'html';
+var output = "html";
 
 var isForBrowser = false;
 
 if (args.vdom) {
-    output = 'vdom';
+    output = "vdom";
     isForBrowser = true;
 }
 
-
 var compileOptions = {
     output: output,
     browser: isForBrowser,
-    compilerType: 'markoc',
+    compilerType: "markoc",
     compilerVersion: markoPkgVersion || markocPkgVersion
 };
 
@@ -146,30 +158,28 @@ if (paths && paths.length) {
 var ignoreRules = args.ignore;
 
 if (!ignoreRules) {
-    ignoreRules = ['/node_modules', '.*'];
+    ignoreRules = ["/node_modules", ".*"];
 }
 
-ignoreRules = ignoreRules.filter(function (s) {
+ignoreRules = ignoreRules.filter(function(s) {
     s = s.trim();
     return s && !s.match(/^#/);
 });
 
-ignoreRules = ignoreRules.map(function (pattern) {
-
+ignoreRules = ignoreRules.map(function(pattern) {
     return new Minimatch(pattern, mmOptions);
 });
 
-
 function isIgnored(path, dir, stat) {
     if (path.startsWith(dir)) {
         path = path.substring(dir.length);
     }
 
-    path = path.replace(/\\/g, '/');
+    path = path.replace(/\\/g, "/");
 
     var ignore = false;
     var ignoreRulesLength = ignoreRules.length;
-    for (var i=0; i<ignoreRulesLength; i++) {
+    for (var i = 0; i < ignoreRulesLength; i++) {
         var rule = ignoreRules[i];
 
         var match = rule.match(path);
@@ -177,14 +187,15 @@ function isIgnored(path, dir, stat) {
         if (!match && stat && stat.isDirectory()) {
             try {
                 stat = fs.statSync(path);
-            } catch(e) {}
+            } catch (e) {
+                /* ignore error */
+            }
 
             if (stat && stat.isDirectory()) {
-                match = rule.match(path + '/');
+                match = rule.match(path + "/");
             }
         }
 
-
         if (match) {
             if (rule.negate) {
                 ignore = false;
@@ -199,7 +210,7 @@ function isIgnored(path, dir, stat) {
 
 function walk(files, options, done) {
     if (!files || files.length === 0) {
-        done('No files provided');
+        done("No files provided");
     }
 
     var pending = 0;
@@ -227,7 +238,6 @@ function walk(files, options, done) {
                 } else {
                     done(null);
                 }
-
             }
         }
     };
@@ -266,7 +276,7 @@ function walk(files, options, done) {
         });
     }
 
-    for (var i=0; i<files.length; i++) {
+    for (var i = 0; i < files.length; i++) {
         var file = nodePath.resolve(cwd, files[i]);
 
         var stat = fs.statSync(file);
@@ -288,32 +298,34 @@ if (args.clean) {
             file: function(file, context) {
                 var basename = nodePath.basename(file);
 
-                if (basename.endsWith('.marko.js') || basename.endsWith('.marko.html') || basename.endsWith('.marko.xml.js')) {
+                if (
+                    basename.endsWith(".marko.js") ||
+                    basename.endsWith(".marko.html") ||
+                    basename.endsWith(".marko.xml.js")
+                ) {
                     context.beginAsync();
                     fs.unlink(file, function(err) {
                         if (err) {
                             return context.endAsync(err);
                         }
                         deleteCount++;
-                        console.log('Deleted: ' + file);
+                        console.log("Deleted: " + file);
                         context.endAsync();
                     });
                 }
             }
         },
-        function(err) {
+        function() {
             if (deleteCount === 0) {
-                console.log('No *.marko.js files were found. Already clean.');
+                console.log("No *.marko.js files were found. Already clean.");
             } else {
-                console.log('Deleted ' + deleteCount + ' file(s)');
+                console.log("Deleted " + deleteCount + " file(s)");
             }
-
-        });
-
+        }
+    );
 } else {
     var found = {};
     var compileCount = 0;
-    var failed;
     var failed = [];
 
     var compile = function(path, context) {
@@ -322,37 +334,51 @@ if (args.clean) {
         }
 
         found[path] = true;
-        var outPath = path + '.js';
+        var outPath = path + ".js";
 
-        console.log('Compiling:\n  Input:  ' + relPath(path) + '\n  Output: ' + relPath(outPath) + '\n');
+        console.log(
+            "Compiling:\n  Input:  " +
+                relPath(path) +
+                "\n  Output: " +
+                relPath(outPath) +
+                "\n"
+        );
 
         context.beginAsync();
 
         markoCompiler.compileFile(path, compileOptions, function(err, src) {
             if (err) {
-                failed.push('Failed to compile "' + relPath(path) + '". Error: ' + (err.stack || err));
+                failed.push(
+                    'Failed to compile "' +
+                        relPath(path) +
+                        '". Error: ' +
+                        (err.stack || err)
+                );
                 context.endAsync(err);
                 return;
             }
 
             context.beginAsync();
-            fs.writeFile(outPath, src, {encoding: 'utf8'}, function(err, src) {
+            fs.writeFile(outPath, src, { encoding: "utf8" }, function(err) {
                 if (err) {
-                    failed.push('Failed to write "' + path + '". Error: ' + (err.stack || err));
+                    failed.push(
+                        'Failed to write "' +
+                            path +
+                            '". Error: ' +
+                            (err.stack || err)
+                    );
                     context.endAsync(err);
                     return;
                 }
 
                 compileCount++;
                 context.endAsync();
-
             });
 
             context.endAsync();
         });
     };
 
-
     if (args.files && args.files.length) {
         walk(
             args.files,
@@ -360,7 +386,11 @@ if (args.clean) {
                 file: function(file, context) {
                     var basename = nodePath.basename(file);
 
-                    if (basename.endsWith('.marko') || basename.endsWith('.marko.html') || basename.endsWith('.marko.xml')) {
+                    if (
+                        basename.endsWith(".marko") ||
+                        basename.endsWith(".marko.html") ||
+                        basename.endsWith(".marko.xml")
+                    ) {
                         compile(file, context);
                     }
                 }
@@ -368,7 +398,10 @@ if (args.clean) {
             function(err) {
                 if (err) {
                     if (failed.length) {
-                        console.error('The following errors occurred:\n- ' + failed.join('\n- '));
+                        console.error(
+                            "The following errors occurred:\n- " +
+                                failed.join("\n- ")
+                        );
                     } else {
                         console.error(err);
                     }
@@ -377,11 +410,11 @@ if (args.clean) {
                 }
 
                 if (compileCount === 0) {
-                    console.log('No templates found');
+                    console.log("No templates found");
                 } else {
-                    console.log('Compiled ' + compileCount + ' templates(s)');
+                    console.log("Compiled " + compileCount + " templates(s)");
                 }
-
-            });
+            }
+        );
     }
 }
diff --git a/browser-refresh.js b/browser-refresh.js
index 2d8382662..8e46579ba 100644
--- a/browser-refresh.js
+++ b/browser-refresh.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/browser-refresh');
+    module.exports = require("./src/browser-refresh");
 } else {
-    module.exports = require('./dist/browser-refresh');
+    module.exports = require("./dist/browser-refresh");
 }
diff --git a/compiler.js b/compiler.js
index 51a00d5a9..955a9ce84 100644
--- a/compiler.js
+++ b/compiler.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/compiler');
+    module.exports = require("./src/compiler");
 } else {
-    module.exports = require('./dist/compiler');
+    module.exports = require("./dist/compiler");
 }
diff --git a/components.js b/components.js
index 72cb8c828..ccc360b3c 100644
--- a/components.js
+++ b/components.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/components');
+    module.exports = require("./src/components");
 } else {
-    module.exports = require('./dist/components');
+    module.exports = require("./dist/components");
 }
diff --git a/docs/10-awesome-marko-features.md b/docs/10-awesome-marko-features.md
index 772ebd5dc..98aa07ad2 100644
--- a/docs/10-awesome-marko-features.md
+++ b/docs/10-awesome-marko-features.md
@@ -127,7 +127,7 @@ button.example-button on-click('increment') — Click me!
 
 Can’t make up your mind or just want to paste in that code snippet from
 StackOverflow? HTML syntax can be used within in the concise syntax. You’ll come
-back and make it consistent…*one day*.
+back and make it consistent…_one day_.
 
 #### 5. Import JavaScript modules
 
@@ -174,8 +174,8 @@ imported:
 #### 7. Use JavaScript to set CSS classes and styles
 
 Setting CSS classes and styles is made easy using JavaScript! Marko will happily
-accept simple strings, JavaScript objects and arrays (*falsy values will be
-ignored).*
+accept simple strings, JavaScript objects and arrays (_falsy values will be
+ignored)._
 
 ```marko
 $ const fontColor = input.color || 'blue';
@@ -243,23 +243,29 @@ components](http://markojs.com/docs/server-side-rendering/) rendered on the
 server when the page loads in the browser):
 
 ```js
-require('marko/node-require').install(); // require .marko files!
+require("marko/node-require").install(); // require .marko files!
 
-const http = require('http');
-const template = require('./template');
+const http = require("http");
+const template = require("./template");
 
-http.createServer().on('request', (req, res) => {
-  template.render({
-    name: 'Frank',
-    count: 30,
-    colors: ['red', 'green', 'blue']
-  }, res);
-}).listen(8080);
+http
+  .createServer()
+  .on("request", (req, res) => {
+    template.render(
+      {
+        name: "Frank",
+        count: 30,
+        colors: ["red", "green", "blue"]
+      },
+      res
+    );
+  })
+  .listen(8080);
 ```
 
 #### Bonus: Friendly compile-time errors
 
-We all make mistakes *every now and then*. Typo in your custom tag? Forgot an
+We all make mistakes _every now and then_. Typo in your custom tag? Forgot an
 ending tag? No worries! Marko will give you a friendly error message and point
 you right to the problematic code.
 
@@ -276,7 +282,7 @@ Unrecognized tag: fancy-buttn — More details: https://github.com/marko-js/mark
 
 Coming soon: auto correction and autonomous coding
 
-*****
+---
 
-*Cover image credit:
-*[Wikipedia](https://en.wikipedia.org/wiki/List_of_rock_formations#/media/File:Amanhecer_no_Hercules_--.jpg)
+_Cover image credit:
+_[Wikipedia](https://en.wikipedia.org/wiki/List_of_rock_formations#/media/File:Amanhecer_no_Hercules_--.jpg)
diff --git a/docs/components.md b/docs/components.md
index 3d9f316d9..7ec371b4f 100644
--- a/docs/components.md
+++ b/docs/components.md
@@ -12,15 +12,14 @@ With Marko, the DOM output of a UI component is based on input properties and a
 
 Marko makes it easy to to co-locate your component's class and styles with the HTML view that they correspond to. The following are the key part of any UI component:
 
-- __View__ - The HTML template for your UI component. Receives input properties and states and renders to either HTML (server-side) or virtual DOM nodes (browser-side)
-- __Client-side behavior__ - Implemented as a JavaScript class with methods and properties to provide initialization, event handling (including DOM events, custom events and lifecycle events) and state management
-- __Styling__ - Cascading StyleSheet with support for CSS preprocessors such as Less or Sass
+* **View** - The HTML template for your UI component. Receives input properties and states and renders to either HTML (server-side) or virtual DOM nodes (browser-side)
+* **Client-side behavior** - Implemented as a JavaScript class with methods and properties to provide initialization, event handling (including DOM events, custom events and lifecycle events) and state management
+* **Styling** - Cascading StyleSheet with support for CSS preprocessors such as Less or Sass
 
 ## Server-side rendering
 
 A UI component can be rendered on the server or in the browser, but in either case, the UI component instance will be mounted to a DOM node in the browser automatically. If a UI component tree is rendered on the server then Marko will automatically recreate the UI component tree in the browser with no extra code required. For more details, please see [Server-side rendering](/docs/server-side-rendering/).
 
-
 ## Single-file components
 
 Marko allows you to define a `class` for a component right in the `.marko` view and call methods of that class with `on-*` attributes:
@@ -45,7 +44,7 @@ class {
 
 ### Styles
 
-Adding styles to your view is also made easy.  These styles won't be output in a `<style>` tag as inline styles usually are, but will result in the style being externalized so it isn't duplicated should a component be used more than once on the page.
+Adding styles to your view is also made easy. These styles won't be output in a `<style>` tag as inline styles usually are, but will result in the style being externalized so it isn't duplicated should a component be used more than once on the page.
 
 ```marko
 style {
@@ -61,6 +60,7 @@ style {
 ```
 
 If you use a css preprocessor, you can add the extension right on `style`:
+
 ```marko
 style.less {
     button.primary {
@@ -71,16 +71,15 @@ style.less {
 
 > **Note:** The code in the style section is processed in a context that is separate from the rest of the template so so you won't be able to use JavaScript variables inside the style section. If you need variables in your CSS then you will need to use a CSS pre-processor that supports variables.
 
-
 ## Multi-file components
 
-You might prefer to keep your component's class and style definitions in separate files from the view definition - the classical separation of HTML, CSS and JavaScript.  Marko makes this possible with a simple filename based convention.
+You might prefer to keep your component's class and style definitions in separate files from the view definition - the classical separation of HTML, CSS and JavaScript. Marko makes this possible with a simple filename based convention.
 
 > **ProTip:** If your motivation to move the component's class and styles out to a separate file is that the code is getting too large, consider splitting the component into smaller, more manageable components.
 
 ### Supporting files
 
-Marko automatically discovers supporting files in the same directory as a Marko view.  For example if you have a view named `counter.marko`, Marko will automatically look for `counter.component.js` and `counter.style.css`.
+Marko automatically discovers supporting files in the same directory as a Marko view. For example if you have a view named `counter.marko`, Marko will automatically look for `counter.component.js` and `counter.style.css`.
 
 ```
 counter.marko
@@ -88,7 +87,7 @@ counter.component.js
 counter.style.css
 ```
 
-Marko also handles views named `index.marko` specially, it will look for `component.js` and `style.css` in addition to `index.component.js` and `index.style.css`.  This allows easily grouping component files into a directory:
+Marko also handles views named `index.marko` specially, it will look for `component.js` and `style.css` in addition to `index.component.js` and `index.style.css`. This allows easily grouping component files into a directory:
 
 ```
 counter/
@@ -101,18 +100,19 @@ In your `component.js` file, export the component's class:
 
 ```js
 module.exports = class {
-    onCreate() {
-        this.state = {
-            count:0
-        };
-    }
-    increment() {
-        this.state.count++;
-    }
-}
+  onCreate() {
+    this.state = {
+      count: 0
+    };
+  }
+  increment() {
+    this.state.count++;
+  }
+};
 ```
 
 In your `index.marko` file, you can reference methods from the class using `on-*` attributes:
+
 ```marko
 <div>
   <h2>The current count is ${state.count}</h2>
@@ -121,46 +121,46 @@ In your `index.marko` file, you can reference methods from the class using `on-*
 ```
 
 And in your `style.css`, define the style:
+
 ```css
 button.primary {
-    background-color:#09c;
+  background-color: #09c;
 }
 ```
 
 > **ProTip:** In addition to looking for `[name].style.css`, Marko actually looks for `[name].style.*` so it will also pick up any css preprocessor you're using (less, stylus, scss, etc.).
 
-
 ### Components with plain objects
 
 If you're targeting a browser that does not support classes, a plain object may also be exported:
 
 ```js
 module.exports = {
-    onCreate: function() {
-        this.state = {
-            count:0
-        };
-    },
-    increment: function() {
-        this.state.count++;
-    }
-}
+  onCreate: function() {
+    this.state = {
+      count: 0
+    };
+  },
+  increment: function() {
+    this.state.count++;
+  }
+};
 ```
 
 ## Split components
 
-Split components allow you to optimize for the case where a component is rendered on the server, but doesn't need to be re-rendered in the browser.  Because the component doesn't need to be rendered in the browser, the template does not need to be sent to the browser.  This can reduce your page weight by a few hundred bytes in some cases.
+Split components allow you to optimize for the case where a component is rendered on the server, but doesn't need to be re-rendered in the browser. Because the component doesn't need to be rendered in the browser, the template does not need to be sent to the browser. This can reduce your page weight by a few hundred bytes in some cases.
 
 > **Note:** If a split component is the child of a stateful component, the full rendering logic will still be sent down because the parent component may pass new input to the split component, requiring it to re-render.
 
 Additionally if _all_ components rendered on a page are split components, Marko's VDOM and rendering runtime is not necessary and therefore not sent to the browser, which can further reduce page weight by a few kilobytes.
 
-> **ProTip:** Don't over-optimize.  If your component really doesn't need re-rendering, go ahead and split, but don't forgo stateful re-rendering when it would make your code more maintainable.
+> **ProTip:** Don't over-optimize. If your component really doesn't need re-rendering, go ahead and split, but don't forgo stateful re-rendering when it would make your code more maintainable.
 
 ### Usage
 
 Marko discovers split components in a similar way to how it discovers an external component class:
-for example if you have a view named `button.marko`, it will automatically look for `button.component-browser.js`.  If your view is named `index.marko`, it will look for `component-browser.js` in addition to `index.component-browser.js`.
+for example if you have a view named `button.marko`, it will automatically look for `button.component-browser.js`. If your view is named `index.marko`, it will look for `component-browser.js` in addition to `index.component-browser.js`.
 
 ```
 counter/
@@ -168,10 +168,12 @@ counter/
     component-browser.js
 ```
 
-A split component might also need to do some set up as part of the initial render.  In this case, the component may define a second component class to use the `onCreate`, `onInput`, and `onRender` [lifecycle methods](#lifecycle-events).  This class can be exported from `component.js` or defined right in the template as with single-file components.
+A split component might also need to do some set up as part of the initial render. In this case, the component may define a second component class to use the `onCreate`, `onInput`, and `onRender` [lifecycle methods](#lifecycle-events). This class can be exported from `component.js` or defined right in the template as with single-file components.
+
 ### Example
 
 _index.marko_
+
 ```marko
 class {
     onCreate() {
@@ -183,12 +185,13 @@ class {
 ```
 
 _component-browser.js_
+
 ```js
 module.exports = {
-    shout() {
-        alert('My favorite number is ' + this.number + '!');
-    }
-}
+  shout() {
+    alert("My favorite number is " + this.number + "!");
+  }
+};
 ```
 
 ## Event handling
@@ -226,10 +229,10 @@ class {
 
 Any string that represents a valid JavaScript identifier is allowed for the event handler method name and it can be a JavaScript expression. The following arguments are passed to the handler method when the event is fired:
 
-1. `...args` - Any extra arguments bind are _prepended_ to the arguments passed to the component's handler method
-    - For example: `on-click('onButtonClick', arg1, arg2)` → `onButtonClick(arg1, arg2, event, el)`)
-2. `event` - The native DOM event
-3. `el` - The DOM element that the event listener was attached to
+1.  `...args` - Any extra arguments bind are _prepended_ to the arguments passed to the component's handler method
+    * For example: `on-click('onButtonClick', arg1, arg2)` → `onButtonClick(arg1, arg2, event, el)`)
+2.  `event` - The native DOM event
+3.  `el` - The DOM element that the event listener was attached to
 
 When using the `on-*` or `once-*` attributes to attach event listeners, Marko will use event delegation that is more efficient than using `el.addEventListener()` directly. Please see [Why is Marko Fast? » Event delegation](/docs/why-is-marko-fast/#event-delegation) for more details.
 
@@ -256,14 +259,14 @@ class {
 
 Any string that represents a valid JavaScript identifier is allowed for the event handler method name and it can be a JavaScript expression. The following arguments are passed to the handler method when the event is fired:
 
-1. `...args` - Any extra bind arguments are _prepended_ to the arguments passed to the component's handler method
-2. `...eventArgs` - The arguments passed to `this.emit()` by the target UI component
-3. `component` - The component instance that the event listener was attached to
+1.  `...args` - Any extra bind arguments are _prepended_ to the arguments passed to the component's handler method
+2.  `...eventArgs` - The arguments passed to `this.emit()` by the target UI component
+3.  `component` - The component instance that the event listener was attached to
 
 The following code illustrates how the UI component for `<counter>` might emit the `change` event:
 
-
 _counter/index.marko_
+
 ```marko
 class {
   onCreate() {
@@ -287,12 +290,10 @@ class {
 </div>
 ```
 
-
-
 > **ProTip:** Unlike native DOM events, UI component custom events may be emitted with multiple arguments. For example:
 
 ```js
-this.emit('foo', 'bar', 'baz');
+this.emit("foo", "bar", "baz");
 ```
 
 ## Attributes
@@ -370,11 +371,12 @@ The `key` attribute can be used to pair HTML elements or UI components that are
 
 Putting the `:scoped` modifier on an attribute will result in the attribute value being prefixed with a unique ID associated with the current UI component. Thus, `:scoped` attribute modifiers can be used to assign a globally unique attribute value from a value that only needs to be unique to the current UI component.
 
-Certain HTML attributes reference the `id` of other elements on the page.  For example, the [HTML `<label>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label) `for` attribute takes an `id` as its value.  Many `ARIA` attributes ([`aria-describedby`](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_aria-describedby_attribute), etc.) also take an `id` as their value.
+Certain HTML attributes reference the `id` of other elements on the page. For example, the [HTML `<label>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label) `for` attribute takes an `id` as its value. Many `ARIA` attributes ([`aria-describedby`](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_aria-describedby_attribute), etc.) also take an `id` as their value.
 
 The `:scoped` modifier on an attribute allows you to reference another element as shown in the following examples:
 
 **`for:scoped`**
+
 ```marko
 <label for:scoped="name">Name</label>
 <input id:scoped="name" value="Frank"/>
@@ -477,7 +479,7 @@ suffix:
 
 ### `this.el`
 
-The root [HTML element](https://developer.mozilla.org/en-US/docs/Web/API/element) that the component is bound to.  If there are multiple roots, this is the first.
+The root [HTML element](https://developer.mozilla.org/en-US/docs/Web/API/element) that the component is bound to. If there are multiple roots, this is the first.
 
 ### `this.els`
 
@@ -489,9 +491,9 @@ The String ID of the root [HTML element](https://developer.mozilla.org/en-US/doc
 
 ### `this.state`
 
-The current state for the component.  Changing `this.state` or any of its direct properties will result in the component being re-rendered.
+The current state for the component. Changing `this.state` or any of its direct properties will result in the component being re-rendered.
 
-Only properties that exist when `this.state` is first defined will be watched for changes.  If you don't need a property initially, you can set it to `null`.
+Only properties that exist when `this.state` is first defined will be watched for changes. If you don't need a property initially, you can set it to `null`.
 
 ```marko
 class {
@@ -520,7 +522,7 @@ this.state.numbers.push(num);
 
 // mark numbers as dirty, because a `push`
 // won't be automatically detected by Marko
-this.setStateDirty('numbers');
+this.setStateDirty("numbers");
 ```
 
 ### `this.input`
@@ -566,18 +568,18 @@ The `state` variable refers to UI component's state object and is the unwatched
 
 ### `destroy([options])`
 
-| option  | type | default | description |
-| ------- | ---- | ------- | ----------- |
-| `removeNode` | `Boolean` | `true` | `false` will keep the component in the DOM while still unsubscribing all events from it |
-| `recursive` | `Boolean` | `true` | `false` will prevent child components from being destroyed |
+| option       | type      | default | description                                                                             |
+| ------------ | --------- | ------- | --------------------------------------------------------------------------------------- |
+| `removeNode` | `Boolean` | `true`  | `false` will keep the component in the DOM while still unsubscribing all events from it |
+| `recursive`  | `Boolean` | `true`  | `false` will prevent child components from being destroyed                              |
 
 Destroys the component by unsubscribing from all listeners made using the `subscribeTo` method and then detaching the component's root element from the DOM. All nested components (discovered by querying the DOM) are also destroyed.
 
 ```javascript
 component.destroy({
-	removeNode: true, //true by default
-	recursive: true //true by default
-})
+  removeNode: true, //true by default
+  recursive: true //true by default
+});
 ```
 
 ### `forceUpdate()`
@@ -589,48 +591,48 @@ Queue the component to re-render and skip all checks to see if it actually needs
 
 ### `getEl([key, index])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `key` | `String` | _optional_ the scoped identifier for the element |
-| `index` | `Number` | _optional_ the index of the component, if `key` references a repeated component |
-| return value | `HTMLElement` | the element matching the key or `this.el` if no key is provided |
+| params       | type          | description                                                                     |
+| ------------ | ------------- | ------------------------------------------------------------------------------- |
+| `key`        | `String`      | _optional_ the scoped identifier for the element                                |
+| `index`      | `Number`      | _optional_ the index of the component, if `key` references a repeated component |
+| return value | `HTMLElement` | the element matching the key or `this.el` if no key is provided                 |
 
 Returns a nested DOM element by prefixing the provided `key` with the component's ID. For Marko, nested DOM elements should be assigned an ID using the `key` custom attribute.
 
 ### `getEls(key)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `key` | `String` | the scoped identifier for the element |
+| params       | type                 | description                                           |
+| ------------ | -------------------- | ----------------------------------------------------- |
+| `key`        | `String`             | the scoped identifier for the element                 |
 | return value | `Array<HTMLElement>` | an array of _repeated_ DOM elements for the given key |
 
 Repeated DOM elements must have a value for the `key` attribute that ends with `[]` (e.g., `key="items[]"`)
 
 ### `getElId([key, index])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `key` | `String` | _optional_ the scoped identifier for the element |
-| `index` | `Number` | _optional_ the index of the component, if `key` references a repeated component |
-| return value | `String` | the element ID matching the key or `this.el.id` if `key` is undefined |
+| params       | type     | description                                                                     |
+| ------------ | -------- | ------------------------------------------------------------------------------- |
+| `key`        | `String` | _optional_ the scoped identifier for the element                                |
+| `index`      | `Number` | _optional_ the index of the component, if `key` references a repeated component |
+| return value | `String` | the element ID matching the key or `this.el.id` if `key` is undefined           |
 
 Similar to `getEl`, but only returns the String ID of the nested DOM element instead of the actual DOM element.
 
 ### `getComponent(key[, index])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `key` | `String` | the scoped identifier for the element |
-| `index` | `Number` | _optional_ the index of the component, if `key` references a repeated component |
+| params       | type        | description                                                                                                                                                                                                      |
+| ------------ | ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `key`        | `String`    | the scoped identifier for the element                                                                                                                                                                            |
+| `index`      | `Number`    | _optional_ the index of the component, if `key` references a repeated component                                                                                                                                  |
 | return value | `Component` | a reference to a nested `Component` for the given key. If an `index` is provided and the target component is a repeated component (e.g. `key="items[]"`) then the component at the given index will be returned. |
 
 ### `getComponents(key, [, index])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `key` | `String` | the scoped identifier for the element |
-| `index` | `Number` | _optional_ the index of the component, if `key` references a repeated component |
-| return value | `Array<Component>` | an array of _repeated_ `Component` instances for the given key |
+| params       | type               | description                                                                     |
+| ------------ | ------------------ | ------------------------------------------------------------------------------- |
+| `key`        | `String`           | the scoped identifier for the element                                           |
+| `index`      | `Number`           | _optional_ the index of the component, if `key` references a repeated component |
+| return value | `Array<Component>` | an array of _repeated_ `Component` instances for the given key                  |
 
 Repeated components must have a value for the `key` attribute that ends with `[]` (e.g., `key="items[]"`)
 
@@ -643,8 +645,8 @@ Returns `true` if a component has been destroyed using
 
 ### `replaceState(newState)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
+| params     | type     | description                                      |
+| ---------- | -------- | ------------------------------------------------ |
 | `newState` | `Object` | a new state object to replace the previous state |
 
 Replaces the state with an entirely new state. Equivalent to `this.state = newState`.
@@ -653,46 +655,46 @@ Replaces the state with an entirely new state. Equivalent to `this.state = newSt
 
 ### `rerender([input])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
+| params  | type     | description                                        |
+| ------- | -------- | -------------------------------------------------- |
 | `input` | `Object` | _optional_ new input data to use when re-rendering |
 
 Rerenders the component using its `renderer` and either supplied `input` or internal `input` and `state`.
 
 ### `setState(name, value)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `name` | `String` | the name of the state property to update |
-| `value` | `Any` | the new value for the state property |
+| params  | type     | description                              |
+| ------- | -------- | ---------------------------------------- |
+| `name`  | `String` | the name of the state property to update |
+| `value` | `Any`    | the new value for the state property     |
 
-Used to change the value of a single state property.  Equivalent to setting `this.state[name] = value` except it will also work for adding new properties to the component state.
+Used to change the value of a single state property. Equivalent to setting `this.state[name] = value` except it will also work for adding new properties to the component state.
 
 ```javascript
-this.setState('disabled', true);
+this.setState("disabled", true);
 ```
 
 ### `setState(newState)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
+| params     | type     | description                                         |
+| ---------- | -------- | --------------------------------------------------- |
 | `newState` | `Object` | a new state object to merge into the previous state |
 
 Used to change the value of multiple state properties.
 
 ```js
 this.setState({
-	disabled: true,
-	size: 'large'
+  disabled: true,
+  size: "large"
 });
 ```
 
 ### `setStateDirty(name[, value])`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `name` | `String` | the name of the state property to mark as dirty |
-| `value` | `Any` | _optional_ a new value for the state property |
+| params  | type     | description                                     |
+| ------- | -------- | ----------------------------------------------- |
+| `name`  | `String` | the name of the state property to mark as dirty |
+| `value` | `Any`    | _optional_ a new value for the state property   |
 
 Force a state property to be changed even if the value is equal to the old value. This is helpful in cases where a change occurs to a complex object that would not be detected by a shallow compare. Invoking this function completely circumvents all property equality checks (shallow compares) and always rerenders the component.
 
@@ -706,28 +708,29 @@ _example.js_
 ```javascript
 // Because this does not create a new array, the change
 // would not be detected by a shallow property comparison
-this.state.colors.push('red');
+this.state.colors.push("red");
 
 // Force that particular state property to be considered dirty so
 // that it will trigger the component's view to be updated
-this.setStateDirty('colors');
+this.setStateDirty("colors");
 ```
 
 ### `subscribeTo(emitter)`
 
-| params  | description |
-| ------- | ----------- |
-| `emitter` | a node.js [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter) or a DOM object that emits events (`window`, `document`, etc.) |
-| return value | a tracked subscription |
+| params       | description                                                                                                                                             |
+| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `emitter`    | a node.js [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter) or a DOM object that emits events (`window`, `document`, etc.) |
+| return value | a tracked subscription                                                                                                                                  |
 
-When a component is destroyed, it is necessary to remove any listeners that were attached by the component in order to prevent a memory leak.  By using `subscribeTo`, Marko will automatically track and remove any listeners you attach when the component is destroyed.
+When a component is destroyed, it is necessary to remove any listeners that were attached by the component in order to prevent a memory leak. By using `subscribeTo`, Marko will automatically track and remove any listeners you attach when the component is destroyed.
 
 Marko uses [`listener-tracker`](https://github.com/patrick-steele-idem/listener-tracker) to provide this feature.
 
 _example.js_
+
 ```js
-this.subscribeTo(window).on('scroll', () => {
-    console.log('The user scrolled the window!');
+this.subscribeTo(window).on("scroll", () => {
+  console.log("The user scrolled the window!");
 });
 ```
 
@@ -736,40 +739,40 @@ this.subscribeTo(window).on('scroll', () => {
 Immediately, executes any pending updates to the DOM rather than following the normal queued update mechanism for rendering.
 
 ```js
-this.setState('foo', 'bar');
+this.setState("foo", "bar");
 this.update(); // Force the DOM to update
-this.setState('hello', 'world');
+this.setState("hello", "world");
 this.update(); // Force the DOM to update
 ```
 
 ## Event methods
 
-A Marko component inherits from [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter).  Below are a few commonly used methods, view the node docs for the full list.
+A Marko component inherits from [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter). Below are a few commonly used methods, view the node docs for the full list.
 
 ### `emit(eventName, ...args)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `eventName` | `String` | the name of the event |
-| `...args` | `Any` | all subsequent parameters are passed to the listeners |
+| params      | type     | description                                           |
+| ----------- | -------- | ----------------------------------------------------- |
+| `eventName` | `String` | the name of the event                                 |
+| `...args`   | `Any`    | all subsequent parameters are passed to the listeners |
 
 Emits a UI component custom event. If a UI component attached a listener with the matching `eventName` then the corresponding event listener method will be automatically invoked. Event listeners can be attached using either the [`on-[event](methodName, ...args)` attribute](#declarative-custom-events) attribute or `targetComponent.on()`.
 
 ### `on(eventName, handler)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `eventName` | `String` | the name of the event to listen for |
-| `handler` | `Function` | the function to call when the event is fired |
+| params      | type       | description                                  |
+| ----------- | ---------- | -------------------------------------------- |
+| `eventName` | `String`   | the name of the event to listen for          |
+| `handler`   | `Function` | the function to call when the event is fired |
 
 Adds the listener function to the end of the listeners array for the event named eventName. No checks are made to see if the listener has already been added. Multiple calls passing the same combination of eventName and listener will result in the listener being added, and called, multiple times.
 
 ### `once(eventName, handler)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `eventName` | `String` | the name of the event to listen for |
-| `handler` | `Function` | the function to call when the event is fired |
+| params      | type       | description                                  |
+| ----------- | ---------- | -------------------------------------------- |
+| `eventName` | `String`   | the name of the event to listen for          |
+| `handler`   | `Function` | the function to call when the event is fired |
 
 Adds a one time listener function for the event named eventName. The next time eventName is triggered, this listener is removed and then invoked.
 
@@ -777,12 +780,12 @@ Adds a one time listener function for the event named eventName. The next time e
 
 Marko defines six distinct lifecycle events:
 
-- `create`
-- `input`
-- `render`
-- `mount`
-- `update`
-- `destroy`
+* `create`
+* `input`
+* `render`
+* `mount`
+* `update`
+* `destroy`
 
 These events are emitted at specific points over the lifecycle of a component as shown below:
 
@@ -807,7 +810,7 @@ emit('render') → emit('update')
 **Destroy**
 
 ```js
-emit('destroy')
+emit("destroy");
 ```
 
 ### Lifecycle event methods
@@ -825,18 +828,19 @@ class {
 }
 ```
 
-> **ProTip:** When a lifecycle event occurs in the browser, the corresponding event is emitted on the component instance.  A parent component, or other code that has access to the component instance, can listen for these events. For example:
+> **ProTip:** When a lifecycle event occurs in the browser, the corresponding event is emitted on the component instance. A parent component, or other code that has access to the component instance, can listen for these events. For example:
+
 ```js
-component.on('input', function(input, out) {
-    // The component was destroyed!
+component.on("input", function(input, out) {
+  // The component was destroyed!
 });
 ```
 
 ### `onCreate(input, out)`
 
-| params  | description |
-| ------- | ----------- |
-| `input` | the input data used to render the component for the first time |
+| params  | description                                                     |
+| ------- | --------------------------------------------------------------- |
+| `input` | the input data used to render the component for the first time  |
 | `out`   | the async `out` used to render the component for the first time |
 
 The `create` event is emitted (and `onCreate` is called) when the component is first created.
@@ -844,6 +848,7 @@ The `create` event is emitted (and `onCreate` is called) when the component is f
 `onCreate` is typically used to set the initial state for stateful components:
 
 _example.marko_
+
 ```marko
 class {
     onCreate(input) {
@@ -856,29 +861,30 @@ class {
 
 ### `onInput(input, out)`
 
-| params  | description |
-| ------- | ----------- |
+| params  | description        |
+| ------- | ------------------ |
 | `input` | the new input data |
 
 The `input` event is emitted (and `onInput` is called) when the component receives input: both the initial input and for any subsequent updates to its input.
 
 ### `onRender(out)`
 
-| params  | description |
-| ------- | ----------- |
-| `out`   | the async `out` for the current render |
+| params | description                            |
+| ------ | -------------------------------------- |
+| `out`  | the async `out` for the current render |
 
 The `render` event is emitted (and `onRender` is called) when the component is about to be rendered (or re-rendered).
 
 ### `onMount()`
 
-The `mount` event is emitted (and `onMount` is called) when the component is first mounted to the DOM.  For a server-rendered component, this is the first event that is emitted in the browser.
+The `mount` event is emitted (and `onMount` is called) when the component is first mounted to the DOM. For a server-rendered component, this is the first event that is emitted in the browser.
 
-This is the first point at which `this.el` and `this.els` are defined.  `onMount` is commonly used to attach third-party javascript (or `jQuery` if you're still doing that) plugins to the newly-mounted DOM element(s).
+This is the first point at which `this.el` and `this.els` are defined. `onMount` is commonly used to attach third-party javascript (or `jQuery` if you're still doing that) plugins to the newly-mounted DOM element(s).
 
 For example, attaching a library that monitors whether the component is in the viewport:
 
 _example.marko_
+
 ```marko
 import scrollmonitor from 'scrollmonitor';
 
@@ -895,11 +901,11 @@ class {
 
 ### `onUpdate()`
 
-The `update` event is emitted (and `onUpdate` is called) when the component is called after a component has re-rendered and the DOM has been updated.  If a re-render does not cause the DOM to be updated (nothing changed), this event will not be fired.
+The `update` event is emitted (and `onUpdate` is called) when the component is called after a component has re-rendered and the DOM has been updated. If a re-render does not cause the DOM to be updated (nothing changed), this event will not be fired.
 
 ### `onDestroy()`
 
-The `destroy` event is emitted (and `onDestroy` is called) when the component is about to be unmounted from the DOM and cleaned up.  `onDestroy` should be used to do any additional clean up beyond what Marko handles itself.
+The `destroy` event is emitted (and `onDestroy` is called) when the component is about to be unmounted from the DOM and cleaned up. `onDestroy` should be used to do any additional clean up beyond what Marko handles itself.
 
 For example, cleaning up from our `scrollmonitor` example in [`onMount`](#codeonmountcode):
 
diff --git a/docs/concise.md b/docs/concise.md
index 1ce9dcfb1..3b02e90b3 100644
--- a/docs/concise.md
+++ b/docs/concise.md
@@ -1,14 +1,16 @@
 # Concise syntax
 
-Marko's concise syntax is very similar to the HTML syntax, except it's more... concise.  Essentially, you take an HTML tag, remove the angle brackets (`<>`) and use indentation rather than a closing tag:
+Marko's concise syntax is very similar to the HTML syntax, except it's more... concise. Essentially, you take an HTML tag, remove the angle brackets (`<>`) and use indentation rather than a closing tag:
 
 _input.marko_
+
 ```marko
 div class="thumbnail"
     img src="https://example.com/thumb.png"
 ```
 
 _output.html_
+
 ```html
 <div class="thumbnail">
     <img src="https://example.com/thumb.png"/>
@@ -20,6 +22,7 @@ _output.html_
 Marko provides a shorthand for declaring classes and ids on an element:
 
 _input.marko_
+
 ```marko
 div.my-class
 span#my-id
@@ -29,6 +32,7 @@ button#submit.primary.large
 Yields this HTML:
 
 _output.html_
+
 ```html
 <div class="my-class"></div>
 <span id="my-id"></span>
@@ -39,11 +43,12 @@ _output.html_
 
 ## Text
 
-Text in concise mode is denoted by two or more dashes (`--`).  
+Text in concise mode is denoted by two or more dashes (`--`).
 
 If there is text on the same line following `--`, it is single-line text:
 
 _single-line-text.marko_
+
 ```marko
 -- Hello world
 ```
@@ -51,6 +56,7 @@ _single-line-text.marko_
 The dashes can also follow an element to give it a single text node as a child
 
 _single-line-text.marko_
+
 ```marko
 div -- Hello world
 ```
@@ -58,6 +64,7 @@ div -- Hello world
 If there is a line break immediately following `--`, everything following the `--` at the current indentation is parsed as multi-line line text.
 
 _multi-line-text.marko_
+
 ```marko
 div
     --
@@ -71,9 +78,10 @@ div
     text
 ```
 
-A multi-line text block can be ended by the same number of dashes that opened it.  This allows it to  have siblings:
+A multi-line text block can be ended by the same number of dashes that opened it. This allows it to have siblings:
 
 _multi-line-text.marko_
+
 ```marko
 div
     img src="https://example.com/photo.png"
@@ -90,6 +98,7 @@ div
 There is one "gotcha" that you need to be aware of. The Marko parser starts out in the concise mode. Therefore, given the following template:
 
 _input.marko_
+
 ```marko
 Hello World
 Welcome to Marko
@@ -98,6 +107,7 @@ Welcome to Marko
 The output would be the following:
 
 _output.html_
+
 ```html
 <Hello World></Hello>
 <Welcome to Marko></Welcome>
@@ -106,7 +116,8 @@ _output.html_
 Instead, prefix the lines with `--` so they are parsed as text:
 
 _input.marko_
+
 ```marko
 -- Hello World
 -- Welcome to Marko
-```
\ No newline at end of file
+```
diff --git a/docs/core-tags.md b/docs/core-tags.md
index 87ba0a1ba..26d203064 100644
--- a/docs/core-tags.md
+++ b/docs/core-tags.md
@@ -39,6 +39,7 @@ And support complex expressions:
 ### `<for>`
 
 The `<for>` tag allows iterating over an array of items:
+
 ```marko
 <ul>
     <for(color in colors)>
@@ -48,6 +49,7 @@ The `<for>` tag allows iterating over an array of items:
 ```
 
 It may also be applied as an attribute:
+
 ```marko
 <ul>
     <li for(color in colors)>${color}</li>
@@ -57,7 +59,7 @@ It may also be applied as an attribute:
 With either of the above templates, and the following value for `colors`:
 
 ```js
-var colors = ['red', 'green', 'blue'];
+var colors = ["red", "green", "blue"];
 ```
 
 The output HTML would be the following:
@@ -167,7 +169,6 @@ The `from`, `to` and `step` values must be numerical expressions. If not specifi
 
 #### Custom Iterator
 
-
 ```marko
 static function reverseIterator(arrayList, callback) {
     for(var i=arrayList.length-1; i>=0; i--){
@@ -218,7 +219,6 @@ $ var n = 0;
 
 ### `body-only-if`
 
-
 If you find that you have a wrapper element that is conditional, but whose body should always be rendered then you can use the `body-only-if` attribute to handle this use case. For example, to only render a wrapping `<a>` tag if there is a valid URL then you could do the following:
 
 ```marko
@@ -246,9 +246,10 @@ Some body content
 The following tags are always written using the [concise syntax](./concise.md), even when using HTML syntax for tags that generate HTML output.
 
 ### `import`
+
 > **Static:** The code generated by `import` will run once when the template is loaded and be shared by all calls to render. It must be declared as a top level tag and does not have access to `data`, `state`, or other values passed in at render.
 
-The `import` tag is used to access data and functions from external files.  It follows the same syntax as the [JavaScript `import` statement](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import).
+The `import` tag is used to access data and functions from external files. It follows the same syntax as the [JavaScript `import` statement](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import).
 
 ```marko
 import sum from './utils/sum';
@@ -308,9 +309,10 @@ import Hello from './components/hello/index.marko';
 
 #### Layouts with nested attributes
 
-In addition to including external content, you can inject additional content chunks into the external content.  This is accomplished by using nested attribute tags which are denoted by the `@` symbol:
+In addition to including external content, you can inject additional content chunks into the external content. This is accomplished by using nested attribute tags which are denoted by the `@` symbol:
 
 _page.marko_
+
 ```marko
 <include('./layout.marko')>
     <@body>
@@ -322,6 +324,7 @@ _page.marko_
 Then in your layout template you can include the injected content:
 
 _layout.marko_
+
 ```marko
 <!doctype html>
 <html>
@@ -389,6 +392,7 @@ sample template shows how to use macro functions inside expressions:
 The `<await>` tag is used to dynamically load in content from a data provider. The data provider can be a `Promise` or a `callback`. Once the provider returns it's results the children are rendered.
 
 await-example.marko
+
 ```marko
 $ var personPromise = new Promise((resolve, reject) => {
     setTimeout(function() {
@@ -404,27 +408,28 @@ $ var personPromise = new Promise((resolve, reject) => {
 ```
 
 Advanced implementation:
-+ `<await>` tag signature
-    * Basic usage: `<await(results from dataProvider)>...</await>`
-    * Optional attributes
-        - client-reorder `boolean`
-        - arg `expression`
-        - arg-* `string`
-        - method `string`
-        - timeout `integer`
-        - timeout-message `string`
-        - error-message `string`
-        - placeholder `string`
-        - renderTimeout `function`
-        - renderError `function`
-        - renderPlaceholder `function`
-        - name `string`
-        - scope `expression`
-        - show-after `string`
-    * Optional child tags
-        - `<await-placeholder>Loading...</await-placeholder>`
-        - `<await-timeout>Request timed out</await-timeout>`
-        - `<await-error>Request errored</await-error>`
+
+* `<await>` tag signature
+  * Basic usage: `<await(results from dataProvider)>...</await>`
+  * Optional attributes
+    * client-reorder `boolean`
+    * arg `expression`
+    * arg-\* `string`
+    * method `string`
+    * timeout `integer`
+    * timeout-message `string`
+    * error-message `string`
+    * placeholder `string`
+    * renderTimeout `function`
+    * renderError `function`
+    * renderPlaceholder `function`
+    * name `string`
+    * scope `expression`
+    * show-after `string`
+  * Optional child tags
+    * `<await-placeholder>Loading...</await-placeholder>`
+    * `<await-timeout>Request timed out</await-timeout>`
+    * `<await-error>Request errored</await-error>`
 
 ## Comments
 
@@ -442,7 +447,7 @@ Example comments:
 /*
  Block comments are also supported
  */
--- Hello
+--Hello;
 ```
 
 If you would like for your HTML comment to show up in the final output then you can use the custom `html-comment` tag.
@@ -450,18 +455,21 @@ If you would like for your HTML comment to show up in the final output then you
 ### `<html-comment>`
 
 _input.marko_
+
 ```marko
 <html-comment>This is a comment that *will* be rendered</html-comment>
 <h1>Hello</h1>
 ```
 
 _output.html_
+
 ```html
 <!--This is a comment that *will* be rendered-->
 <h1>Hello</h1>
 ```
 
 Alternatively, the `<marko-compiler-options>` tag may be used to configure comments for the entire template:
+
 ```marko
 <marko-compiler-options preserve-comments/>
 ```
@@ -479,6 +487,7 @@ Whitespace can be preserved using the `preserve-whitespace` attribute:
     be preserved.
 </div>
 ```
+
 Alternatively, the `<marko-compiler-options>` tag may be used to configure whitespace for the entire template:
 
 ```marko
@@ -488,11 +497,13 @@ Alternatively, the `<marko-compiler-options>` tag may be used to configure white
 ### `marko-body`
 
 The `marko-body` attribute can be used to control how body content is parsed. The following values are supported:
-- `html` - Body content will be parsed HTML (the default)
-- `static-text` - Body content will be parsed as static text (HTML tags will be ignored). Placeholders will be ignored.
-- `parsed-text` - Body content will be parsed as text (HTML tags will be ignored). Placeholders will not be ignored.
+
+* `html` - Body content will be parsed HTML (the default)
+* `static-text` - Body content will be parsed as static text (HTML tags will be ignored). Placeholders will be ignored.
+* `parsed-text` - Body content will be parsed as text (HTML tags will be ignored). Placeholders will not be ignored.
 
 _input.marko_
+
 ```marko
 <div marko-body="static-text">
     This is just one
@@ -504,6 +515,7 @@ _input.marko_
 ```
 
 _output.html_
+
 ```html
 <div>
     This is just one
diff --git a/docs/custom-tags.md b/docs/custom-tags.md
index b55944ff0..3bcd5e399 100644
--- a/docs/custom-tags.md
+++ b/docs/custom-tags.md
@@ -10,7 +10,7 @@ To get started let's look at template-based tags which allow you to include anot
 
 ### Discovering tags
 
-When compiling a template Marko will search starting at template's directory, up to the project root for directories named `components/`. It then attempts to load the children of these directories as custom tags.  The children can be a Marko template or a directory with an `index.marko` template (and other supporting files).
+When compiling a template Marko will search starting at template's directory, up to the project root for directories named `components/`. It then attempts to load the children of these directories as custom tags. The children can be a Marko template or a directory with an `index.marko` template (and other supporting files).
 
 ```dir
 components/
@@ -28,9 +28,9 @@ pages/
 
 When compiling the template at `pages/home/index.marko`, the following tags would be found:
 
-- `<app-header>`
-- `<app-footer>`
-- `<home-banner>`
+* `<app-header>`
+* `<app-footer>`
+* `<home-banner>`
 
 So now, instead of needing to specify a path:
 
@@ -39,19 +39,20 @@ So now, instead of needing to specify a path:
 ```
 
 You can just use the tag name:
+
 ```marko
 <app-header/>
 ```
 
 ## Using tags from npm
 
-Using custom tags from `npm` is easy.  Ensure that the package is installed and listed in your `package.json` dependencies:
+Using custom tags from `npm` is easy. Ensure that the package is installed and listed in your `package.json` dependencies:
 
 ```
 npm install --save some-third-party-package
 ```
 
-And that's it.  Marko will now discover these tags when compiling your templates and you can simply use them in your templates:
+And that's it. Marko will now discover these tags when compiling your templates and you can simply use them in your templates:
 
 ```marko
 <div>
@@ -67,52 +68,51 @@ As an example, given a template at path `/my-project/src/pages/login/template.ma
 
 ```json
 {
-    "name": "my-package",
-    "dependencies": {
-        "foo": "1.0.0"
-    },
-    "devDependencies": {
-        "bar": "1.0.0"
-    }
+  "name": "my-package",
+  "dependencies": {
+    "foo": "1.0.0"
+  },
+  "devDependencies": {
+    "bar": "1.0.0"
+  }
 }
 ```
 
 The search path will be the following:
 
-1. `/my-project/src/pages/login/marko.json`
-2. `/my-project/src/pages/marko.json`
-3. `/my-project/src/marko.json`
-4. `/my-project/marko.json`
-5. `/my-project/node_modules/foo/marko.json`
-6. `/my-project/node_modules/bar/marko.json`
+1.  `/my-project/src/pages/login/marko.json`
+2.  `/my-project/src/pages/marko.json`
+3.  `/my-project/src/marko.json`
+4.  `/my-project/marko.json`
+5.  `/my-project/node_modules/foo/marko.json`
+6.  `/my-project/node_modules/bar/marko.json`
 
 ### Hiding taglibs
 
-If you wish to hide particular folder and/or node_module from discovery of marko.json, you can exclude certain directories or packages.  This is used primarily for testing.
+If you wish to hide particular folder and/or node_module from discovery of marko.json, you can exclude certain directories or packages. This is used primarily for testing.
 
 ```javascript
-    require('marko/compiler').taglibFinder.excludeDir(dirPath);
-    // Where 'dirPath' is an absolute path to the folder containing marko.json
+require("marko/compiler").taglibFinder.excludeDir(dirPath);
+// Where 'dirPath' is an absolute path to the folder containing marko.json
 
-    require('marko/compiler').taglibFinder.excludePackage(packageName);
-    // Where 'packageName' is the name of the node_module containing marko.json
+require("marko/compiler").taglibFinder.excludePackage(packageName);
+// Where 'packageName' is the name of the node_module containing marko.json
 ```
 
 These statements should be used before any rendering begins in the process.
 
-
 ### marko.json syntax
 
 ```json
 {
-    "tags": {
-        "my-hello": {
-            "renderer": "./hello-renderer",
-            "attributes": {
-                "name": "string"
-            }
-        }
+  "tags": {
+    "my-hello": {
+      "renderer": "./hello-renderer",
+      "attributes": {
+        "name": "string"
+      }
     }
+  }
 }
 ```
 
@@ -120,10 +120,10 @@ Marko also supports a short-hand for declaring tags and attributes. The followin
 
 ```json
 {
-    "<my-hello>": {
-        "renderer": "./hello-renderer",
-        "@name": "string"
-    }
+  "<my-hello>": {
+    "renderer": "./hello-renderer",
+    "@name": "string"
+  }
 }
 ```
 
@@ -133,18 +133,18 @@ Tags can be defined by adding `"<tag_name>": <tag_def>` properties to your `mark
 
 ```json
 {
-    "<my-hello>": {
-        "renderer": "./hello-renderer",
-        "@name": "string"
-    },
-    "<my-foo>": {
-        "renderer": "./foo-renderer",
-        "@*": "string"
-    },
-    "<my-bar>": "./path/to/my-bar/marko-tag.json",
-    "<my-baz>": {
-        "template": "./baz-template.marko"
-    },
+  "<my-hello>": {
+    "renderer": "./hello-renderer",
+    "@name": "string"
+  },
+  "<my-foo>": {
+    "renderer": "./foo-renderer",
+    "@*": "string"
+  },
+  "<my-bar>": "./path/to/my-bar/marko-tag.json",
+  "<my-baz>": {
+    "template": "./baz-template.marko"
+  }
 }
 ```
 
@@ -186,11 +186,11 @@ Above, we tell Marko this attribute name contains a pattern so that it will allo
 
 ### Custom directory scanning
 
-You can configure the `tags-dir` value in your `marko.json` to configure the name of the directory that marko scans in for custom tags.  As described above, by default it uses the name `components/`.  You can override this at a directory level and give a path to another directory to scan:
+You can configure the `tags-dir` value in your `marko.json` to configure the name of the directory that marko scans in for custom tags. As described above, by default it uses the name `components/`. You can override this at a directory level and give a path to another directory to scan:
 
 ```json
 {
-    "tags-dir": "./ui-components"
+  "tags-dir": "./ui-components"
 }
 ```
 
@@ -198,7 +198,7 @@ You can configure the `tags-dir` value in your `marko.json` to configure the nam
 
 ```json
 {
-    "tags-dir": ["./ui-components", "./components"]
+  "tags-dir": ["./ui-components", "./components"]
 }
 ```
 
diff --git a/docs/editor-plugins.md b/docs/editor-plugins.md
index 608e5f9ab..81404d9cf 100644
--- a/docs/editor-plugins.md
+++ b/docs/editor-plugins.md
@@ -1,40 +1,39 @@
 # Editor Plugins
 
-
 ## Atom
 
 [Documentation](https://atom.io/packages/language-marko)
 
-- Syntax highlighting
-- Tag matching
-- Tag and attribute autocompletion
-- Code snippets
-- Hyperclick (clickable tags and attributes)
-- Prettyprinting ([marko-prettyprint](https://github.com/marko-js/marko-prettyprint) is used internally)
+* Syntax highlighting
+* Tag matching
+* Tag and attribute autocompletion
+* Code snippets
+* Hyperclick (clickable tags and attributes)
+* Prettyprinting ([marko-prettyprint](https://github.com/marko-js/marko-prettyprint) is used internally)
 
 ## Visual Studio Code
 
 [Documentation](https://marketplace.visualstudio.com/items?itemName=pcanella.marko)
 
-- Syntax highlighting
+* Syntax highlighting
 
 ## Sublime
 
 [Documentation](https://github.com/merwan7/sublime-marko)
 
-- Syntax highlighting
+* Syntax highlighting
 
 ## WebStorm
 
 [Documentation](https://github.com/marko-js/marko-tmbundle)
 
-- Syntax highlighting
+* Syntax highlighting
 
 ## TextMate
 
 [Documentation](https://github.com/marko-js/marko-tmbundle)
 
-- Syntax highlighting
+* Syntax highlighting
 
 ## CodeMirror
 
diff --git a/docs/express.md b/docs/express.md
index e44d87b6a..f70a11343 100644
--- a/docs/express.md
+++ b/docs/express.md
@@ -1,5 +1,4 @@
-Express + Marko
-=====================
+# Express + Marko
 
 See the [marko-express](https://github.com/marko-js-samples/marko-express) sample
 project for a working example.
@@ -13,32 +12,31 @@ npm install marko --save
 
 ## Skip the view engine
 
-The built in view engine for express may be asynchronous, but it doesn't support streaming (check out [Rediscovering Progressive HTML Rendering](http://www.ebaytechblog.com/2014/12/08/async-fragments-rediscovering-progressive-html-rendering-with-marko/) to see why this is so important).  So instead we'll [bypass the view engine](https://strongloop.com/strongblog/bypassing-express-view-rendering-for-speed-and-modularity/).
+The built in view engine for express may be asynchronous, but it doesn't support streaming (check out [Rediscovering Progressive HTML Rendering](http://www.ebaytechblog.com/2014/12/08/async-fragments-rediscovering-progressive-html-rendering-with-marko/) to see why this is so important). So instead we'll [bypass the view engine](https://strongloop.com/strongblog/bypassing-express-view-rendering-for-speed-and-modularity/).
 
 ## Usage
 
-Marko provides a submodule (`marko/express`) to add a `res.marko` method to the express response object.  This function works much like `res.render`, but doesn't impose the restrictions of the express view engine and allows you to take full advantage of Marko's streaming and modular approach to templates.  
+Marko provides a submodule (`marko/express`) to add a `res.marko` method to the express response object. This function works much like `res.render`, but doesn't impose the restrictions of the express view engine and allows you to take full advantage of Marko's streaming and modular approach to templates.
 
-By using `res.marko` you'll automatically have access to `req`, `res`, `app`, `app.locals`, and `res.locals` from within your Marko template and custom tags.  These values are added to `out.global`.
+By using `res.marko` you'll automatically have access to `req`, `res`, `app`, `app.locals`, and `res.locals` from within your Marko template and custom tags. These values are added to `out.global`.
 
 ```javascript
+require("marko/node-require"); // Allow Node.js to require and load `.marko` files
 
-require('marko/node-require'); // Allow Node.js to require and load `.marko` files
-
-var express = require('express');
-var markoExpress = require('marko/express');
-var template = require('./template');
+var express = require("express");
+var markoExpress = require("marko/express");
+var template = require("./template");
 
 var app = express();
 
 app.use(markoExpress()); //enable res.marko(template, data)
 
-app.get('/', function(req, res) {
-    res.marko(template, {
-        name: 'Frank',
-        count: 30,
-        colors: ['red', 'green', 'blue']
-    });
+app.get("/", function(req, res) {
+  res.marko(template, {
+    name: "Frank",
+    count: 30,
+    colors: ["red", "green", "blue"]
+  });
 });
 
 app.listen(8080);
diff --git a/docs/fastify.md b/docs/fastify.md
index 215a966b5..3eaef3ac7 100644
--- a/docs/fastify.md
+++ b/docs/fastify.md
@@ -14,24 +14,24 @@ npm install marko --save
 ## Usage
 
 ```js
-const fastify = require('fastify')();
+const fastify = require("fastify")();
 
-fastify.register(require('point-of-view'), {
-    engine: {
-        marko: require('marko')
-    }
+fastify.register(require("point-of-view"), {
+  engine: {
+    marko: require("marko")
+  }
 });
 
-fastify.get('/', (req, reply) => {
-    reply.view('/index.marko', {
-        name: 'Frank',
-        count: 30,
-        colors: ['red', 'green', 'blue']
-    });
+fastify.get("/", (req, reply) => {
+  reply.view("/index.marko", {
+    name: "Frank",
+    count: 30,
+    colors: ["red", "green", "blue"]
+  });
 });
 
 fastify.listen(8080, err => {
-    if (err) throw err;
-    console.log(`Server listening on ${fastify.server.address().port}`);
+  if (err) throw err;
+  console.log(`Server listening on ${fastify.server.address().port}`);
 });
 ```
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 266d45272..4dd6f6190 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -7,6 +7,7 @@ The easiest way to get started with Marko is to use the [Try Online](https://mar
 Marko makes it easy to represent your UI using a syntax that is like HTML:
 
 _hello.marko_
+
 ```marko
 <h1>Hello World</h1>
 ```
@@ -14,6 +15,7 @@ _hello.marko_
 In fact, Marko is so much like HTML, that you can use it as a replacement for a templating language like handlebars, mustache, or pug:
 
 _template.marko_
+
 ```marko
 <!doctype html>
 <html>
@@ -26,7 +28,7 @@ _template.marko_
 </html>
 ```
 
-However, Marko is much more than a templating language.  It's a UI library that allows you to break your application into components that are self-contained and describe how the application view changes over time and in response to user actions.
+However, Marko is much more than a templating language. It's a UI library that allows you to break your application into components that are self-contained and describe how the application view changes over time and in response to user actions.
 
 In the browser, when the data representing your UI changes, Marko will automatically and efficiently update the DOM to reflect the changes.
 
@@ -35,6 +37,7 @@ In the browser, when the data representing your UI changes, Marko will automatic
 Let's say we have a `<button>` that we want to assign some behavior to when it is clicked:
 
 _button.marko_
+
 ```marko
 <button>Click me!</button>
 ```
@@ -42,6 +45,7 @@ _button.marko_
 Marko makes this really easy, allowing you to define a `class` for a component right in the `.marko` view and call methods of that class with `on-` attributes:
 
 _button.marko_
+
 ```marko
 class {
     sayHi() {
@@ -54,9 +58,10 @@ class {
 
 ### Adding state
 
-Alerting when a button is clicked is great, but what about updating your UI in response to an action?  Marko's stateful components make this easy.  All you need to do is set `this.state` from inside your component's class. This makes a new `state` variable available to your view.  When a value in `this.state` is changed, the view will automatically re-render and only update the part of the DOM that changed.
+Alerting when a button is clicked is great, but what about updating your UI in response to an action? Marko's stateful components make this easy. All you need to do is set `this.state` from inside your component's class. This makes a new `state` variable available to your view. When a value in `this.state` is changed, the view will automatically re-render and only update the part of the DOM that changed.
 
 _counter.marko_
+
 ```marko
 class {
     onCreate() {
diff --git a/docs/hapi.md b/docs/hapi.md
index 8bb6a8ebe..8533d300c 100644
--- a/docs/hapi.md
+++ b/docs/hapi.md
@@ -13,13 +13,13 @@ npm install marko --save
 ## Usage
 
 ```javascript
-'use strict';
+"use strict";
 
-require('marko/node-require');
+require("marko/node-require");
 
-const Hapi = require('hapi');
+const Hapi = require("hapi");
 
-const indexTemplate = require('./index');
+const indexTemplate = require("./index");
 
 const server = new Hapi.Server();
 const port = 8080;
@@ -27,22 +27,24 @@ const port = 8080;
 server.connection({ port });
 
 server.route({
-    method: 'GET',
-    path: '/',
-    handler (request, reply) {
-        return reply(indexTemplate.stream({
-            name: 'Frank',
-            count: 30,
-            colors: ['red', 'green', 'blue']
-        })).type('text/html');
-    }
+  method: "GET",
+  path: "/",
+  handler(request, reply) {
+    return reply(
+      indexTemplate.stream({
+        name: "Frank",
+        count: 30,
+        colors: ["red", "green", "blue"]
+      })
+    ).type("text/html");
+  }
 });
 
-server.start((err) => {
-    if (err) {
-        throw err;
-    }
+server.start(err => {
+  if (err) {
+    throw err;
+  }
 
-    console.log(`Server running on port: ${port}`);
+  console.log(`Server running on port: ${port}`);
 });
 ```
diff --git a/docs/http.md b/docs/http.md
index b8122cb65..34f1e8e49 100644
--- a/docs/http.md
+++ b/docs/http.md
@@ -12,23 +12,26 @@ npm install marko --save
 ## Usage
 
 ```js
-require('marko/node-require').install();
+require("marko/node-require").install();
 
-const http = require('http');
-const server = require('http').createServer();
+const http = require("http");
+const server = require("http").createServer();
 
 const port = 8080;
-const indexTemplate = require('./index.marko');
+const indexTemplate = require("./index.marko");
 
-server.on('request', (req, res) => {
-    indexTemplate.render({
-        name: 'Frank',
-        count: 30,
-        colors: ['red', 'green', 'blue']
-    }, res);
+server.on("request", (req, res) => {
+  indexTemplate.render(
+    {
+      name: "Frank",
+      count: 30,
+      colors: ["red", "green", "blue"]
+    },
+    res
+  );
 });
 
 server.listen(port, () => {
-    console.log(`Successfully started server on port ${port}`);
+  console.log(`Successfully started server on port ${port}`);
 });
 ```
diff --git a/docs/huncwot.md b/docs/huncwot.md
index 30958c907..3df9a44fd 100644
--- a/docs/huncwot.md
+++ b/docs/huncwot.md
@@ -10,14 +10,14 @@ project for a working example.
 ## Usage
 
 ```javascript
-require('marko/node-require');
+require("marko/node-require");
 
-const Huncwot = require('huncwot');
+const Huncwot = require("huncwot");
 
 const app = new Huncwot();
-const template = require('./index.marko');
+const template = require("./index.marko");
 
-app.get('/', request => template.stream({ name: 'Frank' }))
+app.get("/", request => template.stream({ name: "Frank" }));
 
 app.listen(3000);
 ```
diff --git a/docs/installing.md b/docs/installing.md
index 56204fc01..e89756971 100644
--- a/docs/installing.md
+++ b/docs/installing.md
@@ -2,7 +2,7 @@
 
 ## Trying out Marko
 
-If you just want to play around with Marko in the browser, head on over to our [Try Online](https://markojs.com/try-online) feature.  You'll be able to develop a Marko application right in your browser.
+If you just want to play around with Marko in the browser, head on over to our [Try Online](https://markojs.com/try-online) feature. You'll be able to develop a Marko application right in your browser.
 
 ## Creating new apps
 
@@ -37,6 +37,7 @@ yarn add marko
 Let's say we have a simple view that we want to render in the browser: `hello.marko`
 
 _hello.marko_
+
 ```marko
 <h1>Hello ${input.name}</h1>
 ```
@@ -44,16 +45,17 @@ _hello.marko_
 First, let's create a `client.js` that requires the view and renders it to the body:
 
 _client.js_
-```js
-var helloComponent = require('./hello');
 
-helloComponent.renderSync({ name:'Marko' })
-    .appendTo(document.body);
+```js
+var helloComponent = require("./hello");
+
+helloComponent.renderSync({ name: "Marko" }).appendTo(document.body);
 ```
 
 We will also create a barebones HTML page to host our application:
 
 _index.html_
+
 ```
 <!doctype html>
 <html>
@@ -66,7 +68,7 @@ _index.html_
 </html>
 ```
 
-Now, we need to bundle these files for use in the browser.  We can use a tool called [`lasso`](https://github.com/lasso-js/lasso) to do that for us, so let's get it (and the marko plugin) installed:
+Now, we need to bundle these files for use in the browser. We can use a tool called [`lasso`](https://github.com/lasso-js/lasso) to do that for us, so let's get it (and the marko plugin) installed:
 
 ```
 npm install --global lasso-cli
@@ -79,7 +81,7 @@ Now we can build our bundle for the browser:
 lasso --main client.js --plugins lasso-marko --inject-into index.html
 ```
 
-This builds a `client.js` file to the newly created `static/` directory and injects the required `<script>` tags into our HTML page to load our application in the browser.  If we had css in the view then `<link>` tags would have also been added.
+This builds a `client.js` file to the newly created `static/` directory and injects the required `<script>` tags into our HTML page to load our application in the browser. If we had css in the view then `<link>` tags would have also been added.
 
 Load up that page in your browser and you should see `Hello Marko` staring back at you.
 
@@ -90,6 +92,7 @@ Load up that page in your browser and you should see `Hello Marko` staring back
 Marko provides a custom Node.js require extension that allows you to `require` Marko views exactly like a standard JavaScript module. Take the following example `server.js`:
 
 _hello.marko_
+
 ```marko
 <div>
     Hello ${input.name}!
@@ -97,23 +100,23 @@ _hello.marko_
 ```
 
 _server.js_
+
 ```js
 // The following line installs the Node.js require extension
 // for `.marko` files.  This should be called once near the start
 // of your application before requiring any `*.marko` files.
-require('marko/node-require');
+require("marko/node-require");
 
-var fs = require('fs');
+var fs = require("fs");
 
 // Load a Marko view by requiring a .marko file:
-var hello = require('./hello');
-var out = fs.createWriteStream('hello.html', { encoding: 'utf8' });
-hello.render({ name: 'Frank' }, out);
+var hello = require("./hello");
+var out = fs.createWriteStream("hello.html", { encoding: "utf8" });
+hello.render({ name: "Frank" }, out);
 ```
 
 Using the Node.js require extension is completely optional. If you prefer to not use the Node.js require extension then you will need to precompile all of the marko templates using [Marko CLI](https://github.com/marko-js/marko-cli):
 
-
 ```bash
 marko compile hello.marko
 ```
@@ -121,9 +124,10 @@ marko compile hello.marko
 This will produce a `hello.marko.js` file next to the original template. The generated `.js` file will be what gets loaded by the Node.js runtime. It is important to leave off the `.marko` extension when requiring a Marko template so that the `.js` will be resolved correctly.
 
 If you wish to only use the require extension in development, you can conditionally require it.
+
 ```js
 if (!process.env.NODE_ENV) {
-    require('marko/node-require');
+  require("marko/node-require");
 }
 ```
 
@@ -132,26 +136,30 @@ if (!process.env.NODE_ENV) {
 Let's update `server.js` to serve the view from an http server:
 
 _server.js_
+
 ```js
 // Allow requiring `.marko` files
-require('marko/node-require');
+require("marko/node-require");
 
-var http = require('http');
-var hello = require('./hello');
+var http = require("http");
+var hello = require("./hello");
 var port = 8080;
 
-http.createServer((req, res) => {
+http
+  .createServer((req, res) => {
     // let the browser know html is coming
-    res.setHeader('content-type', 'text/html');
+    res.setHeader("content-type", "text/html");
 
     // render the output to the `res` output stream
-    hello.render({ name:'Marko' }, res);
-}).listen(port);
+    hello.render({ name: "Marko" }, res);
+  })
+  .listen(port);
 ```
 
 And give `hello.marko` some content:
 
 _hello.marko_
+
 ```marko
 <h1>Hello ${input.name}</h1>
 ```
@@ -160,9 +168,9 @@ Start the server (`node server.js`) and open your browser to [http://localhost:8
 
 #### Initializing server-rendered components
 
-Marko automatically injects a list of components that need to be mounted in the browser, right before the closing `</body>` tag (as such, it required that you include a `<body>` in your rendered output).  
+Marko automatically injects a list of components that need to be mounted in the browser, right before the closing `</body>` tag (as such, it required that you include a `<body>` in your rendered output).
 
-However, you still need to bundle the CSS & JavaScript for your page and include the proper `link`, `style`, and `script` tags.  Luckily, the `lasso` taglib will do all the heavy lifting for you.
+However, you still need to bundle the CSS & JavaScript for your page and include the proper `link`, `style`, and `script` tags. Luckily, the `lasso` taglib will do all the heavy lifting for you.
 
 First install `lasso` and `lasso-marko`:
 
@@ -173,6 +181,7 @@ npm install --save lasso lasso-marko
 Next, in your page or layout view, add the `lasso-head` and `lasso-body` tags:
 
 _layout.marko_
+
 ```marko
 <!doctype>
 <html>
@@ -190,6 +199,7 @@ _layout.marko_
 Finally, configure your server to serve the static files that `lasso` generates:
 
 _server.js_
+
 ```js
-app.use(require('lasso/middleware').serveStatic());
+app.use(require("lasso/middleware").serveStatic());
 ```
diff --git a/docs/koa.md b/docs/koa.md
index 30c5c8b24..5df71d6fe 100644
--- a/docs/koa.md
+++ b/docs/koa.md
@@ -11,20 +11,20 @@ project for a fully-working example.
 ## Usage
 
 ```javascript
-require('marko/node-require');
+require("marko/node-require");
 
-const Koa = require('koa');
+const Koa = require("koa");
 const app = new Koa();
 
-const template = require('./index.marko');
+const template = require("./index.marko");
 
 app.use((ctx, next) => {
-    ctx.type = 'html';
-    ctx.body = template.stream({
-        name: 'Frank',
-        count: 30,
-        colors: ['red', 'green', 'blue']
-    });
+  ctx.type = "html";
+  ctx.body = template.stream({
+    name: "Frank",
+    count: 30,
+    colors: ["red", "green", "blue"]
+  });
 });
 
 app.listen(8080);
@@ -33,27 +33,27 @@ app.listen(8080);
 You may also easily add `gzip` streaming support without additional dependencies:
 
 ```javascript
-require('marko/node-require');
-const { createGzip } = require('zlib');
+require("marko/node-require");
+const { createGzip } = require("zlib");
 
-const Koa = require('koa');
+const Koa = require("koa");
 const app = new Koa();
 
-const template = require('./index.marko');
+const template = require("./index.marko");
 
 app.use((ctx, next) => {
-    ctx.type = 'html';
-    ctx.body = template.stream({
-        name: 'Frank',
-        count: 30,
-        colors: ['red', 'green', 'blue']
-    });
+  ctx.type = "html";
+  ctx.body = template.stream({
+    name: "Frank",
+    count: 30,
+    colors: ["red", "green", "blue"]
+  });
 
-    ctx.vary('Accept-Encoding');
-    if (ctx.acceptsEncodings('gzip')) {
-        ctx.set('Content-Encoding', 'gzip');
-        ctx.body = ctx.body.pipe(createGzip());
-    }
+  ctx.vary("Accept-Encoding");
+  if (ctx.acceptsEncodings("gzip")) {
+    ctx.set("Content-Encoding", "gzip");
+    ctx.body = ctx.body.pipe(createGzip());
+  }
 });
 
 app.listen(8080);
diff --git a/docs/lasso.md b/docs/lasso.md
index eac257697..50e97169f 100644
--- a/docs/lasso.md
+++ b/docs/lasso.md
@@ -56,12 +56,10 @@ After installing, the lasso custom tags can be used in your templates:
 The `browser.json` provides a simple way for declaring _top-level_ page dependencies. For example:
 
 _browser.json_
+
 ```json
 {
-    "dependencies": [
-        "./style.css",
-        "require-run: ./client.js"
-    ]
+  "dependencies": ["./style.css", "require-run: ./client.js"]
 }
 ```
 
@@ -72,10 +70,11 @@ Lasso.js will automatically bundle up transitive dependencies by building and wa
 Marko templates can be imported and rendered by any JavaScript module. The code below shows how to render a top-level UI component and have it be mounted to the DOM as a child `document.body`:
 
 _client.js_
+
 ```js
-require('./components/app/index.marko')
-    .renderSync({})
-    .appendTo(document.body);
+require("./components/app/index.marko")
+  .renderSync({})
+  .appendTo(document.body);
 ```
 
 When Lasso.js bundles up the code above it will automatically bundle up the required `./components/app/index.marko` file.
@@ -84,8 +83,8 @@ When Lasso.js bundles up the code above it will automatically bundle up the requ
 
 If you are rendering the initial UI on the server then it is necessary to make sure that all UI components are bundled and sent to the browser so that UI components can be mounted in the browser. For example:
 
-
 _about-me/index.marko_
+
 ```marko
 <lasso-page package-path="./browser.json" />
 
@@ -111,12 +110,10 @@ _about-me/index.marko_
 Typically, adding the top-level UI component as a page dependency is all that is required:
 
 _about-me/browser.json_
+
 ```json
 {
-    "dependencies": [
-        "./style.css",
-        "require: ./components/app/index.marko"
-    ]
+  "dependencies": ["./style.css", "require: ./components/app/index.marko"]
 }
 ```
 
diff --git a/docs/marko-v4.md b/docs/marko-v4.md
index cf099c6e2..b4addb679 100644
--- a/docs/marko-v4.md
+++ b/docs/marko-v4.md
@@ -47,13 +47,14 @@ style.less {
 You can easily `require`/`import` a single file component and interact with it using the exported JavaScript API:
 
 ```js
-var clickCount = require('./src/components/click-count');
+var clickCount = require("./src/components/click-count");
 
-var component = clickCount.renderSync({
-        value: 10
-    })
-    .appendTo(document.body)
-    .getComponent();
+var component = clickCount
+  .renderSync({
+    value: 10
+  })
+  .appendTo(document.body)
+  .getComponent();
 
 component.increment();
 ```
@@ -68,7 +69,7 @@ Of course, a single file component can also be embedded in another template as a
 
 ### Virtual DOM support ([#366](https://github.com/marko-js/marko/issues/366))
 
-Because Marko renders raw HTML strings to a stream on the server, Marko has always been faster than other libraries by an [order of magnitude](https://github.com/patrick-steele-idem/marko-vs-react) when rendering on the server.  However although Marko has been _pretty_ fast in the browser, it was a little behind some of our competitors. This was mainly because the output HTML string needed to be parsed into a DOM in order to do DOM diffing/patching.
+Because Marko renders raw HTML strings to a stream on the server, Marko has always been faster than other libraries by an [order of magnitude](https://github.com/patrick-steele-idem/marko-vs-react) when rendering on the server. However although Marko has been _pretty_ fast in the browser, it was a little behind some of our competitors. This was mainly because the output HTML string needed to be parsed into a DOM in order to do DOM diffing/patching.
 
 That's changed. Marko now supports multiple compilation outputs. Templates compiled for the server will continue to render to an HTML stream/string and templates compiled for the browser will now render to a fast and lightweight virtual DOM tree. The code samples below show how the two different compilation outputs compare:
 
@@ -82,9 +83,7 @@ function render(data, out) {
     out.w("<ul>");
 
     marko_forEach(colors, function(color) {
-      out.w("<li class=\"color\">" +
-        marko_escapeXml(color) +
-        "</li>");
+      out.w('<li class="color">' + marko_escapeXml(color) + "</li>");
     });
 
     out.w("</ul>");
@@ -98,10 +97,11 @@ _Compiled for VDOM output (browser-side):_
 
 ```javascript
 var marko_attrs0 = {
-        "class": "color"
-      },
-    marko_node0 = marko_createElement("DIV", null, 1, marko_const_nextId())
-      .t("No colors!");
+    class: "color"
+  },
+  marko_node0 = marko_createElement("DIV", null, 1, marko_const_nextId()).t(
+    "No colors!"
+  );
 
 function render(data, out) {
   var colors = data.colors;
@@ -110,8 +110,7 @@ function render(data, out) {
     out.be("UL");
 
     marko_forEach(colors, function(color) {
-      out.e("LI", marko_attrs0, 1)
-        .t(marko_str(color));
+      out.e("LI", marko_attrs0, 1).t(marko_str(color));
     });
 
     out.ee();
@@ -123,28 +122,26 @@ function render(data, out) {
 
 The VDOM output allows optimizations that were previously not possible:
 
-- Static subtrees are pulled into variables that are only initialized once and reused for every render
-- Static attributes that are on dynamic elements are pulled out to static variables
-- Diffing is skipped when comparing static subtrees
-- Diffing is skipped when comparing static attributes
+* Static subtrees are pulled into variables that are only initialized once and reused for every render
+* Static attributes that are on dynamic elements are pulled out to static variables
+* Diffing is skipped when comparing static subtrees
+* Diffing is skipped when comparing static attributes
 
 Our benchmarks show a significant improvement in rendering time and we are consistently outperforming React/Preact/Inferno, Vue and other UI libraries.
 
 ### Merge in Marko Widgets ([#390](https://github.com/marko-js/marko/issues/390))
 
-A big part of this release is a shift in focus from Marko being merely a templating language to a complete UI library.  As such, we are providing first-class support for components.
+A big part of this release is a shift in focus from Marko being merely a templating language to a complete UI library. As such, we are providing first-class support for components.
 
 You will no longer need to install `marko-widgets` as an external library, and there is more cohesion between the templates and components/components.
 
 ### Improved component lifecycle methods ([#396](https://github.com/marko-js/marko/issues/396))
 
-
-- `getInitialState()` ➔ `onInput(input)`
-- `getComponentConfig()` ➔ `onInput(input)`
-- `init(config)` ➔ `onMount()`
-- `getTemplateData(input, state)` ➔ (no longer needed)
-- `getInitialProps(input)` ➔ (no longer needed)
-
+* `getInitialState()` ➔ `onInput(input)`
+* `getComponentConfig()` ➔ `onInput(input)`
+* `init(config)` ➔ `onMount()`
+* `getTemplateData(input, state)` ➔ (no longer needed)
+* `getInitialProps(input)` ➔ (no longer needed)
 
 ```js
 class {
@@ -190,7 +187,7 @@ class {
     // Helper methods:
 
     reset() {
-        this.state.count = this.initialCount;        
+        this.state.count = this.initialCount;
     }
 
     increment() {
@@ -213,7 +210,7 @@ class {
         return {
             count: input.count || 0
         };
-    }    
+    }
     increment() {
         this.setState('count', this.state.count+1);
     }
@@ -228,7 +225,7 @@ class {
         this.state = {
             count: input.count || 0
         };
-    }    
+    }
     increment() {
         this.state.count++;
     }
@@ -249,7 +246,7 @@ In addition, the default state can now be declared:
         this.state = {
             count: input.count
         };
-    }   
+    }
 
     increment() {
         this.state.count++;
@@ -263,29 +260,29 @@ In Marko v3, UI components exported an API that included DOM insertion methods w
 
 ```js
 // Append to an existing DOM node:
-require('./template.marko')
-    .renderSync({ name: 'Frank '})
-    .appendTo(document.body);
+require("./template.marko")
+  .renderSync({ name: "Frank " })
+  .appendTo(document.body);
 
 // Replace an existing DOM node:
-require('./template.marko')
-    .renderSync({ name: 'Frank '})
-    .replace(document.getElementById('foo'));
+require("./template.marko")
+  .renderSync({ name: "Frank " })
+  .replace(document.getElementById("foo"));
 ```
 
 ### Less Boilerplate
 
-- Removed: `w-bind`
-- Removed: `w-extend`
-- Removed: `require('marko-widgets').defineComponent(...)`
-- Removed: `require('marko-widgets').defineWidget(...)`
-- Removed: `require('marko-widgets').defineRenderer(...)`
-- Removed: `w-body` (use `<include()>` instead)
-- `w-on*="handleSomeEvent"` --> `on*('handleSomeEvent')`
-- `w-id` --> `key`
-- `w-for` --> `for-key`
-- `w-preserve` --> `no-update`
-- `class="foo" w-preserve-attrs="class"` --> `class:no-update="foo"`
+* Removed: `w-bind`
+* Removed: `w-extend`
+* Removed: `require('marko-widgets').defineComponent(...)`
+* Removed: `require('marko-widgets').defineWidget(...)`
+* Removed: `require('marko-widgets').defineRenderer(...)`
+* Removed: `w-body` (use `<include()>` instead)
+* `w-on*="handleSomeEvent"` --> `on*('handleSomeEvent')`
+* `w-id` --> `key`
+* `w-for` --> `for-key`
+* `w-preserve` --> `no-update`
+* `class="foo" w-preserve-attrs="class"` --> `class:no-update="foo"`
 
 Some of these things are described in more detail later in this document.
 
@@ -317,8 +314,7 @@ $ {
 }
 ```
 
-JavaScript blocks can be embedded anywhere by putting `$ ` at the start of the line (ignoring whitespace) and it works the same for both the concise syntax and the non-concise syntax:
-
+JavaScript blocks can be embedded anywhere by putting `$` at the start of the line (ignoring whitespace) and it works the same for both the concise syntax and the non-concise syntax:
 
 ```marko
 <div.hello>
@@ -384,9 +380,9 @@ static {
 
 ### Template variables
 
-- `data` --> `input` - References the input object (should be treated as immutable)
-- Introduced `state` - References the components raw state object (for components only)
-- Introduced `component` - References the component instance (for components only)
+* `data` --> `input` - References the input object (should be treated as immutable)
+* Introduced `state` - References the components raw state object (for components only)
+* Introduced `component` - References the component instance (for components only)
 
 ## Other Improvements
 
@@ -399,6 +395,7 @@ In Marko v4, only the attributes rendered by Marko are ever modified by Marko. A
 ### Allow multiple top-level DOM elements to be bound ([#393](https://github.com/marko-js/marko/issues/393))
 
 **Old:**
+
 ```marko
 <div w-bind>
     <h1>The current count is ${data.count}</h1>
@@ -407,6 +404,7 @@ In Marko v4, only the attributes rendered by Marko are ever modified by Marko. A
 ```
 
 **New:**
+
 ```marko
 <h1>The current count is ${input.count}</h1>
 <button onClick('incrementCount')>Increment Count</button>
@@ -417,6 +415,7 @@ In Marko v4, only the attributes rendered by Marko are ever modified by Marko. A
 **Old:**
 
 `index.js`
+
 ```js
 module.exports = require('marko-widgets').defineComponent({
     template: require('./template.marko'),
@@ -434,7 +433,6 @@ module.exports = require('marko-widgets').defineComponent({
 
 **New:**
 
-
 `component.js`
 
 ```js
@@ -456,6 +454,7 @@ module.exports = {
 ### Allow event handler attribute to bind additional arguments ([#401](https://github.com/marko-js/marko/issues/401))
 
 **Old:**
+
 ```marko
 <ul for(color in colors)>
     <li w-onClick="handleColorClick" data-color=color>${color}</li>
@@ -469,6 +468,7 @@ handleColorClick(event, el) {
 ```
 
 **New:**
+
 ```marko
 class {
     handleColorClick(color, event, el) {
@@ -497,6 +497,7 @@ Marko v4 introduces ES6 style imports for importing other JavaScript modules:
 ```
 
 **New:**
+
 ```marko
 import helpers from "./helpers"
 <div>Total: ${helpers.formatCurrency(data.total)}</div>
@@ -509,19 +510,22 @@ import { formatCurrency } from "./helpers"
 <div>Total: ${formatCurrency(data.total)}</div>
 ```
 
-
 ### Allow dynamic custom tags/components to be used with `<include>` ([#139](https://github.com/marko-js/marko/issues/139))
 
 **Old:**
+
 ```marko
 <invoke data.myComponent.renderer({name: 'Frank'}, out)/>
 ```
 
 **New:**
+
 ```marko
 <include(input.myComponent) name='Frank' />
 ```
+
 or
+
 ```marko
 <include(input.myComponent, {name: 'Frank'}) />
 ```
@@ -597,7 +601,6 @@ components/hello/
     },
     ...
 }
-
 ```
 
 `template.marko`
@@ -638,11 +641,13 @@ $ var age = calculateAge(state.birthday);
 ### Make output of render `Promise`-compatible ([#251](https://github.com/marko-js/marko/issues/251))
 
 **Old:**
+
 ```js
 template.render({}, function(err, html, out) {});
 ```
 
 **New:**
+
 ```js
 template.render({})
         .then(function(result){})
@@ -658,6 +663,7 @@ NOTE: callback/events still work as well
 ### Make `<await-reorderer/>` optional ([#410](https://github.com/marko-js/marko/issues/410))
 
 **Old:**
+
 ```marko
 <html>
     ...
@@ -669,6 +675,7 @@ NOTE: callback/events still work as well
 ```
 
 **New:**
+
 ```marko
 <html>
     ...
@@ -677,21 +684,24 @@ NOTE: callback/events still work as well
     </body>
 </html>
 ```
-*Automatically inserted before `</body>`*
+
+_Automatically inserted before `</body>`_
 
 ### Allow multiple extensions when installing the Node.js require hook ([#407](https://github.com/marko-js/marko/issues/407))
 
 **Old:**
+
 ```js
-require('marko/node-require').install({
-    extension: '.marko'
+require("marko/node-require").install({
+  extension: ".marko"
 });
 ```
 
 **New:**
+
 ```js
-require('marko/node-require').install({
-    extensions: ['.marko', '.marko.xml', '.html']
+require("marko/node-require").install({
+  extensions: [".marko", ".marko.xml", ".html"]
 });
 ```
 
@@ -702,12 +712,14 @@ Hot reload any extensions that were registered via `require('marko/node-require'
 ### Allow spaces around attributes ([#403](https://github.com/marko-js/marko/issues/403))
 
 **Old:**
+
 ```marko
 var className="foo"
 <div class=className/>
 ```
 
 **New:**
+
 ```marko
 $ var className = "foo"
 <div class = className/>
@@ -718,30 +730,34 @@ $ var className = "foo"
 ### Allow compile-time transformers to be registered at the template level ([#408](https://github.com/marko-js/marko/issues/408))
 
 `marko.json`
+
 ```json
 {
-    "transformer": "./my-transformer.js"
+  "transformer": "./my-transformer.js"
 }
 ```
+
 `my-transformer.js`
 
 ```js
 module.exports = function transform(rootNode, context) {
-    // ...
+  // ...
 };
 ```
-[see commit](https://github.com/marko-js/marko/commit/a35e6bdbc3fe6e7f4e92fb377c435e29ab3d6e33)
 
+[see commit](https://github.com/marko-js/marko/commit/a35e6bdbc3fe6e7f4e92fb377c435e29ab3d6e33)
 
 ### Allow regular expression for an HTML attribute value ([#386](https://github.com/marko-js/marko/issues/386))
 
 **Old:**
+
 ```marko
 <!-- escaped backslash (\) since strings are parsed as JS values -->
 <input type="text" pattern="\\w{2,20}" />
 ```
 
 **New:**
+
 ```marko
 <!-- just use a regex -->
 <input type="text" pattern=/\w{2,20}/ />
@@ -749,13 +765,14 @@ module.exports = function transform(rootNode, context) {
 
 ## Deprecations
 
-A huge effort is being made to make this release as painless as possible and keep backwards compatibility wherever possible.  It should be possible to continue to use custom tags that were developed against v3 with the v4 release as long as there are no dependencies on features deprecated in Marko v3 that have now been removed in Marko v4 (see [Breaking Changes](#breaking-changes) below).
+A huge effort is being made to make this release as painless as possible and keep backwards compatibility wherever possible. It should be possible to continue to use custom tags that were developed against v3 with the v4 release as long as there are no dependencies on features deprecated in Marko v3 that have now been removed in Marko v4 (see [Breaking Changes](#breaking-changes) below).
 
 Additionally, [`marko-migrate`](https://github.com/marko-js/marko-migrate) will be updated to handle many of the deprecations described below.
 
 ### Deprecate `<script marko-init>` and replace with `static` section ([#397](https://github.com/marko-js/marko/issues/397))
 
 **Old:**
+
 ```marko
 <script marko-init>
     var format = require('format');
@@ -765,6 +782,7 @@ Additionally, [`marko-migrate`](https://github.com/marko-js/marko-migrate) will
 ```
 
 **New:**
+
 ```marko
 static var format=require('format')
 $ var name='World'
@@ -778,6 +796,7 @@ Use embedded JavaScript blocks instead
 ### Deprecate `w-bind` ([#394](https://github.com/marko-js/marko/issues/394), [#395](https://github.com/marko-js/marko/issues/395))
 
 **Old:**
+
 ```marko
 <div w-bind>
     ...
@@ -797,6 +816,7 @@ Use embedded JavaScript blocks instead
 ### Deprecate `widget-types` ([#514](https://github.com/marko-js/marko/issues/514))
 
 **Old:**
+
 ```marko
 <widget-types default="./component" mobile="./component-mobile"/>
 
@@ -818,6 +838,7 @@ The `w-id` attribute was used to obtain references using `this.getEl(refId)`. `w
 ```
 
 **New:**
+
 ```marko
 <input type="text" key="nameInput" />
 ```
@@ -832,6 +853,7 @@ Similarly, `w-for` has been been replaced with `for-key`:
 ```
 
 **New:**
+
 ```marko
 <label for-key="nameInput">Name</label>
 <input type="text" key="nameInput" />
@@ -842,19 +864,25 @@ Similarly, `w-for` has been been replaced with `for-key`:
 ### Deprecate `w-on*` in favor of `on*()` ([#420](https://github.com/marko-js/marko/issues/420))
 
 **Old:**
+
 ```marko
 <button w-on-click="handleClick">click me</button>
 ```
+
 or
+
 ```marko
 <button w-onClick="handleClick">click me</button>
 ```
 
 **New:**
+
 ```marko
 <button on-click('handleClick')>click me</button>
 ```
+
 or
+
 ```marko
 <button onClick('handleClick')>click me</button>
 ```
@@ -862,6 +890,7 @@ or
 ### Deprecate `<init-widgets/>` ([#409](https://github.com/marko-js/marko/issues/409))
 
 **Old:**
+
 ```marko
 <html>
     ...
@@ -923,6 +952,7 @@ Or, with an argument value:
 ### Deprecate `w-preserve*` and replace with `no-update*` ([#419](https://github.com/marko-js/marko/issues/419))
 
 **Old:**
+
 ```marko
 <div w-preserve>
     ...
@@ -930,6 +960,7 @@ Or, with an argument value:
 ```
 
 **New:**
+
 ```marko
 <div no-update>
     ...
@@ -939,6 +970,7 @@ Or, with an argument value:
 ### Deprecate `w-preserve-attrs` and replace with `:no-update` ([#422](https://github.com/marko-js/marko/issues/422))
 
 **Old:**
+
 ```marko
 <div style="color:#09c" w-preserve-attrs="style">
     ...
@@ -946,6 +978,7 @@ Or, with an argument value:
 ```
 
 **New:**
+
 ```marko
 <div style:no-update="color:#09c">
     ...
@@ -957,17 +990,21 @@ Or, with an argument value:
 > `w-extend` is now deprecated
 
 **Old:**
+
 ```marko
 <div w-bind>
     <some-component w-onEvent="handleEvent"/>
 </div>
 ```
+
 or
+
 ```marko
 <some-component w-extend w-onEvent="handleEvent"/>
 ```
 
 **New:**
+
 ```marko
 <some-component onEvent('handleEvent')/>
 ```
@@ -983,9 +1020,10 @@ In order to move forward it was necessary to introduce a few (minor) breaking ch
 ### Consistent rendering API ([#389](https://github.com/marko-js/marko/issues/389))
 
 **Old:**
+
 ```js
-var template = require('./template.marko');
-var component = require('./my-component');
+var template = require("./template.marko");
+var component = require("./my-component");
 var data = {};
 
 template.render(data); // returns `out`
@@ -998,9 +1036,10 @@ component.renderSync(data); // throws an error, not a method.
 ```
 
 **New:**
+
 ```js
-var template = require('./template.marko');
-var component = require('./my-component');
+var template = require("./template.marko");
+var component = require("./my-component");
 var data = {};
 
 template.render(data); // returns `out`
@@ -1038,11 +1077,13 @@ Given a template like this:
 `include-target.marko` looks like:
 
 **Old:**
+
 ```marko
 -- Hello ${data['first-name']}
 ```
 
 **New:**
+
 ```marko
 -- Hello ${input.firstName}
 ```
@@ -1052,6 +1093,7 @@ Given a template like this:
 > Already deprecated in v3
 
 **Old:**
+
 ```marko
 <async-fragment var="foo" data-provider=data.provider>
     ${foo}
@@ -1059,6 +1101,7 @@ Given a template like this:
 ```
 
 **New:**
+
 ```marko
 <await(foo from data.provider)>
     ${foo}
@@ -1070,7 +1113,7 @@ Given a template like this:
 > Already deprecated in v3
 
 | Old                          | New                   |
-|------------------------------|-----------------------|
+| ---------------------------- | --------------------- |
 | `asyncFragmentFinish`        | `await:finish`        |
 | `asyncFragmentBegin`         | `await:begin`         |
 | `asyncFragmentBeforeRender`  | `await:beforeRender`  |
diff --git a/docs/marko-vs-react.md b/docs/marko-vs-react.md
index 97d5d80d6..8df9c5684 100644
--- a/docs/marko-vs-react.md
+++ b/docs/marko-vs-react.md
@@ -42,10 +42,10 @@ class Counter extends React.Component {
   constructor(props) {
     super(props);
 
-    this.state = { count: 0 }
+    this.state = { count: 0 };
 
     function doIncrement(delta) {
-      this.setState((prevState) => ({
+      this.setState(prevState => ({
         count: prevState.count + delta
       }));
     }
@@ -55,25 +55,19 @@ class Counter extends React.Component {
   }
   render() {
     var count = this.state.count;
-    var countClassName = 'count';
+    var countClassName = "count";
 
     if (count > 0) {
-      countClassName += ' positive';
+      countClassName += " positive";
     } else if (count < 0) {
-      countClassName += ' negative';
+      countClassName += " negative";
     }
 
     return (
       <div className="click-count">
-        <div className={countClassName}>
-          {count}
-        </div>
-        <button onClick={this.decrement}>
-          -1
-        </button>
-        <button onClick={this.increment}>
-          +1
-        </button>
+        <div className={countClassName}>{count}</div>
+        <button onClick={this.decrement}>-1</button>
+        <button onClick={this.increment}>+1</button>
       </div>
     );
   }
@@ -145,113 +139,113 @@ At a high level here are some differences:
 #### Differences in rendering
 
 * **Improved performance:** Marko renders to a virtual DOM in the browser and
-directly to an HTML stream on the server (Marko supports multiple compilation
-targets).
+  directly to an HTML stream on the server (Marko supports multiple compilation
+  targets).
 * **Improved performance:** Marko supports asynchronous rendering with [early
-flushing of
-HTML](http://www.ebaytechblog.com/2014/12/08/async-fragments-rediscovering-progressive-html-rendering-with-marko/)
-for improvements in actual and perceived page load times.
+  flushing of
+  HTML](http://www.ebaytechblog.com/2014/12/08/async-fragments-rediscovering-progressive-html-rendering-with-marko/)
+  for improvements in actual and perceived page load times.
 * **Improved performance: **React requires an additional client-side re-render if
-a page is initially rendered on the server while Marko does not.
+  a page is initially rendered on the server while Marko does not.
 * **Improved ease of use: **Marko automatically serializes UI component state and
-input down to the browser so that the browser can pick up right where the server
-left off.
+  input down to the browser so that the browser can pick up right where the server
+  left off.
 * **Improved ease of use: **Marko is suitable for rendering an entire HTML page on
-the server with support for tags such as  `<doctype>` and `<html>`
+  the server with support for tags such as `<doctype>` and `<html>`
 
 #### Differences in syntax
 
 * **Improved ease of use: **Marko uses the
-[HTML-JS](http://markojs.com/docs/syntax/) syntax and the
-[JSX](https://facebook.github.io/react/docs/jsx-in-depth.html) syntax is offered
-for React.
+  [HTML-JS](http://markojs.com/docs/syntax/) syntax and the
+  [JSX](https://facebook.github.io/react/docs/jsx-in-depth.html) syntax is offered
+  for React.
 * **Improved ease of use: **Marko supports both a concise syntax and a familiar
-HTML syntax.
+  HTML syntax.
 * **Improved ease of use: **JSX requires strict XML while Marko aligns with less
-strict HTML that web developers are used to.
-* **Improved ease of use: **With Marko, *all* HTML attribute values are parsed as
-JavaScript expressions.
+  strict HTML that web developers are used to.
+* **Improved ease of use: **With Marko, _all_ HTML attribute values are parsed as
+  JavaScript expressions.
 * **Improved ease of use: **Marko supports simple directives for conditionals,
-looping, etc.
+  looping, etc.
 * **JSX limitation: **JSX is “just JavaScript” but requires expressions that
-preclude the usage of JavaScript statements such as  in certain places.
+  preclude the usage of JavaScript statements such as in certain places.
 
 #### Differences in compilation
 
 * **Improved performance: **Marko supports multiple compilation outputs (Marko
-VDOM and HTML streaming are currently supported).
+  VDOM and HTML streaming are currently supported).
 * **Improved ease of use: **Marko compiles UI components to JavaScript modules
-that export a rendering API.
+  that export a rendering API.
 * **Expanded capabilities: **Marko supports a robust API for controlling how
-custom tags and custom attributes get compiled and it supports compile-time
-transforms based on a friendly Abstract Syntax Tree (AST).
+  custom tags and custom attributes get compiled and it supports compile-time
+  transforms based on a friendly Abstract Syntax Tree (AST).
 * **Improved performance: **JSX is just syntactic sugar that translates elements
-to `createElement()` function calls while the Marko compiler has full control over how things are
-compiled and optimized.
+  to `createElement()` function calls while the Marko compiler has full control over how things are
+  compiled and optimized.
 * **Improved ease of use: **React requires all UI components to be explicitly
-imported before they can be used as custom tags while Marko supports both
-explicit importing and implicit importing.
+  imported before they can be used as custom tags while Marko supports both
+  explicit importing and implicit importing.
 * **Improved performance: **Marko has a modular runtime and the compiler generates
-code that only imports the parts of the Marko runtime that are needed for much
-smaller builds.
+  code that only imports the parts of the Marko runtime that are needed for much
+  smaller builds.
 * **Improved ease of use: **Marko supports optional compile-time checks to ensure
-that only allowed attributes are passed to custom tags. (React `PropTypes` only provide
-validation at render-time)
-* **Improved ease of use: **Marko validates *all* tag names at compile-time.
+  that only allowed attributes are passed to custom tags. (React `PropTypes` only provide
+  validation at render-time)
+* **Improved ease of use: **Marko validates _all_ tag names at compile-time.
 * **Improved ease of use: **Marko provides its own compiler that integrates with
-Node.js and JavaScript module bundlers while React JSX requires babel and custom
-babel transforms.
+  Node.js and JavaScript module bundlers while React JSX requires babel and custom
+  babel transforms.
 
 #### Differences in UI components
 
 * **Reduced boilerplate: **No explicit extending of JavaScript classes in Marko
-(in contrast to `class Counter extends React.Component` in React).
+  (in contrast to `class Counter extends React.Component` in React).
 * **Improved ease of use: **Modifications to UI component state are synchronous
-with Marko while [the rules for React are more
-complicated](https://facebook.github.io/react/docs/state-and-lifecycle.html#state-updates-may-be-asynchronous).
+  with Marko while [the rules for React are more
+  complicated](https://facebook.github.io/react/docs/state-and-lifecycle.html#state-updates-may-be-asynchronous).
 * **Improved ease of use: **Marko watches UI component state objects to allow
-state to be modified directly (e.g., `this.state.count++`).
+  state to be modified directly (e.g., `this.state.count++`).
 * **Improved ease of use: **Marko supports single-file UI components combining
-JavaScript behavior, CSS styling (with support for CSS preprocessors) and HTML
-markup. (React requires using one of the many [CSS in JS
-solutions](https://github.com/MicheleBertoli/css-in-js) if you want styles in
-the same file as your component and there is no standard in the community)
+  JavaScript behavior, CSS styling (with support for CSS preprocessors) and HTML
+  markup. (React requires using one of the many [CSS in JS
+  solutions](https://github.com/MicheleBertoli/css-in-js) if you want styles in
+  the same file as your component and there is no standard in the community)
 * **Improved maintainability: **Marko supports a seamless transition from a
-single-file UI component to a multi-file UI component.
+  single-file UI component to a multi-file UI component.
 * **Improved performance:** Marko assumes UI components are pure by default and
-skips re-rendering when input properties and state are unchanged (React requires
-extending
-[React.PureComponent](https://facebook.github.io/react/docs/react-api.html#react.purecomponent)).
+  skips re-rendering when input properties and state are unchanged (React requires
+  extending
+  [React.PureComponent](https://facebook.github.io/react/docs/react-api.html#react.purecomponent)).
 
 #### Differences in event systems
 
 * **Reduced complexity: **React utilizes [synthetic
-events](https://facebook.github.io/react/docs/events.html) while Marko utilizes
-real DOM events.
+  events](https://facebook.github.io/react/docs/events.html) while Marko utilizes
+  real DOM events.
 * **Improved ease of use: **Custom events are emitted using the [EventEmitter
-API](https://nodejs.org/api/events.html) in Marko (e.g., `this.emit('myCustomEvent', arg1, arg2)`).
+  API](https://nodejs.org/api/events.html) in Marko (e.g., `this.emit('myCustomEvent', arg1, arg2)`).
 * **Improved ease of use: **Marko has a consistent approach for listening to both
-native DOM events and custom events.
+  native DOM events and custom events.
 * **Improved ease of use: **React requires passing around `Function` references for custom
-events while Marko automatically delegates emitted custom events to event
-handler methods on components.
+  events while Marko automatically delegates emitted custom events to event
+  handler methods on components.
 * **Improved ease of use: **Marko provides a simple mechanism for binding
-additional arguments to event handler methods and `this` will be the component
-instance.
+  additional arguments to event handler methods and `this` will be the component
+  instance.
 
 #### Differences in compatibility
 
 * **Marko limitation: **Marko has no support for native mobile similar to React
-Native (although with Marko VDOM rendering, this is possible).
+  Native (although with Marko VDOM rendering, this is possible).
 * **Marko limitation: **Marko requires a JavaScript module bundler (such as
-[Lasso](http://markojs.com/docs/lasso/),
-[Webpack](http://markojs.com/docs/webpack/),
-[Rollup](http://markojs.com/docs/rollup/) or
-[Browserify](http://markojs.com/docs/browserify/)) to be used in the browser
-since Marko UI components compile down to JavaScript modules. (we consider using
-a JavaScript module bundler a best practice)
+  [Lasso](http://markojs.com/docs/lasso/),
+  [Webpack](http://markojs.com/docs/webpack/),
+  [Rollup](http://markojs.com/docs/rollup/) or
+  [Browserify](http://markojs.com/docs/browserify/)) to be used in the browser
+  since Marko UI components compile down to JavaScript modules. (we consider using
+  a JavaScript module bundler a best practice)
 
-*****
+---
 
 In the sections below we will take a closer look at some of the differences
 between Marko and React.
@@ -287,7 +281,7 @@ In React JSX, all attribute values are parsed as string values unless `{}` is us
 
 #### Marko
 
-With Marko, *all* attribute values are parsed as JavaScript expressions. The
+With Marko, _all_ attribute values are parsed as JavaScript expressions. The
 following Marko code is equivalent to the React JSX code above:
 
 ```marko
@@ -309,10 +303,10 @@ React JSX starts with JavaScript and allows XML elements to be inlined as shown
 below:
 
 ```jsx
-import { formatDate } from './util';
+import { formatDate } from "./util";
 
 function formatName(person) {
-    return person.firstName + ' ' + person.lastName.charAt(0) + '.';
+  return person.firstName + " " + person.lastName.charAt(0) + ".";
 }
 
 export default function HelloMessage(props) {
@@ -320,10 +314,8 @@ export default function HelloMessage(props) {
 
   return (
     <div>
-        Hello {formatName(person)}!
-        <span>
-          You were born on {formatDate(person.birthday)}.
-        </span>
+      Hello {formatName(person)}!
+      <span>You were born on {formatDate(person.birthday)}.</span>
     </div>
   );
 }
@@ -356,7 +348,7 @@ $ var person = input.person;
 Lines prefixed with `$` are directly added to the compiled JavaScript output inside
 the compiled `render()` function (for JavaScript code that should run for every render).
 Lines prefixed with `static` are directly added to the compiled JavaScript output
-outside the `render()` function (for code that should only run *once* when the template is
+outside the `render()` function (for code that should only run _once_ when the template is
 loaded).
 
 ### Syntax: HTML support
@@ -370,7 +362,7 @@ documentation](https://facebook.github.io/react/docs/introducing-jsx.html#specif
 > Since JSX is closer to JavaScript than HTML, React DOM uses `camelCase` property naming
 > convention instead of HTML attribute names.
 
-> For example, `class`  becomes `className` in JSX, and `tabindex` becomes `tabIndex`.
+> For example, `class` becomes `className` in JSX, and `tabindex` becomes `tabIndex`.
 
 As a result of this caveat for React, [tools for converting HTML to JSX
 exist](http://magic.reactjs.net/htmltojsx.htm).
@@ -454,16 +446,19 @@ template:
 ```jsx
 function renderColors(colors) {
   return (
-      <ul>
-        {colors.map((color) => (
-          <li className="color" style={{
-              backgroundColor: color
-            }}>
-            {color}
-          </li>
-        ))}
-      </ul>
-    );
+    <ul>
+      {colors.map(color => (
+        <li
+          className="color"
+          style={{
+            backgroundColor: color
+          }}
+        >
+          {color}
+        </li>
+      ))}
+    </ul>
+  );
 }
 ```
 
@@ -619,8 +614,8 @@ Marko compiles component to JavaScript modules that export an API for rendering
 the component as shown below:
 
 ```js
-require('./components/greeting')
-  .renderSync({ name: 'Frank' })
+require("./components/greeting")
+  .renderSync({ name: "Frank" })
   .appendTo(document.body);
 ```
 
@@ -628,8 +623,7 @@ The same UI component can be rendered to a stream such as a writable HTTP
 response stream:
 
 ```js
-require('./components/hello')
-  .render({ name: 'John' }, res);
+require("./components/hello").render({ name: "John" }, res);
 ```
 
 > The user’s of a Marko UI component do not need to know that the component was
@@ -638,12 +632,11 @@ require('./components/hello')
 Contrast this with React as an example:
 
 ```jsx
-
-import ReactDOM from 'react-dom';
+import ReactDOM from "react-dom";
 
 ReactDOM.render(
   <HelloMessage name="John" />,
-  document.getElementById('container')
+  document.getElementById("container")
 );
 ```
 
@@ -651,10 +644,9 @@ On top of that, React requires that a different module be imported to render the
 exact same UI component on the server:
 
 ```jsx
-import ReactDOMServer from 'react-dom/server';
+import ReactDOMServer from "react-dom/server";
 
-var html = ReactDOMServer.renderToString(
-  <HelloMessage name="John" />);
+var html = ReactDOMServer.renderToString(<HelloMessage name="John" />);
 ```
 
 ### Custom tags
@@ -664,8 +656,8 @@ var html = ReactDOMServer.renderToString(
 With React, all custom tags for UI components must be explicitly imported:
 
 ```jsx
-import Hello from './components/Hello';
-import GoodBye from './components/GoodBye';
+import Hello from "./components/Hello";
+import GoodBye from "./components/GoodBye";
 
 export default function HelloGoodBye(props) {
   return (
@@ -682,7 +674,7 @@ export default function HelloGoodBye(props) {
 Marko supports a mechanism for [automatically discovering custom
 tags](http://markojs.com/docs/custom-tags/#discovering-tags) for UI components
 based on the project directory structure. Marko walks up the directory tree to
-discover all  directories and it will also automatically discover custom tags
+discover all directories and it will also automatically discover custom tags
 exported by installed packages. This approach negates the need for explicitly
 importing a custom tag to reduce the amount of code needed in a Marko template.
 For example given the following directory structure:
@@ -695,7 +687,7 @@ For example given the following directory structure:
     └── index.marko
 ```
 
-The `<hello>` tag and the `<good-bye>` tag nested below the  `components/`
+The `<hello>` tag and the `<good-bye>` tag nested below the `components/`
 directory will automatically be made available to the `index.marko` at the root:
 
 ```marko
@@ -751,6 +743,7 @@ function render(input, out) {
 ```
 
 #### Compiled for the browser:
+
 ```marko
 var marko_template = require("marko/vdom").t(__filename);
 
@@ -769,12 +762,13 @@ tags and it also provides support for compile-time transforms. While Babel
 allows code transformations of JavaScript, the Marko compiler provides support
 for resolving custom tags declaratively and the Marko AST provides for very
 powerful and simple transformations as shown in the following code for rendering
-Markdown to HTML at *compile-time*:
+Markdown to HTML at _compile-time_:
 
 **components/markdown/code-generator.js:**
+
 ```js
-import marked from 'marked';
-import {removeIndentation} from './util';
+import marked from "marked";
+import { removeIndentation } from "./util";
 
 export default function generateCode(el, codegen) {
   var bodyText = removeIndentation(el.bodyText);
@@ -827,7 +821,7 @@ quickly jump to referenced files and methods, and [Pretty
 printing](https://github.com/marko-js/atom-language-marko#prettyprint) to keep
 your code readable.
 
-*****
+---
 
 ### Why Marko?
 
@@ -837,20 +831,20 @@ Here are just a few reasons you should consider using
 * Marko requires much less boilerplate.
 * Marko has much better performance based on our benchmarks.
 * Marko offers a clean and powerful syntax that aligns with HTML while also
-allowing the full power of JavaScript.
+  allowing the full power of JavaScript.
 * Marko has much less complexity and a very small runtime.
 * Marko has a much lower page weight for faster page loads.
 * Marko has strong integrations with Node.js.
 * Marko allows for extremely powerful IDE and editor plugins (see the [Marko
-plugin for Atom](https://github.com/marko-js/atom-language-marko) as an
-example).
+  plugin for Atom](https://github.com/marko-js/atom-language-marko) as an
+  example).
 * Marko has a powerful compiler that allows new features to be added without
-introducing bloat.
+  introducing bloat.
 * eBay relies heavily on Marko and it is being used to build ebay.com (including
-the mobile web).
+  the mobile web).
 * Marko has a strong and growing community on
-[GitHub](https://github.com/marko-js/marko) and in
-[Gitter](https://gitter.im/marko-js/marko).
+  [GitHub](https://github.com/marko-js/marko) and in
+  [Gitter](https://gitter.im/marko-js/marko).
 
 Interested in learning more about Marko? If so, you can get additional
 information on the [Marko website](http://markojs.com/). Join the conversation
diff --git a/docs/redux.md b/docs/redux.md
index 0101ac4e5..da7fdc0de 100644
--- a/docs/redux.md
+++ b/docs/redux.md
@@ -12,11 +12,12 @@ npm install marko --save
 
 ## Usage
 
-The partial code snippet below shows how a Marko UI component can be connected 
+The partial code snippet below shows how a Marko UI component can be connected
 to a Redux store using the `store.subscribe()` method and the Marko `forceUpdate()`
 method:
 
 **counter.marko**
+
 ```javascript
 import store from './store';
 
@@ -41,25 +42,27 @@ class {
 ```
 
 **reducer.js**
+
 ```js
-module.exports = function (state, action) {
-    state = state || {
-        value: 0
-    };
-    
-    // Additional reducer logic here...
-    
-    return state;
+module.exports = function(state, action) {
+  state = state || {
+    value: 0
+  };
+
+  // Additional reducer logic here...
+
+  return state;
 };
 ```
 
-In `counter.marko`, the imported store module exports a Redux store created 
+In `counter.marko`, the imported store module exports a Redux store created
 using the following code:
 
 **store.js**
+
 ```javascript
-var redux = require('redux');
-var counter = require('./reducer');
+var redux = require("redux");
+var counter = require("./reducer");
 
 module.exports = redux.createStore(counter);
 ```
diff --git a/docs/reference/coming-soon.md b/docs/reference/coming-soon.md
index b1b47f26a..c4d4ff829 100644
--- a/docs/reference/coming-soon.md
+++ b/docs/reference/coming-soon.md
@@ -2,11 +2,11 @@
 
 The files in this directory will be automatically generated by jsdoc.
 
-- AST Nodes
-- Runtime API
-- Compiler API
-- CompileContext API
-- Builder API
-- CodeGenerator API
-- AsyncWriter API
-- AsyncVDOMBuilder API
\ No newline at end of file
+* AST Nodes
+* Runtime API
+* Compiler API
+* CompileContext API
+* Builder API
+* CodeGenerator API
+* AsyncWriter API
+* AsyncVDOMBuilder API
diff --git a/docs/rendering.md b/docs/rendering.md
index b948cc863..ffd91fabc 100644
--- a/docs/rendering.md
+++ b/docs/rendering.md
@@ -3,18 +3,20 @@
 To render a Marko view, you need to `require` it.
 
 _example.js_
+
 ```js
-var fancyButton = require('./components/fancy-button');
+var fancyButton = require("./components/fancy-button");
 ```
 
-> **Note:** If you are targeting node.js, you will need to enable the [require extension](./installing.md#require-marko-views) in order to require `.marko` files or you will need to precompile all of your templates using [Marko DevTools](https://github.com/marko-js/marko-devtools).  If you are targeting the browser, you will need to use a bundler like [`lasso`](./lasso.md), [`webpack`](./webpack.md), [`browserify`](./browserify.md) or [`rollup`](./rollup.md).
+> **Note:** If you are targeting node.js, you will need to enable the [require extension](./installing.md#require-marko-views) in order to require `.marko` files or you will need to precompile all of your templates using [Marko DevTools](https://github.com/marko-js/marko-devtools). If you are targeting the browser, you will need to use a bundler like [`lasso`](./lasso.md), [`webpack`](./webpack.md), [`browserify`](./browserify.md) or [`rollup`](./rollup.md).
 
 Once you have a view, you can pass input data and render it:
 
 _example.js_
+
 ```js
-var button = require('./components/fancy-button');
-var html = button.renderToString({ label:'Click me!' });
+var button = require("./components/fancy-button");
+var html = button.renderToString({ label: "Click me!" });
 
 console.log(html);
 ```
@@ -22,6 +24,7 @@ console.log(html);
 The input data becomes available as `input` within a view, so if `fancy-button.marko` looked like this:
 
 _./components/fancy-button.marko_
+
 ```marko
 <button>${input.label}</button>
 ```
@@ -34,21 +37,21 @@ The output HTML would be:
 
 ## Rendering methods
 
-We used the `renderToString` method above to render the view, but there are a number of different method signatures that can be used to render.  
+We used the `renderToString` method above to render the view, but there are a number of different method signatures that can be used to render.
 
 Many of these methods return a [`RenderResult`](#renderresult) which is an object with helper methods for working with the rendered output.
 
 ### `renderSync(input)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| return value | [`RenderResult`](#renderresult) | The result of the render |
+| params       | type                            | description                            |
+| ------------ | ------------------------------- | -------------------------------------- |
+| `input`      | `Object`                        | the input data used to render the view |
+| return value | [`RenderResult`](#renderresult) | The result of the render               |
 
-Using `renderSync` forces the render to complete synchronously.  If a tag attempts to run asynchronously, an error will be thrown.
+Using `renderSync` forces the render to complete synchronously. If a tag attempts to run asynchronously, an error will be thrown.
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 var result = view.renderSync({});
 
 result.appendTo(document.body);
@@ -56,94 +59,93 @@ result.appendTo(document.body);
 
 ### `render(input)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| return value | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target |
+| params       | type                             | description                            |
+| ------------ | -------------------------------- | -------------------------------------- |
+| `input`      | `Object`                         | the input data used to render the view |
+| return value | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target          |
 
-The `render` method returns an async `out` which is used to generate HTML on the server or a virtual DOM in the browser. In either case, the async `out` has a `then` method that follows the Promises/A+ spec, so it can be used as if it were a Promise.  This promise resolves to a [`RenderResult`](#renderresult).
+The `render` method returns an async `out` which is used to generate HTML on the server or a virtual DOM in the browser. In either case, the async `out` has a `then` method that follows the Promises/A+ spec, so it can be used as if it were a Promise. This promise resolves to a [`RenderResult`](#renderresult).
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 var resultPromise = view.render({});
 
-resultPromise.then((result) => {
-    result.appendTo(document.body);
+resultPromise.then(result => {
+  result.appendTo(document.body);
 });
 ```
 
 ### `render(input, callback)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| `callback` | `Function` | a function to call when the render is complete |
-| callback value | [`RenderResult`](#renderresult) | The result of the render |
-| return value | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target |
+| params         | type                             | description                                    |
+| -------------- | -------------------------------- | ---------------------------------------------- |
+| `input`        | `Object`                         | the input data used to render the view         |
+| `callback`     | `Function`                       | a function to call when the render is complete |
+| callback value | [`RenderResult`](#renderresult)  | The result of the render                       |
+| return value   | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target                  |
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 
 view.render({}, (err, result) => {
-    result.appendTo(document.body);
+  result.appendTo(document.body);
 });
 ```
 
 ### `render(input, stream)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| `stream` | `WritableStream` | a writeable stream |
-| return value | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target |
+| params       | type                             | description                            |
+| ------------ | -------------------------------- | -------------------------------------- |
+| `input`      | `Object`                         | the input data used to render the view |
+| `stream`     | `WritableStream`                 | a writeable stream                     |
+| return value | `AsyncStream`/`AsyncVDOMBuilder` | the async `out` render target          |
 
 The HTML output is written to the passed `stream`.
 
 ```js
-var http = require('http');
-var view = require('./view'); // Import `./view.marko`
+var http = require("http");
+var view = require("./view"); // Import `./view.marko`
 
 http.createServer((req, res) => {
-    res.setHeader('content-type', 'text/html');
-    view.render({}, res);
+  res.setHeader("content-type", "text/html");
+  view.render({}, res);
 });
 ```
 
 ### `render(input, out)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| `out` | `AsyncStream`/`AsyncVDOMBuilder` | The async `out` to render to |
-| return value | `AsyncStream`/`AsyncVDOMBuilder` | The `out` that was passed |
+| params       | type                             | description                            |
+| ------------ | -------------------------------- | -------------------------------------- |
+| `input`      | `Object`                         | the input data used to render the view |
+| `out`        | `AsyncStream`/`AsyncVDOMBuilder` | The async `out` to render to           |
+| return value | `AsyncStream`/`AsyncVDOMBuilder` | The `out` that was passed              |
 
-The `render` method also allows passing an existing async `out`.  If you do this, `render` will not automatically end the async `out` (this allows rendering a view in the middle of another view).  If the async `out` won't be ended by other means, you are responsible for ending it.
+The `render` method also allows passing an existing async `out`. If you do this, `render` will not automatically end the async `out` (this allows rendering a view in the middle of another view). If the async `out` won't be ended by other means, you are responsible for ending it.
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 var out = view.createOut();
 
 view.render({}, out);
 
-out.on('finish', () => {
-    console.log(out.getOutput());
+out.on("finish", () => {
+  console.log(out.getOutput());
 });
 
 out.end();
 ```
 
-
 ### `renderToString(input)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
+| params       | type     | description                            |
+| ------------ | -------- | -------------------------------------- |
+| `input`      | `Object` | the input data used to render the view |
 | return value | `String` | The HTML string produced by the render |
 
-Returns an HTML string and forces the render to complete synchronously.  If a tag attempts to run asynchronously, an error will be thrown.
+Returns an HTML string and forces the render to complete synchronously. If a tag attempts to run asynchronously, an error will be thrown.
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 var html = view.renderToString({});
 
 document.body.innerHTML = html;
@@ -151,30 +153,30 @@ document.body.innerHTML = html;
 
 ### `renderToString(input, callback)`
 
-| params  | type | description |
-| ------- | ---- | ----------- |
-| `input` | `Object` | the input data used to render the view |
-| callback value | `String` | The HTML string produced by the render |
-| return value | `undefined` | N/A |
+| params         | type        | description                            |
+| -------------- | ----------- | -------------------------------------- |
+| `input`        | `Object`    | the input data used to render the view |
+| callback value | `String`    | The HTML string produced by the render |
+| return value   | `undefined` | N/A                                    |
 
 An HTML string is passed to the callback.
 
 ```js
-var view = require('./view'); // Import `./view.marko`
+var view = require("./view"); // Import `./view.marko`
 
 view.renderToString({}, (err, html) => {
-    document.body.innerHTML = html;
+  document.body.innerHTML = html;
 });
 ```
 
 ### `stream(input)`
 
-The `stream` method returns a node.js style stream of the output HTML.  This method is available on the server, but is not available by default in the browser.  If you need to use streams in the browser, you may `require('marko/stream')` as part of your client-side bundle.
+The `stream` method returns a node.js style stream of the output HTML. This method is available on the server, but is not available by default in the browser. If you need to use streams in the browser, you may `require('marko/stream')` as part of your client-side bundle.
 
 ```js
-var fs = require('fs');
-var view = require('./view'); // Import `./view.marko`
-var writeStream = fs.createWriteStream('output.html');
+var fs = require("fs");
+var view = require("./view"); // Import `./view.marko`
+var writeStream = fs.createWriteStream("output.html");
 
 view.stream({}).pipe(writeStream);
 ```
@@ -182,25 +184,35 @@ view.stream({}).pipe(writeStream);
 ## RenderResult
 
 ### `getComponent()`
+
 ### `getComponents(selector)`
+
 ### `afterInsert(doc)`
+
 ### `getNode(doc)`
+
 ### `getOutput()`
+
 ### `appendTo(targetEl)`
+
 ### `insertAfter(targetEl)`
+
 ### `insertBefore(targetEl)`
+
 ### `prependTo(targetEl)`
+
 ### `replace(targetEl)`
+
 ### `replaceChildrenOf(targetEl)`
 
 ## Global data
 
-If you need to make data available globally to all views that are rendered as the result of a call to one of the above render methods, you can pass the data as a `$global` property on the input data object.  This data will be removed from `input` and merged into the `out.global` property.
+If you need to make data available globally to all views that are rendered as the result of a call to one of the above render methods, you can pass the data as a `$global` property on the input data object. This data will be removed from `input` and merged into the `out.global` property.
 
 ```js
 view.render({
-    $global: {
-        flags: ['mobile']
-    }
+  $global: {
+    flags: ["mobile"]
+  }
 });
 ```
diff --git a/docs/rollup.md b/docs/rollup.md
index fd70bcd9a..b490515d4 100644
--- a/docs/rollup.md
+++ b/docs/rollup.md
@@ -22,33 +22,33 @@ The following is the minimal recommend configuration to use Rollup with Marko:
 _rollup.config.js_
 
 ```js
-import commonjsPlugin from 'rollup-plugin-commonjs';
-import browserifyPlugin from 'rollup-plugin-browserify-transform';
-import nodeResolvePlugin from 'rollup-plugin-node-resolve';
-import markoify from 'markoify';
-import envify from 'envify';
-import path from 'path';
+import commonjsPlugin from "rollup-plugin-commonjs";
+import browserifyPlugin from "rollup-plugin-browserify-transform";
+import nodeResolvePlugin from "rollup-plugin-node-resolve";
+import markoify from "markoify";
+import envify from "envify";
+import path from "path";
 
 export default {
-    entry: path.join(__dirname, 'client.js'),
-    format: 'iife',
-    moduleName: 'app',
-    plugins: [
-        browserifyPlugin(markoify),
-        browserifyPlugin(envify),
-        nodeResolvePlugin({
-            jsnext: true,  // Default: false
-            main: true,  // Default: true
-            browser: true,  // Default: false
-            preferBuiltins: false,
-            extensions: [ '.js', '.marko' ]
-        }),
-        commonjsPlugin({
-            include: [ 'node_modules/**', '**/*.marko', '**/*.js'],
-            extensions: [ '.js', '.marko' ]
-        })
-    ],
-    dest: path.join(__dirname, './dist/bundle.js')
+  entry: path.join(__dirname, "client.js"),
+  format: "iife",
+  moduleName: "app",
+  plugins: [
+    browserifyPlugin(markoify),
+    browserifyPlugin(envify),
+    nodeResolvePlugin({
+      jsnext: true, // Default: false
+      main: true, // Default: true
+      browser: true, // Default: false
+      preferBuiltins: false,
+      extensions: [".js", ".marko"]
+    }),
+    commonjsPlugin({
+      include: ["node_modules/**", "**/*.marko", "**/*.js"],
+      extensions: [".js", ".marko"]
+    })
+  ],
+  dest: path.join(__dirname, "./dist/bundle.js")
 };
 ```
 
diff --git a/docs/server-side-rendering.md b/docs/server-side-rendering.md
index a69a97e4f..b1bfa9ca0 100644
--- a/docs/server-side-rendering.md
+++ b/docs/server-side-rendering.md
@@ -3,30 +3,31 @@
 Marko allows any Marko template/UI component to be rendered on the server or in the browser. A page can be rendered to a `Writable` stream such as an HTTP response stream as shown below:
 
 ```js
-var template = require('./template'); // Import ./template.marko
+var template = require("./template"); // Import ./template.marko
 
 module.exports = function(req, res) {
-    res.setHeader('Content-Type', 'text/html; charset=utf-8');
-    template.render({ name: 'Frank' }, res);
+  res.setHeader("Content-Type", "text/html; charset=utf-8");
+  template.render({ name: "Frank" }, res);
 };
 ```
 
 Marko can also provide you with a `Readable` stream.
 
 ```js
-var template = require('./template'); // Import ./template.marko
+var template = require("./template"); // Import ./template.marko
 
 module.exports = function(req) {
-    // Return a Readable stream for someone to do something with:
-    return template.stream({ name: 'Frank' });
+  // Return a Readable stream for someone to do something with:
+  return template.stream({ name: "Frank" });
 };
 ```
 
 > **ProTip:** Marko also provides server-side framework integrations:
-> - [express](/docs/express.md)
-> - [hapi](/docs/hapi.md)
-> - [koa](/docs/koa.md)
-> - [huncwot](/docs/huncwot.md)
+>
+> * [express](/docs/express.md)
+> * [hapi](/docs/hapi.md)
+> * [koa](/docs/koa.md)
+> * [huncwot](/docs/huncwot.md)
 
 ## UI Bootstrapping
 
@@ -65,35 +66,37 @@ _routes/index/template.marko_
 ```
 
 > **ProTip:** We have provided some sample apps to help you get started with Marko + Lasso
-> - [marko-lasso](https://github.com/marko-js-samples/marko-lasso)
-> - [ui-components-playground](https://github.com/marko-js-samples/ui-components-playground)
-
+>
+> * [marko-lasso](https://github.com/marko-js-samples/marko-lasso)
+> * [ui-components-playground](https://github.com/marko-js-samples/ui-components-playground)
 
 ### Bootstrapping: Non-Lasso
 
- If a JavaScript module bundler other than Lasso is being used then you will need to add some client-side code to bootstrap your application in the browser by doing the following:
+If a JavaScript module bundler other than Lasso is being used then you will need to add some client-side code to bootstrap your application in the browser by doing the following:
 
-1. Load/import/require all of the UI components that were rendered on the server (loading the top-level UI component is typically sufficient)
-2. Call `require('marko/components').init()`
+1.  Load/import/require all of the UI components that were rendered on the server (loading the top-level UI component is typically sufficient)
+2.  Call `require('marko/components').init()`
 
 For example, if `client.js` is the entry point for your client-side application:
 
 _routes/index/client.js_
+
 ```js
 // Load the top-level UI component:
-require('./components/app/index');
+require("./components/app/index");
 
 // Now that all of the JavaScript modules for the UI component have been
 // loaded and registered we can tell marko to bootstrap/initialize the app
 
 // Initialize and mount all of the server-rendered UI components:
-require('marko/components').init();
+require("marko/components").init();
 ```
 
 > **ProTip:** We have provided some sample apps to help you get started:
-> - [marko-webpack](https://github.com/marko-js-samples/marko-webpack)
-> - [marko-browserify](https://github.com/marko-js-samples/marko-browserify)
-> - [marko-rollup](https://github.com/marko-js-samples/marko-rollup)
+>
+> * [marko-webpack](https://github.com/marko-js-samples/marko-webpack)
+> * [marko-browserify](https://github.com/marko-js-samples/marko-browserify)
+> * [marko-rollup](https://github.com/marko-js-samples/marko-rollup)
 
 # Serialization
 
@@ -119,23 +122,26 @@ class {
 
 There are some caveats associated with rendering a page on the server:
 
-- The UI component data for top-level UI components must be serializable:
-    - Only simple objects, numbers, strings, booleans, arrays and `Date` objects are serializable
-    - Functions are not serializable
-- Care should be taken to avoid having Marko serialize too much data
-- None of the data in `out.global` is serialized by default, but this can be changed as shown below
+* The UI component data for top-level UI components must be serializable:
+  * Only simple objects, numbers, strings, booleans, arrays and `Date` objects are serializable
+  * Functions are not serializable
+* Care should be taken to avoid having Marko serialize too much data
+* None of the data in `out.global` is serialized by default, but this can be changed as shown below
 
 ## Serializing globals
 
 If there are specific properties on the `out.global` object that need to be serialized then they must be whitelisted when the top-level page is rendered on the server. For example, to have the `out.global.apiKey` and the `out.global.locale` properties serialized you would do the following:
 
 ```js
-template.render({
-        $global: {
-            serializedGlobals: {
-                apiKey: true,
-                locale: true
-            }
-        }
-    }, res);
+template.render(
+  {
+    $global: {
+      serializedGlobals: {
+        apiKey: true,
+        locale: true
+      }
+    }
+  },
+  res
+);
 ```
diff --git a/docs/structure.json b/docs/structure.json
index 1f370a894..7cb40bbb6 100644
--- a/docs/structure.json
+++ b/docs/structure.json
@@ -1,58 +1,52 @@
-[{
-    "title": "Introduction",
-    "docs": [
-        "Installing",
-        "Getting started",
-        "Rendering",
-        "Syntax",
-        "Core tags",
-        "Custom tags",
-        "Components",
-        "Server-side rendering"
-    ]
-},{
-    "title": "Bundler Integrations",
-    "docs": [
-        "Lasso",
-        "Webpack",
-        "Browserify",
-        "Rollup"
-    ]
-},{
-    "title": "Server Integrations",
-    "docs": [
-        "Express",
-        "Koa",
-        "Hapi",
-        "HTTP",
-        {
-            "title": "Other",
-            "docs": [
-                "Fastify",
-                "Huncwot"
-            ]
-        }
-    ]
-},{
-    "title": "Framework Integrations",
-    "docs": [
-        "Redux"
-    ]
-},{
-    "title": "Tooling",
-    "docs": [
-        "Editor plugins"
-    ]
-},{
-    "title": "Tutorials",
-    "docs": [
-        "Color Picker"
-    ]
-}, {
-    "title": "Articles",
-    "docs": [
-        "Marko vs React",
-        "Why is Marko Fast",
-        "10 Awesome Marko Features"
-    ]
-}]
+[
+    {
+        "title": "Introduction",
+        "docs": [
+            "Installing",
+            "Getting started",
+            "Rendering",
+            "Syntax",
+            "Core tags",
+            "Custom tags",
+            "Components",
+            "Server-side rendering"
+        ]
+    },
+    {
+        "title": "Bundler Integrations",
+        "docs": ["Lasso", "Webpack", "Browserify", "Rollup"]
+    },
+    {
+        "title": "Server Integrations",
+        "docs": [
+            "Express",
+            "Koa",
+            "Hapi",
+            "HTTP",
+            {
+                "title": "Other",
+                "docs": ["Fastify", "Huncwot"]
+            }
+        ]
+    },
+    {
+        "title": "Framework Integrations",
+        "docs": ["Redux"]
+    },
+    {
+        "title": "Tooling",
+        "docs": ["Editor plugins"]
+    },
+    {
+        "title": "Tutorials",
+        "docs": ["Color Picker"]
+    },
+    {
+        "title": "Articles",
+        "docs": [
+            "Marko vs React",
+            "Why is Marko Fast",
+            "10 Awesome Marko Features"
+        ]
+    }
+]
diff --git a/docs/syntax.md b/docs/syntax.md
index 64f61f7f0..ec68ba017 100644
--- a/docs/syntax.md
+++ b/docs/syntax.md
@@ -1,12 +1,12 @@
 # Syntax
 
-Marko's syntax is based on HTML, so you basically already know it.  Marko extends the HTML language to add a few nice features which we'll cover here.
+Marko's syntax is based on HTML, so you basically already know it. Marko extends the HTML language to add a few nice features which we'll cover here.
 
 > **ProTip:** Marko also supports a [beautiful concise syntax](./concise.md). If you'd prefer to see our documentation using this syntax, just click the `switch syntax` button in the corner of any Marko code sample.
 
 ## Text replacement
 
-When you render a Marko template, you pass input data that is then available within the template as `input`.  You can then use `${}` to insert a value into the template:
+When you render a Marko template, you pass input data that is then available within the template as `input`. You can then use `${}` to insert a value into the template:
 
 ```marko
 <div>
@@ -22,7 +22,7 @@ You can actually pass any JavaScript expression here and the result of the expre
 </div>
 ```
 
-These values are automatically escaped so you don't accidentally insert malicious code.  If you do need to pass unescaped HTML, you can use `$!{}`:
+These values are automatically escaped so you don't accidentally insert malicious code. If you do need to pass unescaped HTML, you can use `$!{}`:
 
 ```marko
 <div>
@@ -42,7 +42,7 @@ If necessary, you can escape `$` using a backslash to have it be treated as text
 
 ## Root level text
 
-Text at the root of a template (outside any tags) must be prefixed with the [concise syntax's `--`](./concise.md#text) to denote it is text.  The parser starts in concise mode and would otherwise try to parse what you meant to be text as a concise tag declaration.
+Text at the root of a template (outside any tags) must be prefixed with the [concise syntax's `--`](./concise.md#text) to denote it is text. The parser starts in concise mode and would otherwise try to parse what you meant to be text as a concise tag declaration.
 
 ```marko
 -- Root level text
@@ -75,22 +75,27 @@ _It does not contain any spaces_
 ```marko
 <tag sum=1+2 difference=3-4/>
 ```
+
 ```marko
 tag sum=1+2 difference=3-4
 ```
 
 _Spaces are contained within matching `()`, `[]`, or `{}`_
+
 ```marko
 <tag sum=(1 + 2) difference=(3 - 4)/>
 ```
+
 ```marko
 tag sum=(1 + 2) difference=(3 - 4)
 ```
 
 _Or, commas are used to delimit attributes_
+
 ```marko
 <tag sum=1 + 2, difference=3 - 4/>
 ```
+
 ```marko
 tag sum=1 + 2, difference=3 - 4
 ```
@@ -104,6 +109,7 @@ Whitespace may optionally be used around the equal sign of an attribute:
 ```marko
 <tag value = 5/>
 ```
+
 ```marko
 tag value = 5
 ```
@@ -129,14 +135,17 @@ With a value of `false` for `active`, the output would be the following:
 ```
 
 ### Dynamic attributes
+
 You can use the `...attrs` syntax inside an open tag to merge in the properties of an object as attributes to a tag:
 
 _index.js_
+
 ```js
-template.render({ attrs:{ class:'active', href:'https://ebay.com/' } });
+template.render({ attrs: { class: "active", href: "https://ebay.com/" } });
 ```
 
 _link.marko_
+
 ```marko
 <a ...input.attrs target="_blank">eBay</a>
 ```
@@ -144,6 +153,7 @@ _link.marko_
 would output the following HTML:
 
 _output.html_
+
 ```html
 <a class="active" href="https://ebay.com/" target="_blank">eBay</a>
 ```
@@ -177,6 +187,7 @@ The `class` attribute also support object expressions or an array expressions (i
 In both cases, the output will be the same:
 
 _output.html_
+
 ```html
 <div class="a c"></div>
 ```
@@ -186,6 +197,7 @@ _output.html_
 Marko provides a shorthand for declaring classes and ids on an element:
 
 _source.marko_
+
 ```marko
 <div.my-class/>
 <span#my-id/>
@@ -195,6 +207,7 @@ _source.marko_
 Yields this HTML:
 
 _output.html_
+
 ```html
 <div class="my-class"></div>
 <span id="my-id"></span>
@@ -203,7 +216,7 @@ _output.html_
 
 ## Directives
 
-Directives are denoted by parenthesis and take an argument instead of a value.  Many directives may be used as both tags and attributes.
+Directives are denoted by parenthesis and take an argument instead of a value. Many directives may be used as both tags and attributes.
 
 ```marko
 <if(true)>
@@ -226,11 +239,12 @@ Most directives support JavaScript expressions, and some even support multiple a
 ```
 
 Others allow a custom syntax:
+
 ```marko
 <for(item in items)/>
 ```
 
-Directives are used by many of our [Core Tags](./core-tags.md) for control-flow (`<if>`, `<else-if>`, `<for>`, etc.) and other features.  You can also use them in your own [Custom Tags](./custom-tags.md).
+Directives are used by many of our [Core Tags](./core-tags.md) for control-flow (`<if>`, `<else-if>`, `<for>`, etc.) and other features. You can also use them in your own [Custom Tags](./custom-tags.md).
 
 ## Inline JavaScript
 
@@ -249,7 +263,7 @@ $ var name = input.name;
 </div>
 ```
 
-A statement may continue onto subsequent lines if new lines are bounded by `{}`, `[]`, `()`, ``` `` ```, or `/**/`:
+A statement may continue onto subsequent lines if new lines are bounded by `{}`, `[]`, `()`, ` `` `, or `/**/`:
 
 ```marko
 $ var person = {
@@ -270,6 +284,7 @@ $ {
 ```
 
 ### Static JavaScript
+
 > **Static:** The JavaScript code that follows `static` will run once when the template is loaded and be shared by all calls to render. It must be declared at the top level and does not have access to values passed in at render.
 
 Inline JavaScript will run each time your template is rendered, if you only want to initialize some values once, use the `static` keyword:
diff --git a/docs/webpack.md b/docs/webpack.md
index 0b2d1582c..28ae617df 100644
--- a/docs/webpack.md
+++ b/docs/webpack.md
@@ -17,6 +17,7 @@ npm install marko-loader --save
 Let's say we have a simple view that we want to render in the browser: `hello.marko`
 
 _hello.marko_
+
 ```marko
 <h1>Hello ${input.name}</h1>
 ```
@@ -24,39 +25,42 @@ _hello.marko_
 First, let's create a `client.js` that requires the view and renders it to the body:
 
 _client.js_
-```js
-var myComponent = require('./hello.marko');
 
-myComponent.renderSync({ name:'Marko' }).appendTo(document.body);
+```js
+var myComponent = require("./hello.marko");
+
+myComponent.renderSync({ name: "Marko" }).appendTo(document.body);
 ```
 
 Now, let's configure `webpack` to compile the `client.js` file and use `marko-loader` for any `*.marko` files:
 
 _webpack.config.js_
+
 ```js
 module.exports = {
-    entry: "./client.js",
-    output: {
-        path: __dirname,
-        filename: "static/bundle.js"
-    },
-    resolve: {
-        extensions: ['.js', '.marko']
-    },
-    module: {
-        loaders: [
-            {
-                test: /\.marko$/,
-                loader: 'marko-loader'
-            }
-        ]
-    }
-}
+  entry: "./client.js",
+  output: {
+    path: __dirname,
+    filename: "static/bundle.js"
+  },
+  resolve: {
+    extensions: [".js", ".marko"]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.marko$/,
+        loader: "marko-loader"
+      }
+    ]
+  }
+};
 ```
 
-Run `webpack` from your terminal and you'll have a new `static/bundle.js` file created.  Reference that from an html file and you're good to go.
+Run `webpack` from your terminal and you'll have a new `static/bundle.js` file created. Reference that from an html file and you're good to go.
 
 _index.html_
+
 ```html
 <!doctype html>
 <html>
@@ -73,6 +77,7 @@ Load up that page in your browser and you should see `Hello Marko` staring back
 If you're using inline css with pre-processors, you must configure the appropriate loader.
 
 _pretty.marko_
+
 ```marko
 style.less {
     .pretty {
@@ -84,18 +89,20 @@ style.less {
 ```
 
 _webpack.config.js_
+
 ```js
 //...
-    loaders: [
-        //...
-        {
-            test: /\.less$/, // matches style.less { ... } from our template
-            loader: "style-loader!css-loader!less-loader!"
-        },
-        //...
-    ]
+loaders: [
+  //...
+  {
+    test: /\.less$/, // matches style.less { ... } from our template
+    loader: "style-loader!css-loader!less-loader!"
+  }
+  //...
+];
 //...
 ```
+
 ## Extracting CSS
 
 It is recommended to configure the [`ExtractTextPlugin`](https://www.npmjs.com/package/extract-text-webpack-plugin) so that you get a separate css bundle rather than it being included in the JavaScript bundle.
@@ -105,37 +112,38 @@ npm install extract-text-webpack-plugin --save
 ```
 
 _webpack.config.js_
+
 ```js
-'use strict';
+"use strict";
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = {
-    entry: "./client.js",
-    output: {
-        path: __dirname,
-        filename: "static/bundle.js"
-    },
-    resolve: {
-        extensions: ['.js', '.marko']
-    },
-    module: {
-        loaders: [
-            {
-                test: /\.marko$/,
-                loader: 'marko-loader'
-            },
-            {
-                test: /\.(less|css)$/,
-                loader: ExtractTextPlugin.extract({
-                    fallback: "style-loader",
-                    use: "css-loader!less-loader"
-                })
-            }
-        ]
-    },
-    plugins: [
-        // Write out CSS bundle to its own file:
-        new ExtractTextPlugin('static/bundle.css', { allChunks: true })
+  entry: "./client.js",
+  output: {
+    path: __dirname,
+    filename: "static/bundle.js"
+  },
+  resolve: {
+    extensions: [".js", ".marko"]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.marko$/,
+        loader: "marko-loader"
+      },
+      {
+        test: /\.(less|css)$/,
+        loader: ExtractTextPlugin.extract({
+          fallback: "style-loader",
+          use: "css-loader!less-loader"
+        })
+      }
     ]
+  },
+  plugins: [
+    // Write out CSS bundle to its own file:
+    new ExtractTextPlugin("static/bundle.css", { allChunks: true })
+  ]
 };
 ```
diff --git a/docs/why-is-marko-fast.md b/docs/why-is-marko-fast.md
index ce7507894..563da72b6 100644
--- a/docs/why-is-marko-fast.md
+++ b/docs/why-is-marko-fast.md
@@ -27,7 +27,7 @@ has switched to [a new methodology to measure and understand real-world
 JavaScript
 performance](https://v8project.blogspot.com/2016/12/how-v8-measures-real-world-performance.html).
 
-Similarly, we’ve taken a look at how our developers are *actually* writing their
+Similarly, we’ve taken a look at how our developers are _actually_ writing their
 Marko components and have found patterns that could be further optimized.
 Instead of focusing on benchmarks in this article, I want to focus on the
 details of optimizations that we have applied to Marko.
@@ -58,13 +58,11 @@ The compiled output is optimized for streaming HTML output on the server:
 
 ```js
 var marko_template = require("marko/html").t(__filename),
-    marko_helpers = require("marko/runtime/html/helpers"),
-    marko_escapeXml = marko_helpers.x;
+  marko_helpers = require("marko/runtime/html/helpers"),
+  marko_escapeXml = marko_helpers.x;
 
 function render(input, out) {
-  out.w("<div>Hello " +
-    marko_escapeXml(input.name) +
-    "!</div>");
+  out.w("<div>Hello " + marko_escapeXml(input.name) + "!</div>");
 }
 ```
 
@@ -74,7 +72,8 @@ function render(input, out) {
 var marko_template = require("marko/vdom").t(__filename);
 
 function render(input, out) {
-  out.e("DIV", null, 3)
+  out
+    .e("DIV", null, 3)
     .t("Hello ")
     .t(input.name)
     .t("!");
@@ -104,12 +103,17 @@ the `styleAttr` helper is shown below:
 var marko_styleAttr = require("marko/runtime/vdom/helper-styleAttr");
 
 function render(input, out) {
-  var color = 'red';
-  out.e("DIV", {
+  var color = "red";
+  out.e(
+    "DIV",
+    {
       style: marko_styleAttr({
-          backgroundColor: color
-        })
-    }, 0, 4);
+        backgroundColor: color
+      })
+    },
+    0,
+    4
+  );
 }
 ```
 
@@ -121,7 +125,7 @@ virtual DOM tree on the server it’s a two-step process to render HTML:
 
 * First pass to produce an entire virtual DOM tree in memory
 * Second pass to serialize the virtual DOM tree to an HTML string that can then be
-sent over the wire (this requires traversing the entire tree structure)
+  sent over the wire (this requires traversing the entire tree structure)
 
 In contrast, Marko renders directly to an HTML stream in a single pass. There is
 no intermediate tree data structure.
@@ -176,11 +180,12 @@ Marko will produce the following compiled output:
 
 ```js
 var marko_attrs0 = {
-        "class": "hello"
-      };
+  class: "hello"
+};
 
 function render(input, out) {
-  out.e("DIV", marko_attrs0, 3)
+  out
+    .e("DIV", marko_attrs0, 3)
     .t("Hello ")
     .t(input.name)
     .t("!");
@@ -229,4 +234,4 @@ root, but this approach uses much less memory and reduces the amount of work
 that is done during initialization. The extra overhead of delegating events to
 components will not be noticeable so it is a very beneficial optimization.
 
-*Cover image credit: [Superhero by Gan Khoon Lay from the Noun Project](https://thenounproject.com/search/?q=superhero&i=690775)*
+_Cover image credit: [Superhero by Gan Khoon Lay from the Noun Project](https://thenounproject.com/search/?q=superhero&i=690775)_
diff --git a/env.js b/env.js
index a37bd1630..1f50674cc 100644
--- a/env.js
+++ b/env.js
@@ -3,12 +3,11 @@ var isDebug = false;
 var env = process.env || {};
 
 if (env.MARKO_DEBUG != null) {
-    isDebug = env.MARKO_DEBUG !== 'false' && env.MARKO_DEBUG !== '0';
+    isDebug = env.MARKO_DEBUG !== "false" && env.MARKO_DEBUG !== "0";
 } else {
     var NODE_ENV = env.NODE_ENV;
-    isDebug = NODE_ENV == null ||
-        NODE_ENV === 'development' ||
-        NODE_ENV === 'dev';
+    isDebug =
+        NODE_ENV == null || NODE_ENV === "development" || NODE_ENV === "dev";
 }
 
 exports.isDebug = isDebug;
diff --git a/express.js b/express.js
index 576269d23..c2d9928b1 100644
--- a/express.js
+++ b/express.js
@@ -1,6 +1,6 @@
-var isDebug = require('./env').isDebug;
-var target = isDebug ? 'marko/src/express' : 'marko/dist/express';
+var isDebug = require("./env").isDebug;
+var target = isDebug ? "marko/src/express" : "marko/dist/express";
 
-module.exports = module.parent ?
-    module.parent.require(target) :
-    require(target);
+module.exports = module.parent
+    ? module.parent.require(target)
+    : require(target);
diff --git a/helpers/README.md b/helpers/README.md
index 12ac15a98..faff55a7c 100644
--- a/helpers/README.md
+++ b/helpers/README.md
@@ -1,5 +1,4 @@
-Marko Helpers
-=============
+# Marko Helpers
 
 This directory contains helpers that were deprecated in Marko v3. Marko v4 no longer adds these helpers to every compiled template, but you can still import them if needed:
 
diff --git a/helpers/empty.js b/helpers/empty.js
index c8e4adcf2..4297bfcfd 100644
--- a/helpers/empty.js
+++ b/helpers/empty.js
@@ -1,5 +1,5 @@
-var notEmpty = require('./notEmpty');
+var notEmpty = require("./notEmpty");
 
-module.exports = function (o) {
+module.exports = function(o) {
     return !notEmpty(o);
-};
\ No newline at end of file
+};
diff --git a/helpers/notEmpty.js b/helpers/notEmpty.js
index 818f9ff1d..8c004461f 100644
--- a/helpers/notEmpty.js
+++ b/helpers/notEmpty.js
@@ -3,9 +3,9 @@ module.exports = function notEmpty(o) {
         return false;
     } else if (Array.isArray(o)) {
         return !!o.length;
-    } else if (o === '') {
+    } else if (o === "") {
         return false;
     }
 
     return true;
-};
\ No newline at end of file
+};
diff --git a/hot-reload.js b/hot-reload.js
index 4817e13ad..95f2853d7 100644
--- a/hot-reload.js
+++ b/hot-reload.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/hot-reload');
+    module.exports = require("./src/hot-reload");
 } else {
-    module.exports = require('./dist/hot-reload');
+    module.exports = require("./dist/hot-reload");
 }
diff --git a/index.js b/index.js
index 99bc0d4cb..9b666fa52 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/');
+    module.exports = require("./src/");
 } else {
-    module.exports = require('./dist/');
+    module.exports = require("./dist/");
 }
diff --git a/legacy-components.js b/legacy-components.js
index 5873667c4..105373af9 100644
--- a/legacy-components.js
+++ b/legacy-components.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/components/legacy');
+    module.exports = require("./src/components/legacy");
 } else {
-    module.exports = require('./dist/components/legacy');
+    module.exports = require("./dist/components/legacy");
 }
diff --git a/node-require.js b/node-require.js
index a4cb6d71d..78c34cb8d 100644
--- a/node-require.js
+++ b/node-require.js
@@ -1,7 +1,7 @@
-var isDebug = require('./env').isDebug;
+var isDebug = require("./env").isDebug;
 
 if (isDebug) {
-    module.exports = require('./src/node-require');
+    module.exports = require("./src/node-require");
 } else {
-    module.exports = require('./dist/node-require');
+    module.exports = require("./dist/node-require");
 }
diff --git a/package.json b/package.json
index 7dbebe429..10d3f9e09 100644
--- a/package.json
+++ b/package.json
@@ -1,139 +1,155 @@
 {
-  "name": "marko",
-  "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
-  "keywords": [
-    "front-end",
-    "templating",
-    "template",
-    "async",
-    "streaming",
-    "components",
-    "ui",
-    "vdom",
-    "dom",
-    "morphdom",
-    "virtual",
-    "virtual-dom"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/marko-js/marko.git"
-  },
-  "scripts": {
-    "build": "node scripts/build.js",
-    "build-src": "node scripts/build.js src",
-    "prepublish": "npm run build-src",
-    "test": "npm run jshint -s && npm run mocha -s",
-    "test-ci": "npm run test-generate-coverage",
-    "mocha": "mocha --timeout 10000 --max-old-space-size=768 ./test/*/*.test.js",
-    "test-coverage": "npm run test-generate-coverage && nyc report --reporter=html && open ./coverage/index.html",
-    "test-generate-coverage": "nyc -asc npm test",
-    "jshint": "jshint src/ *.js",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls",
-    "codecov": "nyc report --reporter=text-lcov > coverage.lcov && codecov"
-  },
-  "author": "Patrick Steele-Idem <pnidem@gmail.com>",
-  "maintainers": [
-    "Patrick Steele-Idem <pnidem@gmail.com>",
-    "Michael Rawlings <ml.rawlings@gmail.com>",
-    "Phillip Gates-Idem <phillip.idem@gmail.com>",
-    "Austin Kelleher <a@alk.im>",
-    "Dylan Piercey <pierceydylan@gmail.com>",
-    "Martin Aberer"
-  ],
-  "dependencies": {
-    "app-module-path": "^2.2.0",
-    "argly": "^1.0.0",
-    "browser-refresh-client": "^1.0.0",
-    "char-props": "~0.1.5",
-    "complain": "^1.2.0",
-    "deresolve": "^1.1.2",
-    "escodegen": "^1.8.1",
-    "esprima": "^4.0.0",
-    "estraverse": "^4.2.0",
-    "events": "^1.0.2",
-    "events-light": "^1.0.0",
-    "he": "^1.1.0",
-    "htmljs-parser": "^2.3.2",
-    "lasso-caching-fs": "^1.0.1",
-    "lasso-modules-client": "^2.0.4",
-    "lasso-package-root": "^1.0.1",
-    "listener-tracker": "^2.0.0",
-    "minimatch": "^3.0.2",
-    "object-assign": "^4.1.0",
-    "property-handlers": "^1.0.0",
-    "raptor-json": "^1.0.1",
-    "raptor-polyfill": "^1.0.0",
-    "raptor-promises": "^1.0.1",
-    "raptor-regexp": "^1.0.0",
-    "raptor-util": "^3.2.0",
-    "resolve-from": "^2.0.0",
-    "shorthash": "0.0.2",
-    "simple-sha1": "^2.1.0",
-    "strip-json-comments": "^2.0.1",
-    "try-require": "^1.2.1",
-    "warp10": "^1.0.0"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.24.1",
-    "babel-plugin-minprops": "^2.0.1",
-    "benchmark": "^2.1.1",
-    "bluebird": "^3.4.7",
-    "builtins": "^2.0.0",
-    "chai": "^3.3.0",
-    "codecov": "^2.3.0",
-    "coveralls": "^2.13.1",
-    "diffable-html": "^2.1.0",
-    "express": "^4.16.1",
-    "fs-extra": "^2.0.0",
-    "ignoring-watcher": "^1.0.2",
-    "istanbul-lib-instrument": "^1.8.0",
-    "it-fails": "^1.0.0",
-    "jquery": "^3.1.1",
-    "jsdom": "^9.12.0",
-    "jshint": "^2.5.0",
-    "lasso-resolve-from": "^1.2.0",
-    "marko-widgets": "^7.0.1",
-    "micromatch": "^3.0.4",
-    "mkdirp": "^0.5.1",
-    "mocha": "^5.0.1",
-    "nyc": "^10.3.2",
-    "open": "0.0.5",
-    "request": "^2.72.0",
-    "semver": "^5.4.1",
-    "shelljs": "^0.7.7",
-    "through": "^2.3.4",
-    "through2": "^2.0.1"
-  },
-  "license": "MIT",
-  "bin": {
-    "markoc": "bin/markoc"
-  },
-  "main": "index.js",
-  "browser": {
-    "./compiler.js": "./compiler-browser.marko",
-    "./components.js": "./components-browser.marko",
-    "./index.js": "./index-browser.marko",
-    "./legacy-components.js": "./legacy-components-browser.marko"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "nyc": {
-    "exclude": [
-      "**/benchmark/**",
-      "**/scripts/**",
-      "**/coverage/**",
-      "**/test/**",
-      "**/test-dist/**",
-      "**/test-generated/**",
-      "**/dist/**"
+    "name": "marko",
+    "version": "4.9.1",
+    "license": "MIT",
+    "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
+    "scripts": {
+        "build": "node scripts/build.js",
+        "build-src": "node scripts/build.js src",
+        "prepublish": "npm run build-src",
+        "precommit": "lint-staged",
+        "test": "npm run lint -s && npm run mocha -s",
+        "test-ci": "npm run check-format && npm run test-generate-coverage",
+        "mocha": "mocha --timeout 10000 --max-old-space-size=768 ./test/*/*.test.js",
+        "test-coverage": "npm run test-generate-coverage && nyc report --reporter=html && open ./coverage/index.html",
+        "test-generate-coverage": "nyc -asc npm test",
+        "lint": "eslint .",
+        "format": "prettier \"**/*.{js,json,css,md}\" --write",
+        "check-format": "prettier \"**/*.{js,json,css,md}\" -l",
+        "coveralls": "nyc report --reporter=text-lcov | coveralls",
+        "codecov": "nyc report --reporter=text-lcov > coverage.lcov && codecov"
+    },
+    "lint-staged": {
+        "*.js": [
+            "eslint"
+        ],
+        "*.{js,json,css,md}": [
+            "prettier --write",
+            "git add"
+        ]
+    },
+    "dependencies": {
+        "app-module-path": "^2.2.0",
+        "argly": "^1.0.0",
+        "browser-refresh-client": "^1.0.0",
+        "char-props": "~0.1.5",
+        "complain": "^1.2.0",
+        "deresolve": "^1.1.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0",
+        "estraverse": "^4.2.0",
+        "events": "^1.0.2",
+        "events-light": "^1.0.0",
+        "he": "^1.1.0",
+        "htmljs-parser": "^2.3.2",
+        "lasso-caching-fs": "^1.0.1",
+        "lasso-modules-client": "^2.0.4",
+        "lasso-package-root": "^1.0.1",
+        "listener-tracker": "^2.0.0",
+        "minimatch": "^3.0.2",
+        "object-assign": "^4.1.0",
+        "property-handlers": "^1.0.0",
+        "raptor-json": "^1.0.1",
+        "raptor-polyfill": "^1.0.0",
+        "raptor-promises": "^1.0.1",
+        "raptor-regexp": "^1.0.0",
+        "raptor-util": "^3.2.0",
+        "resolve-from": "^2.0.0",
+        "shorthash": "0.0.2",
+        "simple-sha1": "^2.1.0",
+        "strip-json-comments": "^2.0.1",
+        "try-require": "^1.2.1",
+        "warp10": "^1.0.0"
+    },
+    "devDependencies": {
+        "babel-cli": "^6.24.1",
+        "babel-core": "^6.24.1",
+        "babel-plugin-minprops": "^2.0.1",
+        "benchmark": "^2.1.1",
+        "bluebird": "^3.4.7",
+        "builtins": "^2.0.0",
+        "chai": "^3.3.0",
+        "codecov": "^2.3.0",
+        "coveralls": "^2.13.1",
+        "diffable-html": "^2.1.0",
+        "eslint": "^4.11.0",
+        "eslint-config-prettier": "^2.9.0",
+        "express": "^4.16.1",
+        "fs-extra": "^2.0.0",
+        "husky": "^0.14.3",
+        "ignoring-watcher": "^1.0.2",
+        "istanbul-lib-instrument": "^1.8.0",
+        "it-fails": "^1.0.0",
+        "jquery": "^3.1.1",
+        "jsdom": "^9.12.0",
+        "lasso-resolve-from": "^1.2.0",
+        "lint-staged": "^7.0.0",
+        "marko-widgets": "^7.0.1",
+        "micromatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "mocha": "^5.0.1",
+        "nyc": "^10.3.2",
+        "open": "0.0.5",
+        "prettier": "^1.11.1",
+        "request": "^2.72.0",
+        "semver": "^5.4.1",
+        "shelljs": "^0.7.7",
+        "through": "^2.3.4",
+        "through2": "^2.0.1"
+    },
+    "main": "index.js",
+    "browser": {
+        "./compiler.js": "./compiler-browser.marko",
+        "./components.js": "./components-browser.marko",
+        "./index.js": "./index-browser.marko",
+        "./legacy-components.js": "./legacy-components-browser.marko"
+    },
+    "bin": {
+        "markoc": "bin/markoc"
+    },
+    "nyc": {
+        "exclude": [
+            "**/benchmark/**",
+            "**/scripts/**",
+            "**/coverage/**",
+            "**/test/**",
+            "**/test-dist/**",
+            "**/test-generated/**",
+            "**/dist/**"
+        ]
+    },
+    "homepage": "http://markojs.com/",
+    "logo": {
+        "url": "https://raw.githubusercontent.com/marko-js/branding/master/marko-logo-small.png"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/marko-js/marko.git"
+    },
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org/"
+    },
+    "author": "Patrick Steele-Idem <pnidem@gmail.com>",
+    "maintainers": [
+        "Patrick Steele-Idem <pnidem@gmail.com>",
+        "Michael Rawlings <ml.rawlings@gmail.com>",
+        "Phillip Gates-Idem <phillip.idem@gmail.com>",
+        "Austin Kelleher <a@alk.im>",
+        "Dylan Piercey <pierceydylan@gmail.com>",
+        "Martin Aberer"
+    ],
+    "keywords": [
+        "front-end",
+        "templating",
+        "template",
+        "async",
+        "streaming",
+        "components",
+        "ui",
+        "vdom",
+        "dom",
+        "morphdom",
+        "virtual",
+        "virtual-dom"
     ]
-  },
-  "homepage": "http://markojs.com/",
-  "version": "4.9.1",
-  "logo": {
-    "url": "https://raw.githubusercontent.com/marko-js/branding/master/marko-logo-small.png"
-  }
 }
diff --git a/scripts/babel-plugin-marko-debug.js b/scripts/babel-plugin-marko-debug.js
index 7b3657dbb..abe886195 100644
--- a/scripts/babel-plugin-marko-debug.js
+++ b/scripts/babel-plugin-marko-debug.js
@@ -2,61 +2,73 @@
  * Babel plugin for production builds which converts "MARKO_DEBUG"
  * strings to false to be removed by babel-plugin-minify-dead-code-elimination.
  */
-module.exports = function babelPluginMarkoDebug (babel) {
-  const t = babel.types;
-  return {
-    visitor: {
-      IfStatement: (path) => {
-        const node = path.node;
-        return replaceMarkoDebug(path, node.test, node.consequent, node.alternate);
-      },
-      ConditionalExpression: (path) => {
-        const node = path.node;
-        return replaceMarkoDebug(path, node.test, node.consequent, node.alternate);
-      },
-      LogicalExpression: (path) => {
-        const node = path.node;
+module.exports = function babelPluginMarkoDebug() {
+    return {
+        visitor: {
+            IfStatement: path => {
+                const node = path.node;
+                return replaceMarkoDebug(
+                    path,
+                    node.test,
+                    node.consequent,
+                    node.alternate
+                );
+            },
+            ConditionalExpression: path => {
+                const node = path.node;
+                return replaceMarkoDebug(
+                    path,
+                    node.test,
+                    node.consequent,
+                    node.alternate
+                );
+            },
+            LogicalExpression: path => {
+                const node = path.node;
 
-        if (node.operator === '&&') {
-          return replaceMarkoDebug(path, node.left, node.right);
-        } else {
-          return replaceMarkoDebug(path, node.left, null, node.right);
+                if (node.operator === "&&") {
+                    return replaceMarkoDebug(path, node.left, node.right);
+                } else {
+                    return replaceMarkoDebug(path, node.left, null, node.right);
+                }
+            }
         }
-      }
-    }
-  }
-}
+    };
+};
 
 /**
  * Replaces any conditions containing "MARKO_DEBUG" or !"MARKO_DEBUG" and collapses them.
  */
-function replaceMarkoDebug (path, test, consequent, alternate) {
-  // Reverse replacement when negating the expression.
-  if (test.type === 'UnaryExpression' && test.operator === '!') {
-    const temp = consequent;
-    consequent = alternate;
-    alternate = temp;
-    test = test.argument;
-  }
-
-  // Only look for "MARKO_DEBUG" strings.
-  if (test.type !== 'StringLiteral') {
-    return;
-  }
-
-  // If we found a condition that is a string (and isn't "MARKO_DEBUG") it's most likely a mistake.
-  if (test.value !== 'MARKO_DEBUG') {
-    throw new Error(`Found if statement with StringLiteral "${test.value}", did you mean "MARKO_DEBUG".`);
-  }
-
-  if (alternate) {
-    if (alternate.type === 'BlockStatement') {
-      path.replaceWithMultiple(alternate.body);
-    } else {
-      path.replaceWith(alternate);
+function replaceMarkoDebug(path, test, consequent, alternate) {
+    // Reverse replacement when negating the expression.
+    if (test.type === "UnaryExpression" && test.operator === "!") {
+        const temp = consequent;
+        consequent = alternate;
+        alternate = temp;
+        test = test.argument;
     }
-  } else {
-    path.remove();
-  }
-}
 
+    // Only look for "MARKO_DEBUG" strings.
+    if (test.type !== "StringLiteral") {
+        return;
+    }
+
+    // If we found a condition that is a string (and isn't "MARKO_DEBUG") it's most likely a mistake.
+    if (test.value !== "MARKO_DEBUG") {
+        throw new Error(
+            `Found if statement with StringLiteral "${
+                test.value
+            }", did you mean "MARKO_DEBUG".`
+        );
+    }
+
+    if (alternate) {
+        if (alternate.type === "BlockStatement") {
+            path.replaceWithMultiple(alternate.body);
+        } else {
+            path.replaceWith(alternate);
+        }
+    } else {
+        path.remove();
+    }
+}
diff --git a/scripts/build.js b/scripts/build.js
index 41919951c..aaf84d4e7 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -1,59 +1,55 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const buildDir = require('./util').buildDir;
+"use strict";
+const fs = require("fs");
+const path = require("path");
+const buildDir = require("./util").buildDir;
 const babelOptions = {
-    "plugins": [
+    plugins: [
         [
-            "minprops", {
-                "matchPrefix": "___",
-                "prefix": "",
-                "suffix": "_",
-                "hello": "world",
-                "context": "marko"
+            "minprops",
+            {
+                matchPrefix: "___",
+                prefix: "",
+                suffix: "_",
+                hello: "world",
+                context: "marko"
             }
         ],
-        require.resolve('./babel-plugin-marko-debug')
+        require.resolve("./babel-plugin-marko-debug")
     ]
 };
 
-
 var target = process.argv[2];
 
 var shouldBuildSrc = true;
 var shouldBuildTest = true;
 
-if (target === 'src') {
+if (target === "src") {
     shouldBuildTest = false;
 }
 
 if (shouldBuildSrc) {
-    buildDir('src', 'dist', {
-        babelExclude: [
-            '/taglibs/async/client-reorder-runtime.min.js'
-        ],
+    buildDir("src", "dist", {
+        babelExclude: ["/taglibs/async/client-reorder-runtime.min.js"],
         babelOptions
     });
 }
 
 fs.writeFileSync(
-    path.join(__dirname, '../dist/build.json'),
+    path.join(__dirname, "../dist/build.json"),
     JSON.stringify({ isDebug: false }, null, 4),
-    { encoding: 'utf8' });
+    { encoding: "utf8" }
+);
 
 if (shouldBuildTest) {
-    buildDir('test', 'test-dist', {
-        babelExclude: [
-            '*expected*.*',
-            'input.js*'
-        ],
+    buildDir("test", "test-dist", {
+        babelExclude: ["*expected*.*", "input.js*"],
         exclude: [
-            '/generated',
-            '*.marko.js',
-            '*.skip',
-            '*.generated.*',
-            '*actual*.*',
-            'actualized-expected.html*'
+            "/generated",
+            "*.marko.js",
+            "*.skip",
+            "*.generated.*",
+            "*actual*.*",
+            "actualized-expected.html*"
         ],
         babelOptions
     });
diff --git a/scripts/util.js b/scripts/util.js
index 816669646..d596b87ca 100644
--- a/scripts/util.js
+++ b/scripts/util.js
@@ -1,30 +1,32 @@
-const shelljs = require('shelljs');
+/* eslint-disable no-console */
+
+const shelljs = require("shelljs");
 const mkdir = shelljs.mkdir;
 const rm = shelljs.rm;
 const cp = shelljs.cp;
-const path = require('path');
-const fs = require('fs');
+const path = require("path");
+const fs = require("fs");
 const babel = require("babel-core");
-const mm = require('micromatch');
+const mm = require("micromatch");
 
-const rootDir = path.join(__dirname, '..');
+const rootDir = path.join(__dirname, "..");
 
 function babelTransformFile(sourceFile, targetFile, babelOptions) {
     babelOptions = Object.assign({}, babelOptions);
     babelOptions.filename = sourceFile;
-    var source = fs.readFileSync(sourceFile, 'utf-8');
+    var source = fs.readFileSync(sourceFile, "utf-8");
     var transformed = babel.transform(source, babelOptions).code;
 
-    fs.writeFileSync(targetFile, transformed, { encoding: 'utf8' });
+    fs.writeFileSync(targetFile, transformed, { encoding: "utf8" });
 }
 
 function createMatcher(patterns) {
-    var matchers = patterns.map((pattern) => {
+    var matchers = patterns.map(pattern => {
         return mm.matcher(pattern, { matchBase: true });
     });
 
     return function isMatch(file) {
-        for (var i=0; i<matchers.length; i++) {
+        for (var i = 0; i < matchers.length; i++) {
             if (matchers[i](file)) {
                 return true;
             }
@@ -37,7 +39,7 @@ function createMatcher(patterns) {
 function findFiles(dir, callback, isExcluded) {
     function findFilesHelper(parentDir, parentRelativePath) {
         var names = fs.readdirSync(parentDir);
-        for (var i=0; i<names.length; i++) {
+        for (var i = 0; i < names.length; i++) {
             var name = names[i];
             var file = path.join(parentDir, name);
             var relativePath = path.join(parentRelativePath, name);
@@ -56,7 +58,7 @@ function findFiles(dir, callback, isExcluded) {
         }
     }
 
-    findFilesHelper(dir, '/');
+    findFilesHelper(dir, "/");
 }
 
 exports.buildDir = function buildDir(sourceName, targetName, options) {
@@ -78,24 +80,27 @@ exports.buildDir = function buildDir(sourceName, targetName, options) {
         isBabelExcluded = createMatcher(options.babelExclude);
     }
 
-    rm('-rf', distDir);
+    rm("-rf", distDir);
 
-    findFiles(sourceDir, function(sourceFile, relativePath, stat) {
-        var targetFile = path.join(distDir, relativePath);
-        var targetDir = path.dirname(targetFile);
+    findFiles(
+        sourceDir,
+        function(sourceFile, relativePath, stat) {
+            var targetFile = path.join(distDir, relativePath);
+            var targetDir = path.dirname(targetFile);
 
-        if (stat.isFile()) {
-            mkdir('-p', targetDir);
+            if (stat.isFile()) {
+                mkdir("-p", targetDir);
 
-            var ext = path.extname(relativePath);
-            if (ext !== '.js' || isBabelExcluded(relativePath)) {
-                console.log('Copying file:', relativePath);
-                cp(sourceFile, targetDir + '/');
-            } else {
-                console.log("Running babel: " + relativePath);
-                babelTransformFile(sourceFile, targetFile, babelOptions);
+                var ext = path.extname(relativePath);
+                if (ext !== ".js" || isBabelExcluded(relativePath)) {
+                    console.log("Copying file:", relativePath);
+                    cp(sourceFile, targetDir + "/");
+                } else {
+                    console.log("Running babel: " + relativePath);
+                    babelTransformFile(sourceFile, targetFile, babelOptions);
+                }
             }
-        }
-    }, isExcluded);
-
+        },
+        isExcluded
+    );
 };
diff --git a/src/.eslintrc b/src/.eslintrc
new file mode 100644
index 000000000..5c3f02e1a
--- /dev/null
+++ b/src/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "env": {
+        "browser": true
+    }
+}
\ No newline at end of file
diff --git a/src/browser-refresh.js b/src/browser-refresh.js
index 4fa5db9f4..59a1ac246 100644
--- a/src/browser-refresh.js
+++ b/src/browser-refresh.js
@@ -1,5 +1,5 @@
 var enabled = false;
-var browserRefreshClient = require('browser-refresh-client');
+var browserRefreshClient = require("browser-refresh-client");
 
 exports.enable = function(options) {
     if (!browserRefreshClient.isBrowserRefreshEnabled()) {
@@ -16,13 +16,13 @@ exports.enable = function(options) {
 
     // We set an environment variable so that _all_ marko modules
     // installed in the project will have browser refresh enabled.
-    process.env.MARKO_BROWSER_REFRESH = 'true';
+    process.env.MARKO_BROWSER_REFRESH = "true";
 
-    var hotReload = require('./hot-reload');
+    var hotReload = require("./hot-reload");
     hotReload.enable(options);
 
     browserRefreshClient
-        .enableSpecialReload('*.marko marko.json marko-tag.json')
+        .enableSpecialReload("*.marko marko.json marko-tag.json")
         .onFileModified(function(path) {
             hotReload.handleFileModified(path, options);
         });
diff --git a/src/compiler/Builder.js b/src/compiler/Builder.js
index 949ebb3fc..1278e98bb 100644
--- a/src/compiler/Builder.js
+++ b/src/compiler/Builder.js
@@ -1,85 +1,86 @@
-'use strict';
+"use strict";
 var isArray = Array.isArray;
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 
-var Node = require('./ast/Node');
-var Program = require('./ast/Program');
-var TemplateRoot = require('./ast/TemplateRoot');
-var FunctionDeclaration = require('./ast/FunctionDeclaration');
-var FunctionCall = require('./ast/FunctionCall');
-var Literal = require('./ast/Literal');
-var Identifier = require('./ast/Identifier');
-var Comment = require('./ast/Comment');
-var If = require('./ast/If');
-var ElseIf = require('./ast/ElseIf');
-var Else = require('./ast/Else');
-var Assignment = require('./ast/Assignment');
-var BinaryExpression = require('./ast/BinaryExpression');
-var LogicalExpression = require('./ast/LogicalExpression');
-var Vars = require('./ast/Vars');
-var Return = require('./ast/Return');
-var HtmlElement = require('./ast/HtmlElement');
-var Html = require('./ast/Html');
-var Text = require('./ast/Text');
-var ForEach = require('./ast/ForEach');
-var ForEachProp = require('./ast/ForEachProp');
-var ForRange = require('./ast/ForRange');
-var HtmlComment = require('./ast/HtmlComment');
-var SelfInvokingFunction = require('./ast/SelfInvokingFunction');
-var ForStatement = require('./ast/ForStatement');
-var BinaryExpression = require('./ast/BinaryExpression');
-var UpdateExpression = require('./ast/UpdateExpression');
-var UnaryExpression = require('./ast/UnaryExpression');
-var MemberExpression = require('./ast/MemberExpression');
-var Code = require('./ast/Code');
-var InvokeMacro = require('./ast/InvokeMacro');
-var Macro = require('./ast/Macro');
-var ConditionalExpression = require('./ast/ConditionalExpression');
-var NewExpression = require('./ast/NewExpression');
-var ObjectExpression = require('./ast/ObjectExpression');
-var ArrayExpression = require('./ast/ArrayExpression');
-var Property = require('./ast/Property');
-var VariableDeclarator = require('./ast/VariableDeclarator');
-var ThisExpression = require('./ast/ThisExpression');
-var Expression = require('./ast/Expression');
-var Scriptlet = require('./ast/Scriptlet');
-var ContainerNode = require('./ast/ContainerNode');
-var WhileStatement = require('./ast/WhileStatement');
-var DocumentType = require('./ast/DocumentType');
-var Declaration = require('./ast/Declaration');
-var SequenceExpression = require('./ast/SequenceExpression');
-var CustomTag = require('./ast/CustomTag');
+var Node = require("./ast/Node");
+var Program = require("./ast/Program");
+var TemplateRoot = require("./ast/TemplateRoot");
+var FunctionDeclaration = require("./ast/FunctionDeclaration");
+var FunctionCall = require("./ast/FunctionCall");
+var Literal = require("./ast/Literal");
+var Identifier = require("./ast/Identifier");
+var Comment = require("./ast/Comment");
+var If = require("./ast/If");
+var ElseIf = require("./ast/ElseIf");
+var Else = require("./ast/Else");
+var Assignment = require("./ast/Assignment");
+var BinaryExpression = require("./ast/BinaryExpression");
+var LogicalExpression = require("./ast/LogicalExpression");
+var Vars = require("./ast/Vars");
+var Return = require("./ast/Return");
+var HtmlElement = require("./ast/HtmlElement");
+var Html = require("./ast/Html");
+var Text = require("./ast/Text");
+var ForEach = require("./ast/ForEach");
+var ForEachProp = require("./ast/ForEachProp");
+var ForRange = require("./ast/ForRange");
+var HtmlComment = require("./ast/HtmlComment");
+var SelfInvokingFunction = require("./ast/SelfInvokingFunction");
+var ForStatement = require("./ast/ForStatement");
+var UpdateExpression = require("./ast/UpdateExpression");
+var UnaryExpression = require("./ast/UnaryExpression");
+var MemberExpression = require("./ast/MemberExpression");
+var Code = require("./ast/Code");
+var InvokeMacro = require("./ast/InvokeMacro");
+var Macro = require("./ast/Macro");
+var ConditionalExpression = require("./ast/ConditionalExpression");
+var NewExpression = require("./ast/NewExpression");
+var ObjectExpression = require("./ast/ObjectExpression");
+var ArrayExpression = require("./ast/ArrayExpression");
+var Property = require("./ast/Property");
+var VariableDeclarator = require("./ast/VariableDeclarator");
+var ThisExpression = require("./ast/ThisExpression");
+var Expression = require("./ast/Expression");
+var Scriptlet = require("./ast/Scriptlet");
+var ContainerNode = require("./ast/ContainerNode");
+var WhileStatement = require("./ast/WhileStatement");
+var DocumentType = require("./ast/DocumentType");
+var Declaration = require("./ast/Declaration");
+var SequenceExpression = require("./ast/SequenceExpression");
+var CustomTag = require("./ast/CustomTag");
 
-var parseExpression = require('./util/parseExpression');
-var parseStatement = require('./util/parseStatement');
-var parseJavaScriptArgs = require('./util/parseJavaScriptArgs');
-var replacePlaceholderEscapeFuncs = require('./util/replacePlaceholderEscapeFuncs');
-var isValidJavaScriptIdentifier = require('./util/isValidJavaScriptIdentifier');
+var parseExpression = require("./util/parseExpression");
+var parseStatement = require("./util/parseStatement");
+var parseJavaScriptArgs = require("./util/parseJavaScriptArgs");
+var replacePlaceholderEscapeFuncs = require("./util/replacePlaceholderEscapeFuncs");
+var isValidJavaScriptIdentifier = require("./util/isValidJavaScriptIdentifier");
 
 var DEFAULT_BUILDER;
 
 function makeNode(arg) {
-    if (typeof arg === 'string') {
+    if (typeof arg === "string") {
         return parseExpression(arg, DEFAULT_BUILDER);
     } else if (arg instanceof Node) {
         return arg;
     } else if (arg == null) {
         return undefined;
     } else if (Array.isArray(arg)) {
-        return arg.map((arg) => {
+        return arg.map(arg => {
             return makeNode(arg);
         });
     } else {
-        throw new Error('Argument should be a string or Node or null. Actual: ' + arg);
+        throw new Error(
+            "Argument should be a string or Node or null. Actual: " + arg
+        );
     }
 }
 
-var literalNull = new Literal({value: null});
-var literalUndefined = new Literal({value: undefined});
-var literalTrue = new Literal({value: true});
-var literalFalse = new Literal({value: false});
-var identifierOut = new Identifier({name: 'out'});
-var identifierRequire = new Identifier({name: 'require'});
+var literalNull = new Literal({ value: null });
+var literalUndefined = new Literal({ value: undefined });
+var literalTrue = new Literal({ value: true });
+var literalFalse = new Literal({ value: false });
+var identifierOut = new Identifier({ name: "out" });
+var identifierRequire = new Identifier({ name: "require" });
 
 class Builder {
     arrayExpression(elements) {
@@ -88,38 +89,38 @@ class Builder {
                 elements = [elements];
             }
 
-            for (var i=0; i<elements.length; i++) {
+            for (var i = 0; i < elements.length; i++) {
                 elements[i] = makeNode(elements[i]);
             }
         } else {
             elements = [];
         }
 
-        return new ArrayExpression({elements});
+        return new ArrayExpression({ elements });
     }
 
     assignment(left, right, operator) {
         if (operator == null) {
-            operator = '=';
+            operator = "=";
         }
         left = makeNode(left);
         right = makeNode(right);
-        return new Assignment({left, right, operator});
+        return new Assignment({ left, right, operator });
     }
 
     binaryExpression(left, operator, right) {
         left = makeNode(left);
         right = makeNode(right);
-        return new BinaryExpression({left, operator, right});
+        return new BinaryExpression({ left, operator, right });
     }
 
     sequenceExpression(expressions) {
         expressions = makeNode(expressions);
-        return new SequenceExpression({expressions});
+        return new SequenceExpression({ expressions });
     }
 
     code(value) {
-        return new Code({value});
+        return new Code({ value });
     }
 
     computedMemberExpression(object, property) {
@@ -127,7 +128,7 @@ class Builder {
         property = makeNode(property);
         let computed = true;
 
-        return new MemberExpression({object, property, computed});
+        return new MemberExpression({ object, property, computed });
     }
 
     /**
@@ -138,32 +139,34 @@ class Builder {
      */
     concat(args) {
         var prev;
-        let operator = '+';
-        args = Array.isArray(args) ? args : Array.prototype.slice.call(arguments, 0);
+        let operator = "+";
+        args = Array.isArray(args)
+            ? args
+            : Array.prototype.slice.call(arguments, 0);
 
-        for (var i=1; i<args.length; i++) {
+        for (var i = 1; i < args.length; i++) {
             var left;
             var right = makeNode(args[i]);
             if (i === 1) {
-                left = makeNode(args[i-1]);
+                left = makeNode(args[i - 1]);
             } else {
                 left = prev;
             }
 
-            prev = new BinaryExpression({left, operator, right});
+            prev = new BinaryExpression({ left, operator, right });
         }
 
         return prev;
     }
 
     conditionalExpression(test, consequent, alternate) {
-        return new ConditionalExpression({test, consequent, alternate});
+        return new ConditionalExpression({ test, consequent, alternate });
     }
 
     containerNode(type, codeGenerator) {
-        if (typeof type === 'function') {
+        if (typeof type === "function") {
             codeGenerator = arguments[0];
-            type = 'ContainerNode';
+            type = "ContainerNode";
         }
 
         var node = new ContainerNode(type);
@@ -178,25 +181,25 @@ class Builder {
     }
 
     declaration(declaration) {
-        return new Declaration({declaration});
+        return new Declaration({ declaration });
     }
 
     documentType(documentType) {
-        return new DocumentType({documentType});
+        return new DocumentType({ documentType });
     }
 
     elseStatement(body) {
-        return new Else({body});
+        return new Else({ body });
     }
 
     elseIfStatement(test, body, elseStatement) {
         test = makeNode(test);
 
-        return new ElseIf({test, body, else: elseStatement});
+        return new ElseIf({ test, body, else: elseStatement });
     }
 
     expression(value) {
-        return new Expression({value});
+        return new Expression({ value });
     }
 
     forEach(varName, inExpression, body) {
@@ -206,7 +209,7 @@ class Builder {
         } else {
             varName = makeNode(varName);
             inExpression = makeNode(inExpression);
-            return new ForEach({varName, in: inExpression, body});
+            return new ForEach({ varName, in: inExpression, body });
         }
     }
 
@@ -218,7 +221,12 @@ class Builder {
             nameVarName = makeNode(nameVarName);
             valueVarName = makeNode(valueVarName);
             inExpression = makeNode(inExpression);
-            return new ForEachProp({nameVarName, valueVarName, in: inExpression, body});
+            return new ForEachProp({
+                nameVarName,
+                valueVarName,
+                in: inExpression,
+                body
+            });
         }
     }
 
@@ -233,7 +241,7 @@ class Builder {
             step = makeNode(step);
             body = makeNode(body);
 
-            return new ForRange({varName, from, to, step, body});
+            return new ForRange({ varName, from, to, step, body });
         }
     }
 
@@ -245,7 +253,7 @@ class Builder {
             init = makeNode(init);
             test = makeNode(test);
             update = makeNode(update);
-            return new ForStatement({init, test, update, body});
+            return new ForStatement({ init, test, update, body });
         }
     }
 
@@ -257,79 +265,86 @@ class Builder {
                 throw new Error('"args" should be an array');
             }
 
-            for (var i=0; i<args.length; i++) {
+            for (var i = 0; i < args.length; i++) {
                 args[i] = makeNode(args[i]);
             }
         } else {
             args = [];
         }
 
-        return new FunctionCall({callee, args});
+        return new FunctionCall({ callee, args });
     }
 
     functionDeclaration(name, params, body) {
-        return new FunctionDeclaration({name, params, body});
+        return new FunctionDeclaration({ name, params, body });
     }
 
     html(argument) {
         argument = makeNode(argument);
 
-        return new Html({argument});
+        return new Html({ argument });
     }
 
     htmlComment(comment) {
-        return new HtmlComment({comment});
+        return new HtmlComment({ comment });
     }
 
     comment(comment) {
-        return new Comment({comment});
+        return new Comment({ comment });
     }
 
     htmlElement(tagName, attributes, body, argument, openTagOnly, selfClosed) {
-        if (typeof tagName === 'object' && !(tagName instanceof Node)) {
+        if (typeof tagName === "object" && !(tagName instanceof Node)) {
             let def = arguments[0];
             return new HtmlElement(def);
         } else {
-            return new HtmlElement({tagName, attributes, body, argument, openTagOnly, selfClosed});
+            return new HtmlElement({
+                tagName,
+                attributes,
+                body,
+                argument,
+                openTagOnly,
+                selfClosed
+            });
         }
     }
 
     htmlLiteral(htmlCode) {
-        var argument = new Literal({value: htmlCode});
-        return new Html({argument});
+        var argument = new Literal({ value: htmlCode });
+        return new Html({ argument });
     }
 
     identifier(name) {
-        ok(typeof name === 'string', '"name" should be a string');
+        ok(typeof name === "string", '"name" should be a string');
 
         if (!isValidJavaScriptIdentifier(name)) {
-            var error = new Error('Invalid JavaScript identifier: ' + name);
-            error.code = 'INVALID_IDENTIFIER';
+            var error = new Error("Invalid JavaScript identifier: " + name);
+            error.code = "INVALID_IDENTIFIER";
             throw error;
         }
-        return new Identifier({name});
+        return new Identifier({ name });
     }
 
-    identifierOut(name) {
+    identifierOut() {
         return identifierOut;
     }
 
     ifStatement(test, body, elseStatement) {
         test = makeNode(test);
 
-        return new If({test, body, else: elseStatement});
+        return new If({ test, body, else: elseStatement });
     }
 
     invokeMacro(name, args, body) {
-        return new InvokeMacro({name, args, body});
+        return new InvokeMacro({ name, args, body });
     }
 
     invokeMacroFromEl(el) {
-        return new InvokeMacro({el});
+        return new InvokeMacro({ el });
     }
 
     literal(value) {
-        return new Literal({value});
+        return new Literal({ value });
     }
 
     literalFalse() {
@@ -351,28 +366,32 @@ class Builder {
     logicalExpression(left, operator, right) {
         left = makeNode(left);
         right = makeNode(right);
-        return new LogicalExpression({left, operator, right});
+        return new LogicalExpression({ left, operator, right });
     }
 
     macro(name, params, body) {
-        return new Macro({name, params, body});
+        return new Macro({ name, params, body });
     }
 
     memberExpression(object, property, computed) {
         object = makeNode(object);
         property = makeNode(property);
 
-        return new MemberExpression({object, property, computed});
+        return new MemberExpression({ object, property, computed });
     }
 
     moduleExports(value) {
-        let object = new Identifier({name: 'module'});
-        let property = new Identifier({name: 'exports'});
+        let object = new Identifier({ name: "module" });
+        let property = new Identifier({ name: "exports" });
 
-        var moduleExports = new MemberExpression({object, property });
+        var moduleExports = new MemberExpression({ object, property });
 
         if (value) {
-            return new Assignment({left: moduleExports, right: value, operator: '='});
+            return new Assignment({
+                left: moduleExports,
+                right: value,
+                operator: "="
+            });
         } else {
             return moduleExports;
         }
@@ -381,9 +400,9 @@ class Builder {
     negate(argument) {
         argument = makeNode(argument);
 
-        var operator = '!';
+        var operator = "!";
         var prefix = true;
-        return new UnaryExpression({argument, operator, prefix});
+        return new UnaryExpression({ argument, operator, prefix });
     }
 
     newExpression(callee, args) {
@@ -394,20 +413,20 @@ class Builder {
                 args = [args];
             }
 
-            for (var i=0; i<args.length; i++) {
+            for (var i = 0; i < args.length; i++) {
                 args[i] = makeNode(args[i]);
             }
         } else {
             args = [];
         }
 
-        return new NewExpression({callee, args});
+        return new NewExpression({ callee, args });
     }
 
     node(type, generateCode) {
-        if (typeof type === 'function') {
+        if (typeof type === "function") {
             generateCode = arguments[0];
-            type = 'Node';
+            type = "Node";
         }
 
         var node = new Node(type);
@@ -420,21 +439,21 @@ class Builder {
     objectExpression(properties) {
         if (properties) {
             if (isArray(properties)) {
-                for (var i=0; i<properties.length; i++) {
+                for (var i = 0; i < properties.length; i++) {
                     let prop = properties[i];
                     prop.value = makeNode(prop.value);
                 }
             } else {
                 let propertiesObject = properties;
-                properties = Object.keys(propertiesObject).map((key) => {
+                properties = Object.keys(propertiesObject).map(key => {
                     let value = propertiesObject[key];
                     if (!(value instanceof Node)) {
-                        value = value = new Literal({value});
+                        value = value = new Literal({ value });
                     }
 
-                    key = new Literal({value: key});
+                    key = new Literal({ value: key });
 
-                    let property = new Property({key, value});
+                    let property = new Property({ key, value });
                     return property;
                 });
             }
@@ -442,22 +461,22 @@ class Builder {
             properties = [];
         }
 
-        return new ObjectExpression({properties});
+        return new ObjectExpression({ properties });
     }
 
-    parseExpression(str, options) {
-        ok(typeof str === 'string', '"str" should be a string expression');
+    parseExpression(str) {
+        ok(typeof str === "string", '"str" should be a string expression');
         var parsed = parseExpression(str, DEFAULT_BUILDER);
         return parsed;
     }
 
     parseJavaScriptArgs(args) {
-        ok(typeof args === 'string', '"args" should be a string');
+        ok(typeof args === "string", '"args" should be a string');
         return parseJavaScriptArgs(args, DEFAULT_BUILDER);
     }
 
-    parseStatement(str, options) {
-        ok(typeof str === 'string', '"str" should be a string expression');
+    parseStatement(str) {
+        ok(typeof str === "string", '"str" should be a string expression');
         var parsed = parseStatement(str, DEFAULT_BUILDER);
         return parsed;
     }
@@ -467,7 +486,7 @@ class Builder {
     }
 
     program(body) {
-        return new Program({body});
+        return new Program({ body });
     }
 
     property(key, value, computed) {
@@ -475,41 +494,41 @@ class Builder {
         value = makeNode(value);
         computed = computed === true;
 
-        return new Property({key, value, computed});
+        return new Property({ key, value, computed });
     }
 
     renderBodyFunction(body, params) {
-        let name = 'renderBody';
+        let name = "renderBody";
         if (!params) {
-            params = [new Identifier({name: 'out'})];
+            params = [new Identifier({ name: "out" })];
         }
-        return new FunctionDeclaration({name, params, body});
+        return new FunctionDeclaration({ name, params, body });
     }
 
     require(path) {
         path = makeNode(path);
 
         let callee = identifierRequire;
-        let args = [ path ];
-        return new FunctionCall({callee, args});
+        let args = [path];
+        return new FunctionCall({ callee, args });
     }
 
     requireResolve(path) {
         path = makeNode(path);
 
         let callee = new MemberExpression({
-            object: new Identifier({name: 'require'}),
-            property: new Identifier({name: 'resolve'})
+            object: new Identifier({ name: "require" }),
+            property: new Identifier({ name: "resolve" })
         });
 
-        let args = [ path ];
-        return new FunctionCall({callee, args});
+        let args = [path];
+        return new FunctionCall({ callee, args });
     }
 
     returnStatement(argument) {
         argument = makeNode(argument);
 
-        return new Return({argument});
+        return new Return({ argument });
     }
 
     scriptlet(scriptlet) {
@@ -527,29 +546,29 @@ class Builder {
             args = null;
         }
 
-        return new SelfInvokingFunction({params, args, body});
+        return new SelfInvokingFunction({ params, args, body });
     }
 
     strictEquality(left, right) {
         left = makeNode(left);
         right = makeNode(right);
 
-        var operator = '===';
-        return new BinaryExpression({left, right, operator});
+        var operator = "===";
+        return new BinaryExpression({ left, right, operator });
     }
 
     templateRoot(body) {
-        return new TemplateRoot({body});
+        return new TemplateRoot({ body });
     }
 
     text(argument, escape, preserveWhitespace) {
-        if (typeof argument === 'object' && !(argument instanceof Node)) {
+        if (typeof argument === "object" && !(argument instanceof Node)) {
             var def = arguments[0];
             return new Text(def);
         }
         argument = makeNode(argument);
 
-        return new Text({argument, escape, preserveWhitespace});
+        return new Text({ argument, escape, preserveWhitespace });
     }
 
     thisExpression() {
@@ -559,94 +578,93 @@ class Builder {
     unaryExpression(argument, operator, prefix) {
         argument = makeNode(argument);
 
-        return new UnaryExpression({argument, operator, prefix});
+        return new UnaryExpression({ argument, operator, prefix });
     }
 
     updateExpression(argument, operator, prefix) {
         argument = makeNode(argument);
-        return new UpdateExpression({argument, operator, prefix});
+        return new UpdateExpression({ argument, operator, prefix });
     }
 
     variableDeclarator(id, init) {
-        if (typeof id === 'string') {
-            id = new Identifier({name: id});
+        if (typeof id === "string") {
+            id = new Identifier({ name: id });
         }
         if (init) {
             init = makeNode(init);
         }
 
-        return new VariableDeclarator({id, init});
+        return new VariableDeclarator({ id, init });
     }
 
     var(id, init, kind) {
         if (!kind) {
-            kind = 'var';
+            kind = "var";
         }
 
         id = makeNode(id);
         init = makeNode(init);
 
-        var declarations = [
-            new VariableDeclarator({id, init})
-        ];
+        var declarations = [new VariableDeclarator({ id, init })];
 
-        return new Vars({declarations, kind});
+        return new Vars({ declarations, kind });
     }
 
     vars(declarations, kind) {
         if (declarations) {
             if (Array.isArray(declarations)) {
-                for (let i=0; i<declarations.length; i++) {
+                for (let i = 0; i < declarations.length; i++) {
                     var declaration = declarations[i];
                     if (!declaration) {
-                        throw new Error('Invalid variable declaration');
+                        throw new Error("Invalid variable declaration");
                     }
-                    if (typeof declaration === 'string') {
+                    if (typeof declaration === "string") {
                         declarations[i] = new VariableDeclarator({
-                            id: new Identifier({name: declaration})
+                            id: new Identifier({ name: declaration })
                         });
                     } else if (declaration instanceof Identifier) {
                         declarations[i] = new VariableDeclarator({
                             id: declaration
                         });
-                    } else if (typeof declaration === 'object') {
+                    } else if (typeof declaration === "object") {
                         if (!(declaration instanceof VariableDeclarator)) {
                             let id = declaration.id;
                             let init = declaration.init;
 
-                            if (typeof id === 'string') {
-                                id = new Identifier({name: id});
+                            if (typeof id === "string") {
+                                id = new Identifier({ name: id });
                             }
 
                             if (!id) {
-                                throw new Error('Invalid variable declaration');
+                                throw new Error("Invalid variable declaration");
                             }
 
                             if (init) {
                                 init = makeNode(init);
                             }
 
-
-                            declarations[i] = new VariableDeclarator({id, init});
+                            declarations[i] = new VariableDeclarator({
+                                id,
+                                init
+                            });
                         }
                     }
                 }
-            } else if (typeof declarations === 'object') {
+            } else if (typeof declarations === "object") {
                 // Convert the object into an array of variables
-                declarations = Object.keys(declarations).map((key) => {
-                    let id = new Identifier({name: key});
+                declarations = Object.keys(declarations).map(key => {
+                    let id = new Identifier({ name: key });
                     let init = makeNode(declarations[key]);
                     return new VariableDeclarator({ id, init });
                 });
             }
         }
 
-
-        return new Vars({declarations, kind});
+        return new Vars({ declarations, kind });
     }
 
     whileStatement(test, body) {
-        return new WhileStatement({test, body});
+        return new WhileStatement({ test, body });
     }
 }
 
diff --git a/src/compiler/CodeGenerator.js b/src/compiler/CodeGenerator.js
index 2f2c5cd59..83d03b03f 100644
--- a/src/compiler/CodeGenerator.js
+++ b/src/compiler/CodeGenerator.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
 const isArray = Array.isArray;
-const Node = require('./ast/Node');
-const Literal = require('./ast/Literal');
-const Identifier = require('./ast/Identifier');
-const HtmlElement = require('./ast/HtmlElement');
-const Html = require('./ast/Html');
-const ok = require('assert').ok;
-const Container = require('./ast/Container');
-const createError = require('raptor-util/createError');
+const Node = require("./ast/Node");
+const Literal = require("./ast/Literal");
+const Identifier = require("./ast/Identifier");
+const HtmlElement = require("./ast/HtmlElement");
+const Html = require("./ast/Html");
+const ok = require("assert").ok;
+const Container = require("./ast/Container");
+const createError = require("raptor-util/createError");
 
 class GeneratorEvent {
     constructor(node, codegen) {
@@ -59,26 +59,23 @@ class FinalNodes {
 }
 
 class CodeGenerator {
-    constructor(context, options) {
-        options = options || {};
+    constructor(context) {
         this.root = null;
 
-        this._code = '';
-        this.currentIndent = '';
+        this._code = "";
+        this.currentIndent = "";
         this.inFunction = false;
 
         this._doneListeners = [];
 
-
         this.builder = context.builder;
 
         this.context = context;
 
         ok(this.builder, '"this.builder" is required');
 
-        this._codegenCodeMethodName = 'generate' +
-            context.outputType.toUpperCase() +
-            'Code';
+        this._codegenCodeMethodName =
+            "generate" + context.outputType.toUpperCase() + "Code";
     }
 
     addVar(name, value) {
@@ -120,20 +117,20 @@ class CodeGenerator {
             } else {
                 return func.call(node, node, this);
             }
-        } catch(err) {
-            var errorMessage = 'Generating code for ';
+        } catch (err) {
+            var errorMessage = "Generating code for ";
 
             if (node instanceof HtmlElement) {
-                errorMessage += '<'+node.tagName+'> tag';
+                errorMessage += "<" + node.tagName + "> tag";
             } else {
-                errorMessage += node.type + ' node';
+                errorMessage += node.type + " node";
             }
 
             if (node.pos) {
-                errorMessage += ' ('+this.context.getPosInfo(node.pos)+')';
+                errorMessage += " (" + this.context.getPosInfo(node.pos) + ")";
             }
 
-            errorMessage += ' failed. Error: ' + err;
+            errorMessage += " failed. Error: " + err;
 
             throw createError(errorMessage, err /* cause */);
         }
@@ -141,12 +138,12 @@ class CodeGenerator {
 
     _generateCode(node, finalNodes) {
         if (isArray(node)) {
-            node.forEach((child) => {
+            node.forEach(child => {
                 this._generateCode(child, finalNodes);
             });
             return;
         } else if (node instanceof Container) {
-            node.forEach((child) => {
+            node.forEach(child => {
                 if (child.container === node) {
                     this._generateCode(child, finalNodes);
                 }
@@ -158,7 +155,11 @@ class CodeGenerator {
             return;
         }
 
-        if (typeof node === 'string' || node._finalNode || !(node instanceof Node)) {
+        if (
+            typeof node === "string" ||
+            node._finalNode ||
+            !(node instanceof Node)
+        ) {
             finalNodes.push(node);
             return;
         }
@@ -179,9 +180,12 @@ class CodeGenerator {
         }
 
         beforeAfterEvent.isBefore = true;
-        beforeAfterEvent.node.emit('beforeGenerateCode', beforeAfterEvent);
-        this.context.emit('beforeGenerateCode:' + beforeAfterEvent.node.type, beforeAfterEvent);
-        this.context.emit('beforeGenerateCode', beforeAfterEvent);
+        beforeAfterEvent.node.emit("beforeGenerateCode", beforeAfterEvent);
+        this.context.emit(
+            "beforeGenerateCode:" + beforeAfterEvent.node.type,
+            beforeAfterEvent
+        );
+        this.context.emit("beforeGenerateCode", beforeAfterEvent);
 
         if (beforeAfterEvent.insertedNodes) {
             this._generateCode(beforeAfterEvent.insertedNodes, finalNodes);
@@ -197,11 +201,18 @@ class CodeGenerator {
             if (codeGeneratorFunc) {
                 node.setCodeGenerator(null);
 
-                generatedCode = this._invokeCodeGenerator(codeGeneratorFunc, node, false);
+                generatedCode = this._invokeCodeGenerator(
+                    codeGeneratorFunc,
+                    node,
+                    false
+                );
 
                 if (generatedCode === null) {
                     node = null;
-                } else if (generatedCode !== undefined && generatedCode !== node) {
+                } else if (
+                    generatedCode !== undefined &&
+                    generatedCode !== node
+                ) {
                     node = null;
                     this._generateCode(generatedCode, finalNodes);
                 }
@@ -216,7 +227,11 @@ class CodeGenerator {
             }
 
             if (codeGeneratorFunc) {
-                generatedCode = this._invokeCodeGenerator(codeGeneratorFunc, node, true);
+                generatedCode = this._invokeCodeGenerator(
+                    codeGeneratorFunc,
+                    node,
+                    true
+                );
 
                 if (generatedCode === undefined || generatedCode === node) {
                     finalNodes.push(node);
@@ -231,9 +246,12 @@ class CodeGenerator {
         }
 
         beforeAfterEvent.isBefore = false;
-        beforeAfterEvent.node.emit('afterGenerateCode', beforeAfterEvent);
-        this.context.emit('afterGenerateCode:' + beforeAfterEvent.node.type, beforeAfterEvent);
-        this.context.emit('afterGenerateCode', beforeAfterEvent);
+        beforeAfterEvent.node.emit("afterGenerateCode", beforeAfterEvent);
+        this.context.emit(
+            "afterGenerateCode:" + beforeAfterEvent.node.type,
+            beforeAfterEvent
+        );
+        this.context.emit("afterGenerateCode", beforeAfterEvent);
 
         if (beforeAfterEvent.insertedNodes) {
             this._generateCode(beforeAfterEvent.insertedNodes, finalNodes);
@@ -258,7 +276,7 @@ class CodeGenerator {
 
         let finalNodes = new FinalNodes();
 
-        var isList = typeof node.forEach === 'function';
+        var isList = typeof node.forEach === "function";
 
         this._generateCode(node, finalNodes);
 
@@ -292,12 +310,12 @@ class CodeGenerator {
 
         let node = this._currentNode;
 
-        if (typeof message === 'object') {
+        if (typeof message === "object") {
             let errorInfo = message;
             errorInfo.node = node;
             this.context.addError(errorInfo);
         } else {
-            this.context.addError({node, message, code});
+            this.context.addError({ node, message, code });
         }
     }
 
@@ -314,4 +332,4 @@ class CodeGenerator {
     }
 }
 
-module.exports = CodeGenerator;
\ No newline at end of file
+module.exports = CodeGenerator;
diff --git a/src/compiler/CodeWriter.js b/src/compiler/CodeWriter.js
index 41aa2689a..ec4d1fb12 100644
--- a/src/compiler/CodeWriter.js
+++ b/src/compiler/CodeWriter.js
@@ -1,13 +1,13 @@
-'use strict';
+"use strict";
 
 const isArray = Array.isArray;
-const Node = require('./ast/Node');
-const Literal = require('./ast/Literal');
-const Identifier = require('./ast/Identifier');
-const ok = require('assert').ok;
-const Container = require('./ast/Container');
-const Comment = require('./ast/Comment');
-const isValidJavaScriptVarName = require('./util/isValidJavaScriptVarName');
+const Node = require("./ast/Node");
+const Literal = require("./ast/Literal");
+const Identifier = require("./ast/Identifier");
+const ok = require("assert").ok;
+const Container = require("./ast/Container");
+const Comment = require("./ast/Comment");
+const isValidJavaScriptVarName = require("./util/isValidJavaScriptVarName");
 
 class CodeWriter {
     constructor(options, builder) {
@@ -15,11 +15,11 @@ class CodeWriter {
         options = options || {};
         this.builder = builder;
         this.root = null;
-        this._indentStr = options.indent != null ? options.indent : '  ';
+        this._indentStr = options.indent != null ? options.indent : "  ";
         this._indentSize = this._indentStr.length;
 
-        this._code = '';
-        this.currentIndent = '';
+        this._code = "";
+        this.currentIndent = "";
     }
 
     getCode() {
@@ -28,29 +28,30 @@ class CodeWriter {
 
     writeBlock(body) {
         if (!body) {
-            this.write('{}');
+            this.write("{}");
             return;
         }
 
-        if (typeof body === 'function') {
+        if (typeof body === "function") {
             body = body();
         }
 
-        if (!body ||
+        if (
+            !body ||
             (Array.isArray(body) && body.length === 0) ||
-            (body instanceof Container && body.length === 0)) {
-            this.write('{}');
+            (body instanceof Container && body.length === 0)
+        ) {
+            this.write("{}");
             return;
         }
 
-        this.write('{\n')
-            .incIndent();
+        this.write("{\n").incIndent();
 
         this.writeStatements(body);
 
         this.decIndent()
             .writeLineIndent()
-            .write('}');
+            .write("}");
     }
 
     writeStatements(nodes) {
@@ -61,34 +62,37 @@ class CodeWriter {
         ok(nodes, '"nodes" expected');
         let firstStatement = true;
 
-        var writeNode = (node) => {
-            if (Array.isArray(node) || (node instanceof Container)) {
+        var writeNode = node => {
+            if (Array.isArray(node) || node instanceof Container) {
                 node.forEach(writeNode);
                 return;
             } else {
                 if (firstStatement) {
                     firstStatement = false;
                 } else {
-                    this._write('\n');
+                    this._write("\n");
                 }
 
                 this.writeLineIndent();
 
-                if (typeof node === 'string') {
+                if (typeof node === "string") {
                     this._write(node);
                 } else {
                     node.statement = true;
                     this.write(node);
                 }
 
-                if (this._code.endsWith('\n')) {
+                if (this._code.endsWith("\n")) {
                     // Do nothing
-                } else if (this._code.endsWith(';')) {
-                    this._code += '\n';
-                }  else if (this._code.endsWith('\n' + this.currentIndent) || node instanceof Comment) {
+                } else if (this._code.endsWith(";")) {
+                    this._code += "\n";
+                } else if (
+                    this._code.endsWith("\n" + this.currentIndent) ||
+                    node instanceof Comment
+                ) {
                     // Do nothing
                 } else {
-                    this._code += ';\n';
+                    this._code += ";\n";
                 }
             }
         };
@@ -101,25 +105,28 @@ class CodeWriter {
     }
 
     write(code) {
-        if (code == null || code === '') {
+        if (code == null || code === "") {
             return;
         }
 
         if (code instanceof Node) {
             let node = code;
             if (!node.writeCode) {
-                throw new Error('Node does not have a `writeCode` method: ' + JSON.stringify(node, null, 4));
+                throw new Error(
+                    "Node does not have a `writeCode` method: " +
+                        JSON.stringify(node, null, 4)
+                );
             }
             node.writeCode(this);
         } else if (isArray(code) || code instanceof Container) {
             code.forEach(this.write, this);
             return;
-        } else if (typeof code === 'string') {
+        } else if (typeof code === "string") {
             this._code += code;
-        }  else if (typeof code === 'boolean' || typeof code === 'number') {
+        } else if (typeof code === "boolean" || typeof code === "number") {
             this._code += code.toString();
         } else {
-            throw new Error('Illegal argument: ' + JSON.stringify(code));
+            throw new Error("Illegal argument: " + JSON.stringify(code));
         }
 
         return this;
@@ -132,8 +139,8 @@ class CodeWriter {
 
     incIndent(count) {
         if (count != null) {
-            for (let i=0; i<count; i++) {
-                this.currentIndent += ' ';
+            for (let i = 0; i < count; i++) {
+                this.currentIndent += " ";
             }
         } else {
             this.currentIndent += this._indentStr;
@@ -149,7 +156,8 @@ class CodeWriter {
 
         this.currentIndent = this.currentIndent.substring(
             0,
-            this.currentIndent.length - count);
+            this.currentIndent.length - count
+        );
 
         return this;
     }
@@ -174,25 +182,25 @@ class CodeWriter {
 
     writeLiteral(value) {
         if (value === null) {
-            this.write('null');
+            this.write("null");
         } else if (value === undefined) {
-            this.write('undefined');
-        } else if (typeof value === 'string') {
+            this.write("undefined");
+        } else if (typeof value === "string") {
             this.write(JSON.stringify(value));
         } else if (value === true) {
-            this.write('true');
+            this.write("true");
         } else if (value === false) {
-            this.write('false');
-        }  else if (isArray(value)) {
+            this.write("false");
+        } else if (isArray(value)) {
             if (value.length === 0) {
-                this.write('[]');
+                this.write("[]");
                 return;
             }
 
-            this.write('[\n');
+            this.write("[\n");
             this.incIndent();
 
-            for (let i=0; i<value.length; i++) {
+            for (let i = 0; i < value.length; i++) {
                 let v = value[i];
 
                 this.writeLineIndent();
@@ -204,40 +212,40 @@ class CodeWriter {
                 }
 
                 if (i < value.length - 1) {
-                    this.write(',\n');
+                    this.write(",\n");
                 } else {
-                    this.write('\n');
+                    this.write("\n");
                 }
             }
 
             this.decIndent();
             this.writeLineIndent();
-            this.write(']');
-        } else if (typeof value === 'number') {
+            this.write("]");
+        } else if (typeof value === "number") {
             this.write(value.toString());
         } else if (value instanceof RegExp) {
             this.write(value.toString());
-        } else if (typeof value === 'object') {
+        } else if (typeof value === "object") {
             let keys = Object.keys(value);
             if (keys.length === 0) {
-                this.write('{}');
+                this.write("{}");
                 return;
             }
 
             this.incIndent();
-            this.write('{\n');
+            this.write("{\n");
             this.incIndent();
 
-            for (let i=0; i<keys.length; i++) {
+            for (let i = 0; i < keys.length; i++) {
                 let k = keys[i];
                 let v = value[k];
 
                 this.writeLineIndent();
 
                 if (isValidJavaScriptVarName(k)) {
-                    this.write(k + ': ');
+                    this.write(k + ": ");
                 } else {
-                    this.write(JSON.stringify(k) + ': ');
+                    this.write(JSON.stringify(k) + ": ");
                 }
 
                 if (v instanceof Node) {
@@ -247,15 +255,15 @@ class CodeWriter {
                 }
 
                 if (i < keys.length - 1) {
-                    this.write(',\n');
+                    this.write(",\n");
                 } else {
-                    this.write('\n');
+                    this.write("\n");
                 }
             }
 
             this.decIndent();
             this.writeLineIndent();
-            this.write('}');
+            this.write("}");
             this.decIndent();
         }
     }
diff --git a/src/compiler/CompileContext.js b/src/compiler/CompileContext.js
index 87e24386b..9cb081dd6 100644
--- a/src/compiler/CompileContext.js
+++ b/src/compiler/CompileContext.js
@@ -1,27 +1,26 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
-var path = require('path');
-var complain = require('complain');
-var taglibLookup = require('./taglib-lookup');
-var charProps = require('char-props');
+var ok = require("assert").ok;
+var path = require("path");
+var complain = require("complain");
+var taglibLookup = require("./taglib-lookup");
+var charProps = require("char-props");
 
-var UniqueVars = require('./util/UniqueVars');
-var PosInfo = require('./util/PosInfo');
-var CompileError = require('./CompileError');
-var path = require('path');
-var Node = require('./ast/Node');
-var macros = require('./util/macros');
-var extend = require('raptor-util/extend');
-var Walker = require('./Walker');
-var EventEmitter = require('events').EventEmitter;
-var utilFingerprint = require('./util/finger-print');
-var htmlElements = require('./util/html-elements');
-var markoModules = require('./modules');
+var UniqueVars = require("./util/UniqueVars");
+var PosInfo = require("./util/PosInfo");
+var CompileError = require("./CompileError");
+var Node = require("./ast/Node");
+var macros = require("./util/macros");
+var extend = require("raptor-util/extend");
+var Walker = require("./Walker");
+var EventEmitter = require("events").EventEmitter;
+var utilFingerprint = require("./util/finger-print");
+var htmlElements = require("./util/html-elements");
+var markoModules = require("./modules");
 
-const markoPkgVersion = require('../../package.json').version;
-const rootDir = path.join(__dirname, '../');
-const isDebug = require('../build.json').isDebug;
+const markoPkgVersion = require("../../package.json").version;
+const rootDir = path.join(__dirname, "../");
+const isDebug = require("../build.json").isDebug;
 
 // const FLAG_IS_SVG = 1;
 // const FLAG_IS_TEXTAREA = 2;
@@ -29,10 +28,10 @@ const isDebug = require('../build.json').isDebug;
 // const FLAG_PRESERVE = 8;
 const FLAG_CUSTOM_ELEMENT = 16;
 
-const FLAG_PRESERVE_WHITESPACE = 'PRESERVE_WHITESPACE';
+const FLAG_PRESERVE_WHITESPACE = "PRESERVE_WHITESPACE";
 
 function getTaglibPath(taglibPath) {
-    if (typeof window === 'undefined') {
+    if (typeof window === "undefined") {
         return path.relative(process.cwd(), taglibPath);
     } else {
         return taglibPath;
@@ -50,76 +49,80 @@ function removeExt(filename) {
 
 function requireResolve(builder, path) {
     var requireResolveNode = builder.memberExpression(
-        builder.identifier('require'),
-        builder.identifier('resolve'));
+        builder.identifier("require"),
+        builder.identifier("resolve")
+    );
 
-
-    return builder.functionCall(requireResolveNode, [ path ]);
+    return builder.functionCall(requireResolveNode, [path]);
 }
 
 const helpers = {
-    'attr': 'a',
-    'attrs': 'as',
-    'classAttr': 'ca',
-    'classList': 'cl',
-    'const': 'const',
-    'createElement': 'e',
-    'createInlineTemplate': {
-        vdom: { module: 'marko/runtime/vdom/helper-createInlineTemplate'},
-        html: { module: 'marko/runtime/html/helper-createInlineTemplate'}
+    attr: "a",
+    attrs: "as",
+    classAttr: "ca",
+    classList: "cl",
+    const: "const",
+    createElement: "e",
+    createInlineTemplate: {
+        vdom: { module: "marko/runtime/vdom/helper-createInlineTemplate" },
+        html: { module: "marko/runtime/html/helper-createInlineTemplate" }
     },
-    'defineComponent': {
-        module: 'marko/components/helpers',
-        method: 'c'
+    defineComponent: {
+        module: "marko/components/helpers",
+        method: "c"
     },
-    'defineComponent-legacy': {
-        module: 'marko/components/legacy/helpers',
-        method: 'c'
+    "defineComponent-legacy": {
+        module: "marko/components/legacy/helpers",
+        method: "c"
     },
-    'defineWidget-legacy': {
-        module: 'marko/components/legacy/helpers',
-        method: 'w'
+    "defineWidget-legacy": {
+        module: "marko/components/legacy/helpers",
+        method: "w"
     },
-    'escapeXml': 'x',
-    'escapeXmlAttr': 'xa',
-    'escapeScript': 'xs',
-    'escapeStyle': 'xc',
-    'forEach': 'f',
-    'forEachProp': { module: 'marko/runtime/helper-forEachProperty' },
-    'forEachPropStatusVar': { module: 'marko/runtime/helper-forEachPropStatusVar' },
-    'forEachWithStatusVar': { module: 'marko/runtime/helper-forEachWithStatusVar' },
-    'forRange': { module: 'marko/runtime/helper-forRange' },
-    'include': 'i',
-    'loadNestedTag': { module: 'marko/runtime/helper-loadNestedTag' },
-    'loadTag': 't',
-    'loadTemplate': { module: 'marko/runtime/helper-loadTemplate' },
-    'mergeNestedTagsHelper': { module: 'marko/runtime/helper-mergeNestedTags' },
-    'merge': { module: 'marko/runtime/helper-merge' },
-    'propsForPreviousNode': 'p',
-    'renderer': {
-        module: 'marko/components/helpers',
-        method: 'r'
+    escapeXml: "x",
+    escapeXmlAttr: "xa",
+    escapeScript: "xs",
+    escapeStyle: "xc",
+    forEach: "f",
+    forEachProp: { module: "marko/runtime/helper-forEachProperty" },
+    forEachPropStatusVar: {
+        module: "marko/runtime/helper-forEachPropStatusVar"
     },
-    'rendererLegacy': {
-        module: 'marko/components/legacy/helpers',
-        method: 'r'
+    forEachWithStatusVar: {
+        module: "marko/runtime/helper-forEachWithStatusVar"
     },
-    'registerComponent': {
-        module: 'marko/components/helpers',
-        method: 'rc'
+    forRange: { module: "marko/runtime/helper-forRange" },
+    include: "i",
+    loadNestedTag: { module: "marko/runtime/helper-loadNestedTag" },
+    loadTag: "t",
+    loadTemplate: { module: "marko/runtime/helper-loadTemplate" },
+    mergeNestedTagsHelper: { module: "marko/runtime/helper-mergeNestedTags" },
+    merge: { module: "marko/runtime/helper-merge" },
+    propsForPreviousNode: "p",
+    renderer: {
+        module: "marko/components/helpers",
+        method: "r"
     },
-    'str': 's',
-    'styleAttr': {
-        vdom: { module: 'marko/runtime/vdom/helper-styleAttr'},
-        html: 'sa'
+    rendererLegacy: {
+        module: "marko/components/legacy/helpers",
+        method: "r"
     },
-    'createText': 't'
+    registerComponent: {
+        module: "marko/components/helpers",
+        method: "rc"
+    },
+    str: "s",
+    styleAttr: {
+        vdom: { module: "marko/runtime/vdom/helper-styleAttr" },
+        html: "sa"
+    },
+    createText: "t"
 };
 
 class CompileContext extends EventEmitter {
     constructor(src, filename, builder, options) {
         super();
-        ok(typeof src === 'string', '"src" string is required');
+        ok(typeof src === "string", '"src" string is required');
         ok(filename, '"filename" is required');
 
         this.src = src;
@@ -137,12 +140,14 @@ class CompileContext extends EventEmitter {
         const writeVersionComment = this.options.writeVersionComment;
 
         this.root = undefined; // root will be set by the Compiler
-        this.target = this.options.browser ? 'browser' : 'server';
-        this.outputType = this.options.output || 'html';
-        this.compilerType = this.options.compilerType || 'marko';
+        this.target = this.options.browser ? "browser" : "server";
+        this.outputType = this.options.output || "html";
+        this.compilerType = this.options.compilerType || "marko";
         this.compilerVersion = this.options.compilerVersion || markoPkgVersion;
-        this.writeVersionComment = writeVersionComment !== 'undefined' ? writeVersionComment : true;
-        this.ignoreUnrecognizedTags = this.options.ignoreUnrecognizedTags === true;
+        this.writeVersionComment =
+            writeVersionComment !== "undefined" ? writeVersionComment : true;
+        this.ignoreUnrecognizedTags =
+            this.options.ignoreUnrecognizedTags === true;
         this.escapeAtTags = this.options.escapeAtTags === true;
 
         this._vars = {};
@@ -158,9 +163,11 @@ class CompileContext extends EventEmitter {
         this._preserveComments = null;
         this.inline = this.options.inline === true;
         this.useMeta = this.options.meta !== false;
-        this.markoModulePrefix = isDebug ? 'marko/src/' : 'marko/dist/';
+        this.markoModulePrefix = isDebug ? "marko/src/" : "marko/dist/";
 
-        this._moduleRuntimeTarget = this.markoModulePrefix + (this.outputType === 'vdom' ? 'vdom' : 'html');
+        this._moduleRuntimeTarget =
+            this.markoModulePrefix +
+            (this.outputType === "vdom" ? "vdom" : "html");
         this.unrecognizedTags = [];
         this._parsingFinished = false;
 
@@ -182,8 +189,9 @@ class CompileContext extends EventEmitter {
     }
 
     getPosInfo(pos) {
-        var srcCharProps = this._srcCharProps || (this._srcCharProps = charProps(this.src));
-        let line = srcCharProps.lineAt(pos)+1;
+        var srcCharProps =
+            this._srcCharProps || (this._srcCharProps = charProps(this.src));
+        let line = srcCharProps.lineAt(pos) + 1;
         let column = srcCharProps.columnAt(pos);
         return new PosInfo(this.filename, line, column);
     }
@@ -218,7 +226,9 @@ class CompileContext extends EventEmitter {
 
     popFlag(name) {
         if (!this._flags.hasOwnProperty(name)) {
-            throw new Error('popFlag() called for "' + name + '" when flag was not set');
+            throw new Error(
+                'popFlag() called for "' + name + '" when flag was not set'
+            );
         }
 
         if (--this._flags[name] === 0) {
@@ -245,7 +255,8 @@ class CompileContext extends EventEmitter {
         var dataStack = this._dataStacks[key];
 
         if (!dataStack || dataStack.length === 0) {
-            throw new Error('No data pushed for "' + key + '"'); }
+            throw new Error('No data pushed for "' + key + '"');
+        }
 
         dataStack.pop();
 
@@ -286,7 +297,7 @@ class CompileContext extends EventEmitter {
                 code,
                 pos
             };
-        } else if (typeof errorInfo === 'string') {
+        } else if (typeof errorInfo === "string") {
             let message = arguments[0];
             let code = arguments[1];
             let pos = arguments[2];
@@ -298,7 +309,7 @@ class CompileContext extends EventEmitter {
             };
         }
 
-        if(errorInfo && !errorInfo.node) {
+        if (errorInfo && !errorInfo.node) {
             errorInfo.node = this._currentNode;
         }
 
@@ -315,33 +326,36 @@ class CompileContext extends EventEmitter {
 
     getRequirePath(targetFilename) {
         if (targetFilename.startsWith(rootDir)) {
-            var deresolved = this.markoModulePrefix + targetFilename.substring(rootDir.length);
+            var deresolved =
+                this.markoModulePrefix +
+                targetFilename.substring(rootDir.length);
             var ext = path.extname(deresolved);
-            if (ext === '.js') {
+            if (ext === ".js") {
                 deresolved = deresolved.slice(0, 0 - ext.length);
             }
-            return deresolved.replace(/\\/g, '/');
+            return deresolved.replace(/\\/g, "/");
         }
 
         return markoModules.deresolve(targetFilename, this.dirname);
     }
 
     importModule(varName, path) {
-        if (typeof path !== 'string') {
+        if (typeof path !== "string") {
             throw new Error('"path" should be a string');
         }
 
-        if (path === 'marko') {
+        if (path === "marko") {
             path = this.markoModulePrefix;
-        } else if (path.startsWith('marko/')) {
-            if (path.startsWith('marko/src/') || path.startsWith('marko/dist/')) {
-
-            } else {
-                path = this.markoModulePrefix + path.substring('marko/'.length);
+        } else if (path.startsWith("marko/")) {
+            if (
+                !path.startsWith("marko/src/") &&
+                !path.startsWith("marko/dist/")
+            ) {
+                path = this.markoModulePrefix + path.substring("marko/".length);
             }
         }
 
-        var key = path + ':' + (varName != null);
+        var key = path + ":" + (varName != null);
 
         var varId = this._imports[key];
         if (varId === undefined) {
@@ -350,8 +364,10 @@ class CompileContext extends EventEmitter {
             var requireFuncCall = builder.require(builder.literal(path));
 
             if (varName) {
-                this._imports[key] = varId = this.addStaticVar(varName, requireFuncCall);
-
+                this._imports[key] = varId = this.addStaticVar(
+                    varName,
+                    requireFuncCall
+                );
             } else {
                 this.addStaticCode(requireFuncCall);
                 this._imports[key] = null;
@@ -386,7 +402,7 @@ class CompileContext extends EventEmitter {
             return;
         }
 
-        if (typeof code === 'string') {
+        if (typeof code === "string") {
             // Wrap the String code in a Code AST node so that
             // the code will be indented properly
             code = this.builder.code(code);
@@ -406,7 +422,7 @@ class CompileContext extends EventEmitter {
     getTagDef(tagName) {
         var taglibLookup = this.taglibLookup;
 
-        if (typeof tagName === 'string') {
+        if (typeof tagName === "string") {
             return taglibLookup.getTag(tagName);
         } else {
             let elNode = tagName;
@@ -421,7 +437,10 @@ class CompileContext extends EventEmitter {
     addErrorUnrecognizedTag(tagName, elNode) {
         this.addError({
             node: elNode,
-            message: 'Unrecognized tag: ' + tagName + ' - More details: https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag'
+            message:
+                "Unrecognized tag: " +
+                tagName +
+                " - More details: https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag"
         });
     }
 
@@ -429,7 +448,7 @@ class CompileContext extends EventEmitter {
         var elDef;
         var builder = this.builder;
 
-        if (typeof tagName === 'object') {
+        if (typeof tagName === "object") {
             elDef = tagName;
             tagName = elDef.tagName;
             attributes = elDef.attributes;
@@ -437,39 +456,41 @@ class CompileContext extends EventEmitter {
             elDef = { tagName, argument, attributes, openTagOnly, selfClosed };
         }
 
-        if (elDef.tagName === '') {
-            elDef.tagName = tagName = 'assign';
+        if (elDef.tagName === "") {
+            elDef.tagName = tagName = "assign";
         }
 
         if (!attributes) {
             attributes = elDef.attributes = [];
-        } else if (typeof attributes === 'object') {
+        } else if (typeof attributes === "object") {
             if (!Array.isArray(attributes)) {
-                attributes = elDef.attributes = Object.keys(attributes).map((attrName) => {
-                    var attrDef = {
-                        name: attrName
-                    };
+                attributes = elDef.attributes = Object.keys(attributes).map(
+                    attrName => {
+                        var attrDef = {
+                            name: attrName
+                        };
 
-                    var val = attributes[attrName];
-                    if (val == null) {
+                        var val = attributes[attrName];
+                        if (val != null) {
+                            if (val instanceof Node) {
+                                attrDef.value = val;
+                            } else {
+                                extend(attrDef, val);
+                            }
+                        }
 
-                    } if (val instanceof Node) {
-                        attrDef.value = val;
-                    } else {
-                        extend(attrDef, val);
+                        return attrDef;
                     }
-
-                    return attrDef;
-                });
+                );
             }
         } else {
-            throw new Error('Invalid attributes');
+            throw new Error("Invalid attributes");
         }
 
-        var isAtTag = typeof tagName === 'string' && tagName.startsWith('@');
+        var isAtTag = typeof tagName === "string" && tagName.startsWith("@");
 
         if (isAtTag && this.escapeAtTags) {
-            tagName = tagName.replace(/^@/, 'at_');
+            tagName = tagName.replace(/^@/, "at_");
             elDef.tagName = tagName;
         }
 
@@ -489,16 +510,25 @@ class CompileContext extends EventEmitter {
             node = builder.customTag(elNode);
             node.body = node.makeContainer(node.body.items);
         } else {
-            if (typeof tagName === 'string') {
+            if (typeof tagName === "string") {
                 tagDef = taglibLookup.getTag(tagName);
-                if (!tagDef && !this.isMacro(tagName) && tagName.indexOf(':') === -1) {
-                    var customElement = htmlElements.getRegisteredElement(tagName, this.dirname);
+                if (
+                    !tagDef &&
+                    !this.isMacro(tagName) &&
+                    tagName.indexOf(":") === -1
+                ) {
+                    var customElement = htmlElements.getRegisteredElement(
+                        tagName,
+                        this.dirname
+                    );
                     if (customElement) {
                         elNode.customElement = customElement;
                         elNode.addRuntimeFlag(FLAG_CUSTOM_ELEMENT);
 
                         if (customElement.import) {
-                            this.addDependency(this.getRequirePath(customElement.import));
+                            this.addDependency(
+                                this.getRequirePath(customElement.import)
+                            );
                         }
                     } else if (!this.ignoreUnrecognizedTags) {
                         if (this._parsingFinished) {
@@ -520,13 +550,19 @@ class CompileContext extends EventEmitter {
                 if (nodeFactoryFunc) {
                     var newNode = nodeFactoryFunc(elNode, this);
                     if (!(newNode instanceof Node)) {
-                        throw new Error('Invalid node returned from node factory for tag "' + tagName + '".');
+                        throw new Error(
+                            'Invalid node returned from node factory for tag "' +
+                                tagName +
+                                '".'
+                        );
                     }
 
                     if (newNode != node) {
                         // Make sure the body container is associated with the correct node
                         if (newNode.body && newNode.body !== node) {
-                            newNode.body = newNode.makeContainer(newNode.body.items);
+                            newNode.body = newNode.makeContainer(
+                                newNode.body.items
+                            );
                         }
                         node = newNode;
                     }
@@ -547,7 +583,7 @@ class CompileContext extends EventEmitter {
         var foundAttrs = {};
 
         // Validate the attributes
-        attributes.forEach((attr) => {
+        attributes.forEach(attr => {
             let attrName = attr.name;
             if (!attrName) {
                 // Attribute will be name for placeholder attributes. For example: <div ${data.myAttrs}>
@@ -564,9 +600,15 @@ class CompileContext extends EventEmitter {
                     //Tag doesn't allow dynamic attributes
                     this.addError({
                         node: node,
-                        message: 'The tag "' + tagName + '" in taglib "' + getTaglibPath(tagDef.taglibId) + '" does not support attribute "' + attrName + '"'
+                        message:
+                            'The tag "' +
+                            tagName +
+                            '" in taglib "' +
+                            getTaglibPath(tagDef.taglibId) +
+                            '" does not support attribute "' +
+                            attrName +
+                            '"'
                     });
-
                 }
                 return;
             }
@@ -588,10 +630,13 @@ class CompileContext extends EventEmitter {
             // Add default values for any attributes. If an attribute has a declared
             // default value and the attribute was not found on the element
             // then add the attribute with the specified default value
-            tagDef.forEachAttribute((attrDef) => {
+            tagDef.forEachAttribute(attrDef => {
                 var attrName = attrDef.name;
 
-                if (attrDef.hasOwnProperty('defaultValue') && !foundAttrs.hasOwnProperty(attrName)) {
+                if (
+                    attrDef.hasOwnProperty("defaultValue") &&
+                    !foundAttrs.hasOwnProperty(attrName)
+                ) {
                     attributes.push({
                         name: attrName,
                         value: builder.literal(attrDef.defaultValue)
@@ -601,7 +646,14 @@ class CompileContext extends EventEmitter {
                     if (!foundAttrs.hasOwnProperty(attrName)) {
                         this.addError({
                             node: node,
-                            message: 'The "' + attrName + '" attribute is required for tag "' + tagName + '" in taglib "' + getTaglibPath(tagDef.taglibId) + '".'
+                            message:
+                                'The "' +
+                                attrName +
+                                '" attribute is required for tag "' +
+                                tagName +
+                                '" in taglib "' +
+                                getTaglibPath(tagDef.taglibId) +
+                                '".'
                         });
                     }
                 }
@@ -638,35 +690,45 @@ class CompileContext extends EventEmitter {
     }
 
     importTemplate(relativePath, varName) {
-        ok(typeof relativePath === 'string', '"path" should be a string');
+        ok(typeof relativePath === "string", '"path" should be a string');
         var builder = this.builder;
-		varName = varName || removeExt(path.basename(relativePath)) + '_template';
+        varName =
+            varName || removeExt(path.basename(relativePath)) + "_template";
 
         var templateVar;
 
         if (this.options.browser || this.options.requireTemplates) {
             // When compiling a Marko template for the browser we just use `require('./template.marko')`
-            templateVar = this.addStaticVar(varName, builder.require(builder.literal(relativePath)));
+            templateVar = this.addStaticVar(
+                varName,
+                builder.require(builder.literal(relativePath))
+            );
         } else {
             // When compiling a Marko template for the server we just use `loadTemplate(require.resolve('./template.marko'))`
-            let loadTemplateArg = requireResolve(builder, builder.literal(relativePath));
-            let loadFunctionCall = builder.functionCall(this.helper('loadTemplate'), [ loadTemplateArg ]);
+            let loadTemplateArg = requireResolve(
+                builder,
+                builder.literal(relativePath)
+            );
+            let loadFunctionCall = builder.functionCall(
+                this.helper("loadTemplate"),
+                [loadTemplateArg]
+            );
             templateVar = this.addStaticVar(varName, loadFunctionCall);
         }
 
-        this.pushMeta('tags', relativePath, true);
+        this.pushMeta("tags", relativePath, true);
 
         return templateVar;
     }
 
-    addDependency(path, type, options) {
+    addDependency(path, type) {
         var dependency;
         if (type) {
             dependency = { type, path };
         } else {
             dependency = path;
         }
-        this.pushMeta('deps', dependency, true);
+        this.pushMeta("deps", dependency, true);
     }
 
     pushMeta(key, value, unique) {
@@ -674,9 +736,12 @@ class CompileContext extends EventEmitter {
 
         property = this.meta[key];
 
-        if(!property) {
+        if (!property) {
             this.meta[key] = [value];
-        } else if(!unique || !property.some(e => JSON.stringify(e) === JSON.stringify(value))) {
+        } else if (
+            !unique ||
+            !property.some(e => JSON.stringify(e) === JSON.stringify(value))
+        ) {
             property.push(value);
         }
     }
@@ -698,7 +763,10 @@ class CompileContext extends EventEmitter {
     }
 
     isPreserveWhitespace() {
-        if (this.isFlagSet(FLAG_PRESERVE_WHITESPACE) || this._preserveWhitespace === true) {
+        if (
+            this.isFlagSet(FLAG_PRESERVE_WHITESPACE) ||
+            this._preserveWhitespace === true
+        ) {
             return true;
         }
     }
@@ -721,10 +789,13 @@ class CompileContext extends EventEmitter {
     resolvePath(pathExpression) {
         ok(pathExpression, '"pathExpression" is required');
 
-        if (pathExpression.type === 'Literal') {
+        if (pathExpression.type === "Literal") {
             let path = pathExpression.value;
-            if (typeof path === 'string') {
-                return this.addStaticVar(path, this.builder.requireResolve(pathExpression));
+            if (typeof path === "string") {
+                return this.addStaticVar(
+                    path,
+                    this.builder.requireResolve(pathExpression)
+                );
             }
         }
         return pathExpression;
@@ -733,9 +804,9 @@ class CompileContext extends EventEmitter {
     resolveTemplate(pathExpression) {
         ok(pathExpression, '"pathExpression" is required');
 
-        if (pathExpression.type === 'Literal') {
+        if (pathExpression.type === "Literal") {
             let path = pathExpression.value;
-            if (typeof path === 'string') {
+            if (typeof path === "string") {
                 return this.importTemplate(path);
             }
         }
@@ -748,12 +819,12 @@ class CompileContext extends EventEmitter {
         let staticNodes = [];
         let staticVars = this.getStaticVars();
 
-        let staticVarNodes = Object.keys(staticVars).map((varName) => {
+        let staticVarNodes = Object.keys(staticVars).map(varName => {
             var varInit = staticVars[varName];
             return builder.variableDeclarator(varName, varInit);
         });
 
-        if(additionalVars) {
+        if (additionalVars) {
             staticVarNodes = additionalVars.concat(staticVarNodes);
         }
 
@@ -772,8 +843,14 @@ class CompileContext extends EventEmitter {
 
     get helpersIdentifier() {
         if (!this._helpersIdentifier) {
-            var target = this.outputType === 'vdom' ? 'marko/runtime/vdom/helpers' : 'marko/runtime/html/helpers';
-            this._helpersIdentifier = this.importModule('marko_helpers', target);
+            var target =
+                this.outputType === "vdom"
+                    ? "marko/runtime/vdom/helpers"
+                    : "marko/runtime/html/helpers";
+            this._helpersIdentifier = this.importModule(
+                "marko_helpers",
+                target
+            );
         }
         return this._helpersIdentifier;
     }
@@ -783,38 +860,50 @@ class CompileContext extends EventEmitter {
         if (!helperIdentifier) {
             var helperInfo = helpers[name];
 
-            if (helperInfo && typeof helperInfo === 'object') {
+            if (helperInfo && typeof helperInfo === "object") {
                 if (!helperInfo.module) {
                     helperInfo = helperInfo[this.outputType];
                 }
             }
 
             if (!helperInfo) {
-                throw new Error('Invalid helper: ' + name);
+                throw new Error("Invalid helper: " + name);
             }
 
-            if (typeof helperInfo === 'string') {
+            if (typeof helperInfo === "string") {
                 let methodName = helperInfo;
                 var methodIdentifier = this.builder.identifier(methodName);
 
                 helperIdentifier = this.addStaticVar(
-                    'marko_' + name,
-                    this.builder.memberExpression(this.helpersIdentifier, methodIdentifier));
+                    "marko_" + name,
+                    this.builder.memberExpression(
+                        this.helpersIdentifier,
+                        methodIdentifier
+                    )
+                );
             } else if (helperInfo && helperInfo.module) {
                 if (helperInfo.method) {
-                    let moduleIdentifier = this.importModule('marko_' + helperInfo.module, helperInfo.module);
+                    let moduleIdentifier = this.importModule(
+                        "marko_" + helperInfo.module,
+                        helperInfo.module
+                    );
                     helperIdentifier = this.addStaticVar(
-                        'marko_' + name,
-                        this.builder.memberExpression(moduleIdentifier, helperInfo.method));
+                        "marko_" + name,
+                        this.builder.memberExpression(
+                            moduleIdentifier,
+                            helperInfo.method
+                        )
+                    );
                 } else {
-                    helperIdentifier = this.importModule('marko_' + name, helperInfo.module);
+                    helperIdentifier = this.importModule(
+                        "marko_" + name,
+                        helperInfo.module
+                    );
                 }
             } else {
-                throw new Error('Invalid helper: ' + name);
+                throw new Error("Invalid helper: " + name);
             }
 
-
-
             this._helpers[name] = helperIdentifier;
         }
 
@@ -844,7 +933,7 @@ class CompileContext extends EventEmitter {
 
     optimize(rootNode) {
         if (this._optimizers) {
-            this._optimizers.forEach((optimizer) => {
+            this._optimizers.forEach(optimizer => {
                 optimizer.optimize(rootNode, this);
             });
         }
@@ -855,17 +944,17 @@ class CompileContext extends EventEmitter {
     }
 
     isBrowserTarget() {
-        return this.target === 'browser';
+        return this.target === "browser";
     }
 
     isServerTarget() {
-        return this.target === 'server';
+        return this.target === "server";
     }
 }
 
 CompileContext.prototype.util = {
-    isValidJavaScriptIdentifier: require('./util/isValidJavaScriptIdentifier'),
-    isJavaScriptReservedWord: require('./util/isJavaScriptReservedWord')
+    isValidJavaScriptIdentifier: require("./util/isValidJavaScriptIdentifier"),
+    isJavaScriptReservedWord: require("./util/isJavaScriptReservedWord")
 };
 
 module.exports = CompileContext;
diff --git a/src/compiler/CompileError.js b/src/compiler/CompileError.js
index b722b8128..6e6b2615a 100644
--- a/src/compiler/CompileError.js
+++ b/src/compiler/CompileError.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class CompileError {
     constructor(errorInfo, context) {
@@ -33,16 +33,16 @@ class CompileError {
     toString() {
         var pos = this.pos;
         if (pos) {
-            pos = '[' + pos + '] ';
+            pos = "[" + pos + "] ";
         } else {
-            pos = '';
+            pos = "";
         }
         var str = pos + this.message;
         if (pos == null && this.node) {
-            str += ' (' + this.node.toString() + ')';
+            str += " (" + this.node.toString() + ")";
         }
         return str;
     }
 }
 
-module.exports = CompileError;
\ No newline at end of file
+module.exports = CompileError;
diff --git a/src/compiler/Compiler.js b/src/compiler/Compiler.js
index b9226a440..425866f65 100644
--- a/src/compiler/Compiler.js
+++ b/src/compiler/Compiler.js
@@ -1,18 +1,20 @@
-'use strict';
-var ok = require('assert').ok;
-var path = require('path');
-var CodeGenerator = require('./CodeGenerator');
-var CodeWriter = require('./CodeWriter');
-var createError = require('raptor-util/createError');
-var resolveDep = require('../components/legacy/dependencies').resolveDep;
+"use strict";
+var ok = require("assert").ok;
+var path = require("path");
+var CodeGenerator = require("./CodeGenerator");
+var CodeWriter = require("./CodeWriter");
+var createError = require("raptor-util/createError");
+var resolveDep = require("../components/legacy/dependencies").resolveDep;
 
-const FLAG_TRANSFORMER_APPLIED = 'transformerApply';
+const FLAG_TRANSFORMER_APPLIED = "transformerApply";
 
 function transformNode(node, context) {
     try {
-        context.taglibLookup.forEachNodeTransformer(node, function (transformer) {
+        context.taglibLookup.forEachNodeTransformer(node, function(
+            transformer
+        ) {
             if (node.isDetached()) {
-                return;    //The node might have been removed from the tree
+                return; //The node might have been removed from the tree
             }
             if (!node.isTransformerApplied(transformer)) {
                 //Check to make sure a transformer of a certain type is only applied once to a node
@@ -24,11 +26,19 @@ function transformNode(node, context) {
                 //Set the flag to indicate that a node was transformed
                 // node.compiler = this;
                 var transformerFunc = transformer.getFunc();
-                transformerFunc.call(transformer, node, context);    //Have the transformer process the node (NOTE: Just because a node is being processed by the transformer doesn't mean that it has to modify the parse tree)
+                transformerFunc.call(transformer, node, context); //Have the transformer process the node (NOTE: Just because a node is being processed by the transformer doesn't mean that it has to modify the parse tree)
             }
         });
     } catch (e) {
-        throw createError(new Error('Unable to compile template at path "' + context.filename + '". Error: ' + e.message), e);
+        throw createError(
+            new Error(
+                'Unable to compile template at path "' +
+                    context.filename +
+                    '". Error: ' +
+                    e.message
+            ),
+            e
+        );
     }
 }
 
@@ -43,14 +53,13 @@ function transformTreeHelper(node, context) {
      *       The checks to prevent transformers from being applied multiple times makes
      *       sure that this is not a problem.
      */
-    node.forEachChild(function (childNode) {
+    node.forEachChild(function(childNode) {
         transformTreeHelper(childNode, context);
     });
 }
 
 function transformTree(rootNode, context) {
-
-    context.taglibLookup.forEachTemplateTransformer((transformer) => {
+    context.taglibLookup.forEachTemplateTransformer(transformer => {
         var transformFunc = transformer.getFunc();
         rootNode = transformFunc(rootNode, context) || rootNode;
     });
@@ -63,7 +72,7 @@ function transformTree(rootNode, context) {
     do {
         context.clearFlag(FLAG_TRANSFORMER_APPLIED);
         //Reset the flag to indicate that no transforms were yet applied to any of the nodes for this pass
-        transformTreeHelper(rootNode, context);    //Run the transforms on the tree
+        transformTreeHelper(rootNode, context); //Run the transforms on the tree
     } while (context.isFlagSet(FLAG_TRANSFORMER_APPLIED));
 
     return rootNode;
@@ -74,10 +83,13 @@ function handleErrors(context) {
     if (context.hasErrors()) {
         var errors = context.getErrors();
 
-        var message = 'An error occurred while trying to compile template at path "' + context.filename + '". Error(s) in template:\n';
+        var message =
+            'An error occurred while trying to compile template at path "' +
+            context.filename +
+            '". Error(s) in template:\n';
         for (var i = 0, len = errors.length; i < len; i++) {
             let error = errors[i];
-            message += (i + 1) + ') ' + error.toString() + '\n';
+            message += i + 1 + ") " + error.toString() + "\n";
         }
         var error = new Error(message);
         error.errors = errors;
@@ -86,7 +98,7 @@ function handleErrors(context) {
 }
 
 class CompiledTemplate {
-    constructor(ast, context, codeGenerator) {
+    constructor(ast, context) {
         this.ast = ast;
         this.context = context;
         this.filename = context.filename;
@@ -111,7 +123,10 @@ class CompiledTemplate {
         handleErrors(this.context);
 
         // console.log(module.id, 'FINAL AST:' + JSON.stringify(finalAST, null, 4));
-        var codeWriter = new CodeWriter(this.context.options, this.context.builder);
+        var codeWriter = new CodeWriter(
+            this.context.options,
+            this.context.builder
+        );
         codeWriter.write(this.ast);
 
         handleErrors(this.context);
@@ -123,7 +138,7 @@ class CompiledTemplate {
 }
 
 class Compiler {
-    constructor(options, userOptions, inline) {
+    constructor(options) {
         ok(options, '"options" is required');
 
         this.builder = options.builder;
@@ -134,7 +149,7 @@ class Compiler {
     }
 
     compile(src, context) {
-        ok(typeof src === 'string', '"src" argument should be a string');
+        ok(typeof src === "string", '"src" argument should be a string');
 
         var codeGenerator = new CodeGenerator(context);
 
@@ -143,11 +158,14 @@ class Compiler {
         context._parsingFinished = true;
 
         if (!context.ignoreUnrecognizedTags && context.unrecognizedTags) {
-            for(let i=0; i<context.unrecognizedTags.length; i++) {
+            for (let i = 0; i < context.unrecognizedTags.length; i++) {
                 let unrecognizedTag = context.unrecognizedTags[i];
                 // See if the tag is a macro
                 if (!context.isMacro(unrecognizedTag.tagName)) {
-                    context.addErrorUnrecognizedTag(unrecognizedTag.tagName, unrecognizedTag.node);
+                    context.addErrorUnrecognizedTag(
+                        unrecognizedTag.tagName,
+                        unrecognizedTag.node
+                    );
                 }
             }
         }
diff --git a/src/compiler/HtmlJsParser.js b/src/compiler/HtmlJsParser.js
index a15726902..2091903d9 100644
--- a/src/compiler/HtmlJsParser.js
+++ b/src/compiler/HtmlJsParser.js
@@ -1,9 +1,10 @@
-'use strict';
-var htmljs = require('htmljs-parser');
+"use strict";
+var htmljs = require("htmljs-parser");
 
 class HtmlJsParser {
     constructor(options) {
-        this.ignorePlaceholders = options && options.ignorePlaceholders === true;
+        this.ignorePlaceholders =
+            options && options.ignorePlaceholders === true;
     }
 
     parse(src, handlers, filename) {
@@ -15,27 +16,29 @@ class HtmlJsParser {
             onPlaceholder(event) {
                 if (event.withinBody) {
                     if (!event.withinString) {
-                        handlers.handleBodyTextPlaceholder(event.value, event.escape);
+                        handlers.handleBodyTextPlaceholder(
+                            event.value,
+                            event.escape
+                        );
                     }
                 } else if (event.withinOpenTag) {
                     // Don't escape placeholder for dynamic attributes. For example: <div ${data.myAttrs}></div>
                 } else {
                     // placeholder within attribute
                     if (event.escape) {
-                        event.value = '$escapeXml(' + event.value + ')';
+                        event.value = "$escapeXml(" + event.value + ")";
                     } else {
-                        event.value = '$noEscapeXml(' + event.value + ')';
+                        event.value = "$noEscapeXml(" + event.value + ")";
                     }
                 }
                 // placeholder within content
-
             },
 
             onCDATA(event) {
-                handlers.handleCharacters(event.value, 'static-text');
+                handlers.handleCharacters(event.value, "static-text");
             },
 
-            onOpenTagName(event, parser) {
+            onOpenTagName(event) {
                 event.selfClosed = false; // Don't allow self-closed tags
 
                 var tagParseOptions = handlers.getTagParseOptions(event);
@@ -61,7 +64,6 @@ class HtmlJsParser {
             },
 
             onDocumentType(event) {
-
                 // Document type: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
                 // NOTE: The value will be all of the text between "<!" and ">""
                 handlers.handleDocumentType(event.value);
@@ -86,12 +88,12 @@ class HtmlJsParser {
             }
         };
 
-        var parser = this.parser = htmljs.createParser(listeners, {
+        var parser = (this.parser = htmljs.createParser(listeners, {
             ignorePlaceholders: this.ignorePlaceholders,
             isOpenTagOnly: function(tagName) {
                 return handlers.isOpenTagOnly(tagName);
             }
-        });
+        }));
         parser.parse(src, filename);
     }
 }
diff --git a/src/compiler/InlineCompiler.js b/src/compiler/InlineCompiler.js
index b51008876..6fea7d1ab 100644
--- a/src/compiler/InlineCompiler.js
+++ b/src/compiler/InlineCompiler.js
@@ -1,28 +1,28 @@
-'use strict';
+"use strict";
 
-let CodeWriter = require('./CodeWriter');
+let CodeWriter = require("./CodeWriter");
 
 function fixIndentation(lines) {
     let length = lines.length;
     let startLine = 0;
     let endLine = length;
 
-    for (; startLine<length; startLine++) {
+    for (; startLine < length; startLine++) {
         let line = lines[startLine];
-        if (line.trim() !== '') {
+        if (line.trim() !== "") {
             break;
         }
     }
 
-    for (; endLine>startLine; endLine--) {
-        let line = lines[endLine-1];
-        if (line.trim() !== '') {
+    for (; endLine > startLine; endLine--) {
+        let line = lines[endLine - 1];
+        if (line.trim() !== "") {
             break;
         }
     }
 
     if (endLine === startLine) {
-        return '';
+        return "";
     }
 
     if (startLine !== 0 || endLine !== length) {
@@ -33,7 +33,7 @@ function fixIndentation(lines) {
     let indentToRemove = /^\s*/.exec(firstLine)[0];
 
     if (indentToRemove) {
-        for (let i=0; i<lines.length; i++) {
+        for (let i = 0; i < lines.length; i++) {
             let line = lines[i];
             if (line.startsWith(indentToRemove)) {
                 lines[i] = line.substring(indentToRemove.length);
@@ -41,13 +41,13 @@ function fixIndentation(lines) {
         }
     }
 
-    return lines.join('\n');
+    return lines.join("\n");
 }
 
 function normalizeTemplateSrc(src) {
     let lines = src.split(/\r\n|\n\r|\n/);
     if (lines.length) {
-        if (lines[0].trim() === '') {
+        if (lines[0].trim() === "") {
             return fixIndentation(lines);
         }
     }
@@ -82,4 +82,4 @@ class InlineCompiler {
     }
 }
 
-module.exports = InlineCompiler;
\ No newline at end of file
+module.exports = InlineCompiler;
diff --git a/src/compiler/Parser.js b/src/compiler/Parser.js
index 5aed012a8..a055aba24 100644
--- a/src/compiler/Parser.js
+++ b/src/compiler/Parser.js
@@ -1,13 +1,13 @@
-'use strict';
-var ok = require('assert').ok;
-var replacePlaceholderEscapeFuncs = require('./util/replacePlaceholderEscapeFuncs');
-var extend = require('raptor-util/extend');
+"use strict";
+var ok = require("assert").ok;
+var replacePlaceholderEscapeFuncs = require("./util/replacePlaceholderEscapeFuncs");
+var extend = require("raptor-util/extend");
 
 var COMPILER_ATTRIBUTE_HANDLERS = {
-    'preserve-whitespace': function(attr, context) {
+    "preserve-whitespace": function(attr, context) {
         context.setPreserveWhitespace(true);
     },
-    'preserve-comments': function(attr, context) {
+    "preserve-comments": function(attr, context) {
         context.setPreserveComments(true);
     }
 };
@@ -20,11 +20,11 @@ function isIEConditionalComment(comment) {
 
 function mergeShorthandClassNames(el, shorthandClassNames, context) {
     var builder = context.builder;
-    let classNames = shorthandClassNames.map((className) => {
+    let classNames = shorthandClassNames.map(className => {
         return builder.parseExpression(className.value);
     });
 
-    var classAttr = el.getAttributeValue('class');
+    var classAttr = el.getAttributeValue("class");
     if (classAttr) {
         classNames.push(classAttr);
     }
@@ -33,10 +33,14 @@ function mergeShorthandClassNames(el, shorthandClassNames, context) {
 
     var finalClassNames = [];
 
-    for (var i=0; i<classNames.length; i++) {
+    for (var i = 0; i < classNames.length; i++) {
         let className = classNames[i];
-        if (prevClassName && className.type === 'Literal' && prevClassName.type === 'Literal') {
-            prevClassName.value += ' ' + className.value;
+        if (
+            prevClassName &&
+            className.type === "Literal" &&
+            prevClassName.type === "Literal"
+        ) {
+            prevClassName.value += " " + className.value;
         } else {
             finalClassNames.push(className);
             prevClassName = className;
@@ -44,47 +48,48 @@ function mergeShorthandClassNames(el, shorthandClassNames, context) {
     }
 
     if (finalClassNames.length === 1) {
-        el.setAttributeValue('class', finalClassNames[0]);
+        el.setAttributeValue("class", finalClassNames[0]);
     } else {
-
         el.setAttributeValue(
-            'class',
-            builder.functionCall(
-                context.helper('classList'),
-                [
-                    builder.literal(finalClassNames)
-                ]));
+            "class",
+            builder.functionCall(context.helper("classList"), [
+                builder.literal(finalClassNames)
+            ])
+        );
     }
 }
 
 function getParserStateForTag(parser, el, tagDef) {
     var attributes = el.attributes;
     if (attributes) {
-        for (var i=0; i<attributes.length; i++) {
+        for (var i = 0; i < attributes.length; i++) {
             var attr = attributes[i];
             var attrName = attr.name;
-            if (attrName === 'marko-body') {
+            if (attrName === "marko-body") {
                 var parseMode;
 
                 if (attr.literalValue) {
                     parseMode = attr.literalValue;
                 }
 
-                if (parseMode === 'static-text' ||
-                    parseMode === 'parsed-text' ||
-                    parseMode === 'html') {
+                if (
+                    parseMode === "static-text" ||
+                    parseMode === "parsed-text" ||
+                    parseMode === "html"
+                ) {
                     return parseMode;
                 } else {
                     parser.context.addError({
-                        message: 'Value for "marko-body" should be one of the following: "static-text", "parsed-text", "html"',
-                        code: 'ERR_INVALID_ATTR'
+                        message:
+                            'Value for "marko-body" should be one of the following: "static-text", "parsed-text", "html"',
+                        code: "ERR_INVALID_ATTR"
                     });
                     return;
                 }
-            } else if (attrName === 'template-helpers') {
-                return 'static-text';
-            } else if (attrName === 'marko-init') {
-                return 'static-text';
+            } else if (attrName === "template-helpers") {
+                return "static-text";
+            } else if (attrName === "marko-init") {
+                return "static-text";
             }
         }
     }
@@ -122,7 +127,7 @@ class Parser {
     }
 
     parse(src, context) {
-        ok(typeof src === 'string', '"src" should be a string');
+        ok(typeof src === "string", '"src" should be a string');
         ok(context, '"context" is required');
 
         this._reset();
@@ -144,12 +149,16 @@ class Parser {
     handleCharacters(text, parseMode) {
         var builder = this.context.builder;
 
-        var escape = parseMode !== 'html';
+        var escape = parseMode !== "html";
         // NOTE: If parseMode is 'static-text' or 'parsed-text' then that means that special
         //       HTML characters may not have been escaped on the way in so we need to escape
         //       them on the way out
 
-        if (this.prevTextNode && this.prevTextNode.isLiteral() && this.prevTextNode.escape === escape) {
+        if (
+            this.prevTextNode &&
+            this.prevTextNode.isLiteral() &&
+            this.prevTextNode.escape === escape
+        ) {
             this.prevTextNode.argument.value += text;
         } else {
             this.prevTextNode = builder.text(builder.literal(text), escape);
@@ -175,17 +184,23 @@ class Parser {
         if (!raw) {
             if (tagNameExpression) {
                 tagName = builder.parseExpression(tagNameExpression);
-            } else if (tagName === 'marko-compiler-options') {
+            } else if (tagName === "marko-compiler-options") {
                 this.parentNode.setTrimStartEnd(true);
 
-                attributes.forEach(function (attr) {
+                attributes.forEach(function(attr) {
                     let attrName = attr.name;
                     let handler = COMPILER_ATTRIBUTE_HANDLERS[attrName];
 
                     if (!handler) {
                         context.addError({
-                            code: 'ERR_INVALID_COMPILER_OPTION',
-                            message: 'Invalid Marko compiler option of "' + attrName + '". Allowed: ' + Object.keys(COMPILER_ATTRIBUTE_HANDLERS).join(', '),
+                            code: "ERR_INVALID_COMPILER_OPTION",
+                            message:
+                                'Invalid Marko compiler option of "' +
+                                attrName +
+                                '". Allowed: ' +
+                                Object.keys(COMPILER_ATTRIBUTE_HANDLERS).join(
+                                    ", "
+                                ),
                             pos: el.pos,
                             node: el
                         });
@@ -205,21 +220,24 @@ class Parser {
 
         var attributeParseErrors = [];
         // <div class="foo"> -> "div class=foo"
-        var tagString = parser.substring(el.pos, el.endPos)
-                              .replace(/^<|\/>$|>$/g, "").trim();
+        var tagString = parser
+            .substring(el.pos, el.endPos)
+            .replace(/^<|\/>$|>$/g, "")
+            .trim();
 
-        var shouldParsedAttributes = !tagDef || tagDef.parseAttributes !== false;
+        var shouldParsedAttributes =
+            !tagDef || tagDef.parseAttributes !== false;
 
         var parsedAttributes = [];
 
         if (shouldParsedAttributes) {
-            attributes.forEach((attr) => {
+            attributes.forEach(attr => {
                 var attrName = attr.name;
                 var attrRawValue = attr.value;
                 var attrSpread;
                 var attrValue;
 
-                if (attr.hasOwnProperty('literalValue')) {
+                if (attr.hasOwnProperty("literalValue")) {
                     attrValue = builder.literal(attr.literalValue);
                 } else if (/^\.\.\./.test(attrName)) {
                     attrRawValue = attrName;
@@ -232,27 +250,34 @@ class Parser {
                     attrValue = attrRawValue;
                 }
 
-                if (typeof attrValue === 'string') {
+                if (typeof attrValue === "string") {
                     let parsedExpression;
                     let valid = true;
                     try {
                         parsedExpression = builder.parseExpression(attrValue);
-                    } catch(e) {
+                    } catch (e) {
                         if (shouldParsedAttributes) {
                             valid = false;
-                            attributeParseErrors.push('Invalid JavaScript expression for attribute "' + attr.name + '": ' + e);
+                            attributeParseErrors.push(
+                                'Invalid JavaScript expression for attribute "' +
+                                    attr.name +
+                                    '": ' +
+                                    e
+                            );
                         } else {
                             // Attribute failed to parse. Skip it...
                             return;
                         }
-
                     }
 
                     if (valid) {
                         if (raw) {
                             attrValue = parsedExpression;
                         } else {
-                            attrValue = replacePlaceholderEscapeFuncs(parsedExpression, context);
+                            attrValue = replacePlaceholderEscapeFuncs(
+                                parsedExpression,
+                                context
+                            );
                         }
                     } else {
                         attrValue = null;
@@ -275,7 +300,12 @@ class Parser {
                 }
 
                 if (attrName) {
-                    if (attrName === 'for-key' || attrName === 'for-ref' || attrName === 'w-for' || attrName.endsWith(':key')) {
+                    if (
+                        attrName === "for-key" ||
+                        attrName === "for-ref" ||
+                        attrName === "w-for" ||
+                        attrName.endsWith(":key")
+                    ) {
                         context.data.hasLegacyForKey = true;
                     }
                 }
@@ -312,8 +342,7 @@ class Parser {
         }
 
         if (attributeParseErrors.length) {
-
-            attributeParseErrors.forEach((e) => {
+            attributeParseErrors.forEach(e => {
                 context.addError(node, e);
             });
         }
@@ -325,10 +354,12 @@ class Parser {
             }
 
             if (el.shorthandClassNames) {
-                node.rawShorthandClassNames = el.shorthandClassNames.map((className) => {
-                    let parsed = builder.parseExpression(className.value);
-                    return parsed.value;
-                });
+                node.rawShorthandClassNames = el.shorthandClassNames.map(
+                    className => {
+                        let parsed = builder.parseExpression(className.value);
+                        return parsed.value;
+                    }
+                );
             }
         } else {
             if (el.shorthandClassNames) {
@@ -336,10 +367,16 @@ class Parser {
             }
 
             if (el.shorthandId) {
-                if (node.hasAttribute('id')) {
-                    context.addError(node, 'A shorthand ID cannot be used in conjunction with the "id" attribute');
+                if (node.hasAttribute("id")) {
+                    context.addError(
+                        node,
+                        'A shorthand ID cannot be used in conjunction with the "id" attribute'
+                    );
                 } else {
-                    node.setAttributeValue('id', builder.parseExpression(el.shorthandId.value));
+                    node.setAttributeValue(
+                        "id",
+                        builder.parseExpression(el.shorthandId.value)
+                    );
                 }
             }
         }
@@ -354,7 +391,7 @@ class Parser {
 
     handleEndElement(elementName) {
         if (this.raw !== true) {
-            if (elementName === 'marko-compiler-options') {
+            if (elementName === "marko-compiler-options") {
                 return;
             }
         }
@@ -368,7 +405,8 @@ class Parser {
 
         var builder = this.context.builder;
 
-        var preserveComment = this.context.isPreserveComments() ||
+        var preserveComment =
+            this.context.isPreserveComments() ||
             isIEConditionalComment(comment);
 
         if (this.raw || preserveComment) {
@@ -422,7 +460,7 @@ class Parser {
     }
 
     get parentNode() {
-        var last = this.stack[this.stack.length-1];
+        var last = this.stack[this.stack.length - 1];
         return last.node;
     }
 
diff --git a/src/compiler/Walker.js b/src/compiler/Walker.js
index be04b6ada..7f0dacd16 100644
--- a/src/compiler/Walker.js
+++ b/src/compiler/Walker.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 var isArray = Array.isArray;
-var Container = require('./ast/Container');
+var Container = require("./ast/Container");
 
 function noop() {}
 
@@ -53,7 +53,7 @@ class Walker {
         });
 
         if (hasRemoval) {
-            for (let i=array.length-1; i>=0; i--) {
+            for (let i = array.length - 1; i >= 0; i--) {
                 if (array[i] == null) {
                     array.splice(i, 1);
                 }
@@ -66,7 +66,7 @@ class Walker {
     }
 
     _walkContainer(nodes) {
-        nodes.forEach((node) => {
+        nodes.forEach(node => {
             var transformed = this.walk(node);
             if (!transformed) {
                 node.container.removeChild(node);
@@ -77,13 +77,15 @@ class Walker {
     }
 
     walk(node) {
-        if (!node || this._stopped || typeof node === 'string') {
+        if (!node || this._stopped || typeof node === "string") {
             return node;
         }
 
         this._reset();
 
-        var parent = this._stack.length ? this._stack[this._stack.length - 1] : undefined;
+        var parent = this._stack.length
+            ? this._stack[this._stack.length - 1]
+            : undefined;
 
         this._stack.push(node);
 
@@ -149,4 +151,3 @@ class Walker {
 }
 
 module.exports = Walker;
-
diff --git a/src/compiler/ast/ArrayContainer.js b/src/compiler/ast/ArrayContainer.js
index b545afdf5..0cb7e9be1 100644
--- a/src/compiler/ast/ArrayContainer.js
+++ b/src/compiler/ast/ArrayContainer.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 var isArray = Array.isArray;
-var Container = require('./Container');
+var Container = require("./Container");
 
 class ArrayContainer extends Container {
     constructor(node, array) {
@@ -12,7 +12,7 @@ class ArrayContainer extends Container {
 
     forEach(callback, thisObj) {
         var array = this.array.concat([]);
-        for (var i=0; i<array.length; i++) {
+        for (var i = 0; i < array.length; i++) {
             var item = array[i];
             if (item.container === this) {
                 callback.call(thisObj, item, i);
@@ -25,7 +25,7 @@ class ArrayContainer extends Container {
 
         var array = this.array;
         var len = array.length;
-        for (var i=0; i<len; i++) {
+        for (var i = 0; i < len; i++) {
             var curChild = array[i];
             if (curChild === oldChild) {
                 array[i] = newChild;
@@ -68,11 +68,11 @@ class ArrayContainer extends Container {
 
     insertChildBefore(newChild, referenceNode) {
         ok(newChild, '"newChild" is required"');
-        ok(referenceNode, 'Invalid reference child');
+        ok(referenceNode, "Invalid reference child");
 
         var array = this.array;
         var len = array.length;
-        for (var i=0; i<len; i++) {
+        for (var i = 0; i < len; i++) {
             var curChild = array[i];
             if (curChild === referenceNode) {
                 array.splice(i, 0, newChild);
@@ -81,33 +81,36 @@ class ArrayContainer extends Container {
             }
         }
 
-        throw new Error('Reference node not found');
+        throw new Error("Reference node not found");
     }
 
     insertChildAfter(newChild, referenceNode) {
         ok(newChild, '"newChild" is required"');
-        ok(referenceNode, 'Invalid reference child');
+        ok(referenceNode, "Invalid reference child");
 
         var array = this.array;
         var len = array.length;
-        for (var i=0; i<len; i++) {
+        for (var i = 0; i < len; i++) {
             var curChild = array[i];
             if (curChild === referenceNode) {
-                array.splice(i+1, 0, newChild);
+                array.splice(i + 1, 0, newChild);
                 newChild.container = this;
                 return;
             }
         }
 
-        throw new Error('Reference node not found');
+        throw new Error("Reference node not found");
     }
 
     moveChildrenTo(target) {
-        ok(target.appendChild, 'Node does not support appendChild(node): ' + target);
+        ok(
+            target.appendChild,
+            "Node does not support appendChild(node): " + target
+        );
 
         var array = this.array;
         var len = array.length;
-        for (var i=0; i<len; i++) {
+        for (var i = 0; i < len; i++) {
             var curChild = array[i];
             curChild.container = null; // Detach the child from this container
             target.appendChild(curChild);
@@ -118,50 +121,48 @@ class ArrayContainer extends Container {
 
     getPreviousSibling(node) {
         if (node.container !== this) {
-            throw new Error('Node does not belong to container: ' + node);
+            throw new Error("Node does not belong to container: " + node);
         }
         var array = this.array;
 
-
-
-        for (var i=0; i<array.length; i++) {
+        for (var i = 0; i < array.length; i++) {
             var curNode = array[i];
             if (curNode.container !== this) {
                 continue;
             }
 
             if (curNode === node) {
-                return i-1 >= 0 ? array[i-1] : undefined;
+                return i - 1 >= 0 ? array[i - 1] : undefined;
             }
         }
     }
 
     getNextSibling(node) {
         if (node.container !== this) {
-            throw new Error('Node does not belong to container: ' + node);
+            throw new Error("Node does not belong to container: " + node);
         }
         var array = this.array;
 
-        for (var i=0; i<array.length; i++) {
+        for (var i = 0; i < array.length; i++) {
             var curNode = array[i];
             if (curNode.container !== this) {
                 continue;
             }
 
             if (curNode === node) {
-                return i+1 < array.length ? array[i+1] : undefined;
+                return i + 1 < array.length ? array[i + 1] : undefined;
             }
         }
     }
 
     forEachNextSibling(node, callback, thisObj) {
         if (node.container !== this) {
-            throw new Error('Node does not belong to container: ' + node);
+            throw new Error("Node does not belong to container: " + node);
         }
         var array = this.array.concat([]);
         var found = false;
 
-        for (var i=0; i<array.length; i++) {
+        for (var i = 0; i < array.length; i++) {
             var curNode = array[i];
             if (curNode.container !== this) {
                 continue;
@@ -194,9 +195,9 @@ class ArrayContainer extends Container {
 
     set items(newItems) {
         if (newItems) {
-            ok(isArray(newItems), 'Invalid array');
+            ok(isArray(newItems), "Invalid array");
 
-            for (let i=0; i<newItems.length; i++) {
+            for (let i = 0; i < newItems.length; i++) {
                 newItems[i].container = this;
             }
         }
diff --git a/src/compiler/ast/ArrayExpression.js b/src/compiler/ast/ArrayExpression.js
index 716a0efd1..cb7235ff3 100644
--- a/src/compiler/ast/ArrayExpression.js
+++ b/src/compiler/ast/ArrayExpression.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ArrayExpression extends Node {
     constructor(def) {
-        super('ArrayExpression');
+        super("ArrayExpression");
         this.elements = def.elements;
     }
 
@@ -17,12 +17,12 @@ class ArrayExpression extends Node {
         var elements = this.elements;
 
         if (!elements || !elements.length) {
-            writer.write('[]');
+            writer.write("[]");
             return;
         }
 
         writer.incIndent();
-        writer.write('[\n');
+        writer.write("[\n");
         writer.incIndent();
 
         elements.forEach((element, i) => {
@@ -30,15 +30,15 @@ class ArrayExpression extends Node {
             writer.write(element);
 
             if (i < elements.length - 1) {
-                writer.write(',\n');
+                writer.write(",\n");
             } else {
-                writer.write('\n');
+                writer.write("\n");
             }
         });
 
         writer.decIndent();
         writer.writeLineIndent();
-        writer.write(']');
+        writer.write("]");
         writer.decIndent();
     }
 
@@ -48,25 +48,25 @@ class ArrayExpression extends Node {
 
     toJSON() {
         return {
-            type: 'ArrayExpression',
+            type: "ArrayExpression",
             elements: this.elements
         };
     }
 
     toString() {
-        var result = '[';
+        var result = "[";
         var elements = this.elements;
         if (elements) {
             elements.forEach((element, i) => {
                 if (i !== 0) {
-                    result += ', ';
+                    result += ", ";
                 }
                 result += element.toString();
             });
         }
 
-        return result + ']';
+        return result + "]";
     }
 }
 
-module.exports = ArrayExpression;
\ No newline at end of file
+module.exports = ArrayExpression;
diff --git a/src/compiler/ast/Assignment.js b/src/compiler/ast/Assignment.js
index 5160475ac..787093e29 100644
--- a/src/compiler/ast/Assignment.js
+++ b/src/compiler/ast/Assignment.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class Assignment extends Node {
     constructor(def) {
-        super('Assignment');
+        super("Assignment");
         this.left = def.left;
         this.right = def.right;
         this.operator = def.operator;
@@ -22,18 +22,18 @@ class Assignment extends Node {
         var operator = this.operator;
 
         writer.write(left);
-        writer.write(' '  + (operator || '=') + ' ');
+        writer.write(" " + (operator || "=") + " ");
 
         var wrap = right instanceof Assignment;
 
         if (wrap) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(right);
 
         if (wrap) {
-            writer.write(')');
+            writer.write(")");
         }
     }
 
@@ -58,22 +58,22 @@ class Assignment extends Node {
         var right = this.right;
         var operator = this.operator;
 
-        var result = left.toString() + ' ' + (operator || '=') + ' ';
+        var result = left.toString() + " " + (operator || "=") + " ";
 
         var wrap = right instanceof Assignment;
 
         if (wrap) {
-            result += '(';
+            result += "(";
         }
 
         result += right.toString();
 
         if (wrap) {
-            result += ')';
+            result += ")";
         }
 
         return result;
     }
 }
 
-module.exports = Assignment;
\ No newline at end of file
+module.exports = Assignment;
diff --git a/src/compiler/ast/AttributePlaceholder.js b/src/compiler/ast/AttributePlaceholder.js
index eb1702974..4ec00230d 100644
--- a/src/compiler/ast/AttributePlaceholder.js
+++ b/src/compiler/ast/AttributePlaceholder.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class AttributePlaceholder extends Node {
     constructor(def) {
-        super('AttributePlaceholder');
+        super("AttributePlaceholder");
         this.value = def.value;
         this.escape = def.escape;
     }
@@ -34,4 +34,4 @@ class AttributePlaceholder extends Node {
     }
 }
 
-module.exports = AttributePlaceholder;
\ No newline at end of file
+module.exports = AttributePlaceholder;
diff --git a/src/compiler/ast/BinaryExpression.js b/src/compiler/ast/BinaryExpression.js
index bec177cd1..cd28cb78d 100644
--- a/src/compiler/ast/BinaryExpression.js
+++ b/src/compiler/ast/BinaryExpression.js
@@ -1,35 +1,35 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 function writeCodeForOperand(node, writer) {
     var wrap = isCompoundExpression(node);
 
     if (wrap) {
-        writer.write('(');
+        writer.write("(");
     }
 
     writer.write(node);
 
     if (wrap) {
-        writer.write(')');
+        writer.write(")");
     }
 }
 
 function operandToString(node) {
     var wrap = isCompoundExpression(node);
 
-    var result = '';
+    var result = "";
 
     if (wrap) {
-        result += '(';
+        result += "(";
     }
 
     result += node.toString();
 
     if (wrap) {
-        result += ')';
+        result += ")";
     }
 
     return result;
@@ -37,7 +37,7 @@ function operandToString(node) {
 
 class BinaryExpression extends Node {
     constructor(def) {
-        super('BinaryExpression');
+        super("BinaryExpression");
         this.left = def.left;
         this.operator = def.operator;
         this.right = def.right;
@@ -52,19 +52,19 @@ class BinaryExpression extends Node {
         var operator = this.operator;
 
         if (!left || !right) {
-            throw new Error('Invalid BinaryExpression: ' + this);
+            throw new Error("Invalid BinaryExpression: " + this);
         }
 
         var builder = codegen.builder;
 
-        if (left.type === 'Literal' && right.type === 'Literal') {
-            if (operator === '+') {
+        if (left.type === "Literal" && right.type === "Literal") {
+            if (operator === "+") {
                 return builder.literal(left.value + right.value);
-            } else if (operator === '-') {
+            } else if (operator === "-") {
                 return builder.literal(left.value - right.value);
-            } else if (operator === '*') {
+            } else if (operator === "*") {
                 return builder.literal(left.value * right.value);
-            } else if (operator === '/') {
+            } else if (operator === "/") {
                 return builder.literal(left.value / right.value);
             }
         }
@@ -78,13 +78,13 @@ class BinaryExpression extends Node {
         var right = this.right;
 
         if (!left || !right) {
-            throw new Error('Invalid BinaryExpression: ' + this);
+            throw new Error("Invalid BinaryExpression: " + this);
         }
 
         writeCodeForOperand(left, writer);
-        writer.write(' ');
+        writer.write(" ");
         writer.write(operator);
-        writer.write(' ');
+        writer.write(" ");
         writeCodeForOperand(right, writer);
     }
 
@@ -94,7 +94,7 @@ class BinaryExpression extends Node {
 
     toJSON() {
         return {
-            type: 'BinaryExpression',
+            type: "BinaryExpression",
             left: this.left,
             operator: this.operator,
             right: this.right
@@ -112,11 +112,17 @@ class BinaryExpression extends Node {
         var right = this.right;
 
         if (!left || !right) {
-            throw new Error('Invalid BinaryExpression: ' + this);
+            throw new Error("Invalid BinaryExpression: " + this);
         }
 
-        return operandToString(left) + ' ' + operator + ' ' + operandToString(right);
+        return (
+            operandToString(left) +
+            " " +
+            operator +
+            " " +
+            operandToString(right)
+        );
     }
 }
 
-module.exports = BinaryExpression;
\ No newline at end of file
+module.exports = BinaryExpression;
diff --git a/src/compiler/ast/Code.js b/src/compiler/ast/Code.js
index 94b2524cb..d7b6fbdaa 100644
--- a/src/compiler/ast/Code.js
+++ b/src/compiler/ast/Code.js
@@ -1,15 +1,15 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var adjustIndent = require('../util/adjustIndent');
+var Node = require("./Node");
+var adjustIndent = require("../util/adjustIndent");
 
 class Code extends Node {
     constructor(def) {
-        super('Code');
+        super("Code");
         this.value = def.value;
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
@@ -26,4 +26,4 @@ class Code extends Node {
     }
 }
 
-module.exports = Code;
\ No newline at end of file
+module.exports = Code;
diff --git a/src/compiler/ast/Comment.js b/src/compiler/ast/Comment.js
index 1c48c51b7..254e08e60 100644
--- a/src/compiler/ast/Comment.js
+++ b/src/compiler/ast/Comment.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
-const Node = require('./Node');
+const Node = require("./Node");
 
 function _isMultilineComment(comment) {
-    return comment && comment.indexOf('\n') !== -1;
+    return comment && comment.indexOf("\n") !== -1;
 }
 
 class Comment extends Node {
     constructor(def) {
-        super('Comment');
+        super("Comment");
 
         const comment = def.comment;
 
@@ -19,7 +19,7 @@ class Comment extends Node {
         }
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
diff --git a/src/compiler/ast/ConditionalExpression.js b/src/compiler/ast/ConditionalExpression.js
index 8329bb287..9954ce94b 100644
--- a/src/compiler/ast/ConditionalExpression.js
+++ b/src/compiler/ast/ConditionalExpression.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ConditionalExpression extends Node {
     constructor(def) {
-        super('ConditionalExpression');
+        super("ConditionalExpression");
         this.test = def.test;
         this.consequent = def.consequent;
         this.alternate = def.alternate;
@@ -23,9 +23,9 @@ class ConditionalExpression extends Node {
         var alternate = this.alternate;
 
         writer.write(test);
-        writer.write(' ? ');
+        writer.write(" ? ");
         writer.write(consequent);
-        writer.write(' : ');
+        writer.write(" : ");
         writer.write(alternate);
     }
 
@@ -35,7 +35,7 @@ class ConditionalExpression extends Node {
 
     toJSON() {
         return {
-            type: 'ConditionalExpression',
+            type: "ConditionalExpression",
             test: this.test,
             consequent: this.consequent,
             alternate: this.alternate
@@ -52,8 +52,8 @@ class ConditionalExpression extends Node {
         var test = this.test;
         var consequent = this.consequent;
         var alternate = this.alternate;
-        return test.toString() + ' ? ' + consequent + ' : ' + alternate;
+        return test.toString() + " ? " + consequent + " : " + alternate;
     }
 }
 
-module.exports = ConditionalExpression;
\ No newline at end of file
+module.exports = ConditionalExpression;
diff --git a/src/compiler/ast/Container.js b/src/compiler/ast/Container.js
index 88d011423..bcf5aebe1 100644
--- a/src/compiler/ast/Container.js
+++ b/src/compiler/ast/Container.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class Container {
     constructor(node) {
@@ -10,4 +10,4 @@ class Container {
     }
 }
 
-module.exports = Container;
\ No newline at end of file
+module.exports = Container;
diff --git a/src/compiler/ast/ContainerNode.js b/src/compiler/ast/ContainerNode.js
index c1645e51a..bf3ca2e2f 100644
--- a/src/compiler/ast/ContainerNode.js
+++ b/src/compiler/ast/ContainerNode.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ContainerNode extends Node {
     constructor(type) {
@@ -17,4 +17,4 @@ class ContainerNode extends Node {
     }
 }
 
-module.exports = ContainerNode;
\ No newline at end of file
+module.exports = ContainerNode;
diff --git a/src/compiler/ast/CustomTag.js b/src/compiler/ast/CustomTag.js
index a1b5d1656..d8409edcc 100644
--- a/src/compiler/ast/CustomTag.js
+++ b/src/compiler/ast/CustomTag.js
@@ -1,35 +1,52 @@
-'use strict';
+"use strict";
 
-const HtmlElement = require('./HtmlElement');
-const removeDashes = require('../util/removeDashes');
-const safeVarName = require('../util/safeVarName');
-const ok = require('assert').ok;
-const Node = require('./Node');
+const HtmlElement = require("./HtmlElement");
+const removeDashes = require("../util/removeDashes");
+const safeVarName = require("../util/safeVarName");
+const ok = require("assert").ok;
+const Node = require("./Node");
 
-const CUSTOM_TAG_KEY = Symbol('CustomTag');
+const CUSTOM_TAG_KEY = Symbol("CustomTag");
 const HAS_RENDER_BODY_PROP_ADDED = Symbol();
 
 function getNestedVariables(elNode, tagDef, codegen) {
     let variableNames = [];
     if (tagDef.forEachVariable) {
-        tagDef.forEachVariable((nestedVar) => {
+        tagDef.forEachVariable(nestedVar => {
             let varName;
             if (nestedVar.nameFromAttribute) {
-                let possibleNameAttributes = nestedVar.nameFromAttribute.split(/\s+or\s+|\s*,\s*/i);
-                for (let i = 0, len = possibleNameAttributes.length; i < len; i++) {
+                let possibleNameAttributes = nestedVar.nameFromAttribute.split(
+                    /\s+or\s+|\s*,\s*/i
+                );
+                for (
+                    let i = 0, len = possibleNameAttributes.length;
+                    i < len;
+                    i++
+                ) {
                     let attrName = possibleNameAttributes[i];
                     let keep = false;
-                    if (attrName.endsWith('|keep')) {
+                    if (attrName.endsWith("|keep")) {
                         keep = true;
-                        attrName = attrName.slice(0, 0 - '|keep'.length);
+                        attrName = attrName.slice(0, 0 - "|keep".length);
                         possibleNameAttributes[i] = attrName;
                     }
                     varName = elNode.getAttributeValue(attrName);
                     if (varName) {
-                        if (varName.type !== 'Literal' || typeof varName.value !== 'string') {
-                            codegen.addError('The value of the ' + attrName + ' is expected to be a string');
-                            codegen.addError('Attribute ' + possibleNameAttributes.join(' or ') + ' is required');
-                            varName = '_var';    // Let it continue with errors
+                        if (
+                            varName.type !== "Literal" ||
+                            typeof varName.value !== "string"
+                        ) {
+                            codegen.addError(
+                                "The value of the " +
+                                    attrName +
+                                    " is expected to be a string"
+                            );
+                            codegen.addError(
+                                "Attribute " +
+                                    possibleNameAttributes.join(" or ") +
+                                    " is required"
+                            );
+                            varName = "_var"; // Let it continue with errors
                         }
 
                         varName = varName.value;
@@ -41,14 +58,18 @@ function getNestedVariables(elNode, tagDef, codegen) {
                     }
                 }
                 if (!varName) {
-                    codegen.addError('Attribute ' + possibleNameAttributes.join(' or ') + ' is required');
-                    varName = '_var';    // Let it continue with errors
+                    codegen.addError(
+                        "Attribute " +
+                            possibleNameAttributes.join(" or ") +
+                            " is required"
+                    );
+                    varName = "_var"; // Let it continue with errors
                 }
             } else {
                 varName = nestedVar.name;
                 if (!varName) {
-                    codegen.addError('Variable name is required');
-                    varName = '_var';    // Let it continue with errors
+                    codegen.addError("Variable name is required");
+                    varName = "_var"; // Let it continue with errors
                 }
             }
             variableNames.push(codegen.builder.identifier(varName));
@@ -56,7 +77,7 @@ function getNestedVariables(elNode, tagDef, codegen) {
     }
 
     if (elNode.additionalNestedVars.length) {
-        elNode.additionalNestedVars.forEach((varName) => {
+        elNode.additionalNestedVars.forEach(varName => {
             variableNames.push(codegen.builder.identifier(varName));
         });
     }
@@ -69,11 +90,11 @@ function getAllowedAttributesString(tagName, context) {
 
     let tagDef = context.taglibLookup.getTag(tagName);
     if (tagDef) {
-        tagDef.forEachAttribute((attrDef) => {
+        tagDef.forEachAttribute(attrDef => {
             attrNames.push(attrDef.name);
         });
 
-        return attrNames.length ? attrNames.join(', ') : '(none)';
+        return attrNames.length ? attrNames.join(", ") : "(none)";
     } else {
         return null;
     }
@@ -90,12 +111,13 @@ function checkIfNestedTagCanBeAddedDirectlyToInput(nestedTag, parentCustomTag) {
     }
 
     let tagName = nestedTag.tagDef.name;
-    let previousMatchingNestedTags = parentCustomTag._foundNestedTagsByName[tagName];
+    let previousMatchingNestedTags =
+        parentCustomTag._foundNestedTagsByName[tagName];
     if (!previousMatchingNestedTags) {
         return true;
     }
 
-    for (let i=0; i<previousMatchingNestedTags.length; i++) {
+    for (let i = 0; i < previousMatchingNestedTags.length; i++) {
         let previousNestedTag = previousMatchingNestedTags[i];
         if (!previousNestedTag._isDirectlyNestedTag) {
             return false;
@@ -106,43 +128,46 @@ function checkIfNestedTagCanBeAddedDirectlyToInput(nestedTag, parentCustomTag) {
 }
 
 function getNextNestedTagVarName(tagDef, context) {
-    let key = 'customTag' + tagDef.name;
+    let key = "customTag" + tagDef.name;
 
-    let nestedTagVarInfo = context.data[key] || (context.data[key] = {
-        next: 0
-    });
+    let nestedTagVarInfo =
+        context.data[key] ||
+        (context.data[key] = {
+            next: 0
+        });
 
-
-    return safeVarName(tagDef.name) + (nestedTagVarInfo.next++);
+    return safeVarName(tagDef.name) + nestedTagVarInfo.next++;
 }
 
 function getNextRenderBodyVar(context) {
-    let key = 'CustomTag_renderBodyVar';
-    let nextVarInfo = context.data[key] || (context.data[key] = {
-        next: 0
-    });
+    let key = "CustomTag_renderBodyVar";
+    let nextVarInfo =
+        context.data[key] ||
+        (context.data[key] = {
+            next: 0
+        });
 
-    return 'renderBodyConditional'+ (nextVarInfo.next++);
+    return "renderBodyConditional" + nextVarInfo.next++;
 }
 
 function processDirectlyNestedTags(node, codegen) {
-    node.forEachChild((child) => {
-        if (child.type === 'CustomTag') {
+    node.forEachChild(child => {
+        if (child.type === "CustomTag") {
             let customTag = child;
 
             let tagDef = customTag.resolveTagDef(codegen);
             if (tagDef.isNestedTag) {
                 customTag._isDirectlyNestedTag = true;
             }
-        } else if (child.type === 'If') {
-            if (child.nextSibling && child.nextSibling.type === 'Else') {
+        } else if (child.type === "If") {
+            if (child.nextSibling && child.nextSibling.type === "Else") {
                 return;
             }
 
             let ifNode = child;
 
             let childChild = child.childCount === 1 && child.firstChild;
-            if (childChild && childChild.type === 'CustomTag') {
+            if (childChild && childChild.type === "CustomTag") {
                 let customTag = childChild;
 
                 let tagDef = customTag.resolveTagDef(codegen);
@@ -170,15 +195,15 @@ function merge(props1, props2, context) {
         return props1;
     }
 
-    if (props2.type === 'ObjectExpression' && !props2.hasProperties()) {
+    if (props2.type === "ObjectExpression" && !props2.hasProperties()) {
         return props1;
     }
 
-    if (props1.type === 'ObjectExpression') {
-        let argProp = props1.getProperty('_arg');
+    if (props1.type === "ObjectExpression") {
+        let argProp = props1.getProperty("_arg");
 
         if (argProp) {
-            let mergeVar = context.helper('merge');
+            let mergeVar = context.helper("merge");
             argProp.value = context.builder.functionCall(mergeVar, [
                 props2, // Input props from the attributes take precedence
                 argProp.value
@@ -187,11 +212,11 @@ function merge(props1, props2, context) {
             return props1;
         }
 
-        if (props2.type === 'ObjectExpression') {
+        if (props2.type === "ObjectExpression") {
             props1.addProperties(props2.properties);
             return props1;
         } else {
-            let mergeVar = context.helper('merge');
+            let mergeVar = context.helper("merge");
 
             return context.builder.functionCall(mergeVar, [
                 props2, // Input props from the attributes take precedence
@@ -199,7 +224,7 @@ function merge(props1, props2, context) {
             ]);
         }
     } else {
-        let mergeVar = context.helper('merge');
+        let mergeVar = context.helper("merge");
         return context.builder.functionCall(mergeVar, [
             props2, // Input props from the attributes take precedence
             props1
@@ -210,7 +235,7 @@ function merge(props1, props2, context) {
 class CustomTag extends HtmlElement {
     constructor(el, tagDef) {
         super(el);
-        this.type = 'CustomTag';
+        this.type = "CustomTag";
         this.tagDef = tagDef;
         this.additionalNestedVars = [];
         this._nestedTagVar = null;
@@ -240,7 +265,10 @@ class CustomTag extends HtmlElement {
             if (!inputProps) {
                 inputProps = expr;
             } else {
-                inputProps = builder.functionCall(context.helper('merge'), [expr, inputProps]);
+                inputProps = builder.functionCall(context.helper("merge"), [
+                    expr,
+                    inputProps
+                ]);
             }
         }
 
@@ -260,7 +288,10 @@ class CustomTag extends HtmlElement {
                 // Dynamic attributes are allowed attributes
                 // that are not declared (i.e. "*" attributes)
                 //
-                if (attrDef.removeDashes === true || attrDef.preserveName === false) {
+                if (
+                    attrDef.removeDashes === true ||
+                    attrDef.preserveName === false
+                ) {
                     propName = removeDashes(attrName);
                 } else {
                     propName = attrName;
@@ -283,7 +314,9 @@ class CustomTag extends HtmlElement {
                             parentPropName = propChain[0];
                             propName = propChain[1];
                         } else {
-                            throw new Error('Invalid "target-property". Expected array with two elements in the following form: ["PARENT_PROPERTY_NAME", "CHILD_PROPERTY_NAME"]');
+                            throw new Error(
+                                'Invalid "target-property". Expected array with two elements in the following form: ["PARENT_PROPERTY_NAME", "CHILD_PROPERTY_NAME"]'
+                            );
                         }
                     }
                 } else if (attrDef.preserveName === true) {
@@ -293,16 +326,18 @@ class CustomTag extends HtmlElement {
                 }
             }
 
-            if (attrDef.type === 'path') {
+            if (attrDef.type === "path") {
                 attrValue = context.resolvePath(attrValue);
-            } else if (attrDef.type === 'template') {
+            } else if (attrDef.type === "template") {
                 attrValue = context.resolveTemplate(attrValue);
             }
 
             explicitAttrs = explicitAttrs || {};
 
             if (parentPropName) {
-                let parent = explicitAttrs[parentPropName] || (explicitAttrs[parentPropName] = {});
+                let parent =
+                    explicitAttrs[parentPropName] ||
+                    (explicitAttrs[parentPropName] = {});
                 parent[propName] = attrValue;
             } else {
                 explicitAttrs[propName] = attrValue;
@@ -312,33 +347,34 @@ class CustomTag extends HtmlElement {
         if (tagDef.forEachAttribute) {
             // Add default values for any attributes from the tag definition. These added properties may get overridden
             // by get overridden from the attributes found on the actual HTML element.
-            tagDef.forEachAttribute(function (attrDef) {
-                if (attrDef.hasOwnProperty('defaultValue')) {
+            tagDef.forEachAttribute(function(attrDef) {
+                if (attrDef.hasOwnProperty("defaultValue")) {
                     handleAttr(
                         attrDef.name,
                         context.builder.literal(attrDef.defaultValue),
-                        attrDef);
+                        attrDef
+                    );
                 }
             });
         }
 
-        
-
         let tagName = tagDef.isNestedTag ? tagDef.name : this.tagName;
 
         // Loop over the attributes found on the HTML element and add the corresponding properties
         // to the input object for the custom tag
-        this.forEachAttribute((attr) => {
+        this.forEachAttribute(attr => {
             let attrName = attr.name;
             if (!attrName && !attr.spread) {
                 return; // Skip attributes with no names
             }
 
-            if (attrName && typeof attrName !== 'string') {
+            if (attrName && typeof attrName !== "string") {
                 // Add a computed property since the attribute name is not
                 // a literal string.
                 computedAttrs = computedAttrs || [];
-                computedAttrs.push(builder.property(attrName, attr.value, true /* computed */));
+                computedAttrs.push(
+                    builder.property(attrName, attr.value, true /* computed */)
+                );
                 return;
             }
 
@@ -349,16 +385,28 @@ class CustomTag extends HtmlElement {
                 addAttrs(attr.value);
                 explicitAttrs = null;
             } else {
-                let attrDef = attr.def || context.taglibLookup.getAttribute(tagName, attrName) || tagDef.getAttribute(attr.name);
+                let attrDef =
+                    attr.def ||
+                    context.taglibLookup.getAttribute(tagName, attrName) ||
+                    tagDef.getAttribute(attr.name);
 
                 if (!attrDef) {
-                    let errorMessage = 'Unsupported attribute of "' + attrName + '" found on the <' + this.tagName + '> custom tag.';
-                    let allowedAttributesString = getAllowedAttributesString(tagName, context);
+                    let errorMessage =
+                        'Unsupported attribute of "' +
+                        attrName +
+                        '" found on the <' +
+                        this.tagName +
+                        "> custom tag.";
+                    let allowedAttributesString = getAllowedAttributesString(
+                        tagName,
+                        context
+                    );
                     if (allowedAttributesString) {
-                        errorMessage += ' Allowed attributes: ' + allowedAttributesString;
+                        errorMessage +=
+                            " Allowed attributes: " + allowedAttributesString;
                     }
 
-                    context.addError(this,  errorMessage);
+                    context.addError(this, errorMessage);
                     return; // Skip over attributes that are not supported
                 }
 
@@ -366,7 +414,6 @@ class CustomTag extends HtmlElement {
             }
         });
 
-
         if (tagDef.forEachImportedVariable) {
             // Imported variables are used to add input properties to a custom tag based on data/variables
             // found in the compiled template
@@ -400,17 +447,26 @@ class CustomTag extends HtmlElement {
         if (this.argument) {
             let argExpression = builder.parseExpression(this.argument);
             inputProps = merge(argExpression, inputProps, context);
-            context.deprecate('Using <tag(attrs)> to pass dynamic attributes is deprecated. use ...attrs instead.');
+            context.deprecate(
+                "Using <tag(attrs)> to pass dynamic attributes is deprecated. use ...attrs instead."
+            );
         }
 
         if (this.dynamicAttributes) {
-            this.dynamicAttributes.forEach((dynamicAttributesExpression) => {
-                inputProps = merge(dynamicAttributesExpression, inputProps, context);
+            this.dynamicAttributes.forEach(dynamicAttributesExpression => {
+                inputProps = merge(
+                    dynamicAttributesExpression,
+                    inputProps,
+                    context
+                );
             });
         }
 
         if (this._hasDynamicNestedTags) {
-            inputProps = builder.functionCall(context.helper('mergeNestedTagsHelper'), [ inputProps ]);
+            inputProps = builder.functionCall(
+                context.helper("mergeNestedTagsHelper"),
+                [inputProps]
+            );
         }
 
         this._inputProps = inputProps;
@@ -422,34 +478,45 @@ class CustomTag extends HtmlElement {
         let context = codegen.context;
         let tagDef = this.tagDef;
         if (!tagDef) {
-            if (this.tagName && this.tagName.startsWith('@')) {
+            if (this.tagName && this.tagName.startsWith("@")) {
                 let parentCustomTag = context.getData(CUSTOM_TAG_KEY);
 
                 if (!parentCustomTag) {
-                    codegen.addError('Invalid usage of the <' + this.tagName + '> nested tag. Tag not nested within a custom tag.');
+                    codegen.addError(
+                        "Invalid usage of the <" +
+                            this.tagName +
+                            "> nested tag. Tag not nested within a custom tag."
+                    );
                     return null;
                 }
 
                 let parentTagDef = parentCustomTag.tagDef;
                 if (!parentTagDef) {
-                    throw new Error('"tagDef" is expected for CustomTag: ' + parentCustomTag.tagName);
+                    throw new Error(
+                        '"tagDef" is expected for CustomTag: ' +
+                            parentCustomTag.tagName
+                    );
                 }
 
                 let nestedTagName = this.tagName.substring(1);
 
-                let fullyQualifiedName = parentCustomTag.tagDef.name + ':' + nestedTagName;
+                let fullyQualifiedName =
+                    parentCustomTag.tagDef.name + ":" + nestedTagName;
                 tagDef = this.tagDef = context.getTagDef(fullyQualifiedName);
                 if (!tagDef) {
                     // This nested tag is not declared, but we will allow it to go through
-                    let taglibLoader = require('../taglib-loader');
-                    tagDef = this.tagDef = taglibLoader.loadTag({
-                        name: fullyQualifiedName,
-                        attributes: {
-                            '*': {
-                                targetProperty: null
+                    let taglibLoader = require("../taglib-loader");
+                    tagDef = this.tagDef = taglibLoader.loadTag(
+                        {
+                            name: fullyQualifiedName,
+                            attributes: {
+                                "*": {
+                                    targetProperty: null
+                                }
                             }
-                        }
-                    }, context.filename);
+                        },
+                        context.filename
+                    );
 
                     tagDef.isNestedTag = true;
                     tagDef.isRepeated = false;
@@ -472,7 +539,8 @@ class CustomTag extends HtmlElement {
     addNestedTag(nestedTag) {
         let tagName = nestedTag.tagDef.name;
 
-        let byNameArray = this._foundNestedTagsByName[tagName] ||
+        let byNameArray =
+            this._foundNestedTagsByName[tagName] ||
             (this._foundNestedTagsByName[tagName] = []);
 
         byNameArray.push(nestedTag);
@@ -487,7 +555,9 @@ class CustomTag extends HtmlElement {
     }
 
     hasProp(name) {
-        return this._additionalProps && this._additionalProps.hasOwnProperty(name);
+        return (
+            this._additionalProps && this._additionalProps.hasOwnProperty(name)
+        );
     }
 
     addProp(name, value) {
@@ -498,7 +568,7 @@ class CustomTag extends HtmlElement {
     }
 
     setRendererPath(path) {
-        ok(typeof path === 'string', '"path" should be a string');
+        ok(typeof path === "string", '"path" should be a string');
         this._rendererPath = path;
     }
 
@@ -525,50 +595,66 @@ class CustomTag extends HtmlElement {
         let renderTagNode;
 
         let isNestedTag = tagDef.isNestedTag === true;
-        let tagVarName = tagDef.name + (isNestedTag ? '_nested_tag' : '_tag');
+        let tagVarName = tagDef.name + (isNestedTag ? "_nested_tag" : "_tag");
         let rendererPath = this._rendererPath || tagDef.renderer;
         let rendererRequirePath;
         let requireRendererFunctionCall;
 
         if (rendererPath) {
             rendererRequirePath = context.getRequirePath(rendererPath);
-            requireRendererFunctionCall = builder.require(JSON.stringify(rendererRequirePath));
+            requireRendererFunctionCall = builder.require(
+                JSON.stringify(rendererRequirePath)
+            );
         } else {
             requireRendererFunctionCall = builder.literal(null);
         }
 
         if (tagDef.template) {
             let templateRequirePath = context.getRequirePath(tagDef.template);
-            let templateVar = context.importTemplate(templateRequirePath, tagDef.name + '_template');
+            let templateVar = context.importTemplate(
+                templateRequirePath,
+                tagDef.name + "_template"
+            );
 
-            let loadTag = builder.functionCall(context.helper('loadTag'), [templateVar]);
+            let loadTag = builder.functionCall(context.helper("loadTag"), [
+                templateVar
+            ]);
             let tagVar = codegen.addStaticVar(tagVarName, loadTag);
 
-            renderTagNode = this.generateRenderTagCode(codegen, tagVar, [ inputProps, builder.identifierOut() ]);
+            renderTagNode = this.generateRenderTagCode(codegen, tagVar, [
+                inputProps,
+                builder.identifierOut()
+            ]);
         } else {
             if (rendererRequirePath) {
-                codegen.pushMeta('tags', rendererRequirePath, true);
+                codegen.pushMeta("tags", rendererRequirePath, true);
             }
 
             let loadTag;
             let tagArgs;
 
             if (isNestedTag) {
-                let loadTagArgs = [ builder.literal(tagDef.targetProperty) ];
+                let loadTagArgs = [builder.literal(tagDef.targetProperty)];
 
                 if (tagDef.isRepeated) {
                     loadTagArgs.push(builder.literal(1)); // isRepeated
                 }
 
-                loadTag = builder.functionCall(context.helper('loadNestedTag'), loadTagArgs);
+                loadTag = builder.functionCall(
+                    context.helper("loadNestedTag"),
+                    loadTagArgs
+                );
 
-                tagArgs = [inputProps, parentCustomTag.getNestedTagVar(context) ];
+                tagArgs = [
+                    inputProps,
+                    parentCustomTag.getNestedTagVar(context)
+                ];
             } else {
-                loadTag = builder.functionCall(context.helper('loadTag'), [
+                loadTag = builder.functionCall(context.helper("loadTag"), [
                     requireRendererFunctionCall // The first param is the renderer
                 ]);
 
-                tagArgs = [inputProps, builder.identifierOut() ];
+                tagArgs = [inputProps, builder.identifierOut()];
             }
 
             let tagVar = codegen.addStaticVar(tagVarName, loadTag);
@@ -576,7 +662,11 @@ class CustomTag extends HtmlElement {
             if (isNestedTag) {
                 renderTagNode = builder.functionCall(tagVar, tagArgs);
             } else {
-                renderTagNode = this.generateRenderTagCode(codegen, tagVar, tagArgs);
+                renderTagNode = this.generateRenderTagCode(
+                    codegen,
+                    tagVar,
+                    tagArgs
+                );
             }
         }
 
@@ -595,18 +685,26 @@ class CustomTag extends HtmlElement {
             if (tagDef.bodyFunction) {
                 let bodyFunction = tagDef.bodyFunction;
                 let bodyFunctionName = bodyFunction.name;
-                let bodyFunctionParams = bodyFunction.params.map(function(param) {
+                let bodyFunctionParams = bodyFunction.params.map(function(
+                    param
+                ) {
                     return builder.identifier(param);
                 });
 
-                return builder.functionDeclaration(bodyFunctionName, bodyFunctionParams, body);
+                return builder.functionDeclaration(
+                    bodyFunctionName,
+                    bodyFunctionParams,
+                    body
+                );
             } else {
                 renderBodyFunction = context.builder.renderBodyFunction(body);
                 if (this._hasDynamicNestedTags) {
                     renderBodyFunction.params.push(this._nestedTagVar);
                 } else {
                     if (nestedVariableNames && nestedVariableNames.length) {
-                        renderBodyFunction.params = renderBodyFunction.params.concat(nestedVariableNames);
+                        renderBodyFunction.params = renderBodyFunction.params.concat(
+                            nestedVariableNames
+                        );
                     }
                 }
             }
@@ -616,7 +714,7 @@ class CustomTag extends HtmlElement {
     }
 
     generateCode(codegen) {
-        if (this.type !== 'CustomTag') {
+        if (this.type !== "CustomTag") {
             throw new Error(this.type);
         }
         let builder = codegen.builder;
@@ -642,10 +740,19 @@ class CustomTag extends HtmlElement {
             parentCustomTag = context.getData(CUSTOM_TAG_KEY);
             if (!parentCustomTag) {
                 if (tagDef.parentTagName) {
-                    console.error(new Error(this.tagName + ' not nested in ' + tagDef.parentTagName));
-                    codegen.addError(`Invalid usage of the <${this.tagName}> nested tag. Tag not nested within a <${tagDef.parentTagName}> tag.`);
+                    codegen.addError(
+                        `Invalid usage of the <${
+                            this.tagName
+                        }> nested tag. Tag not nested within a <${
+                            tagDef.parentTagName
+                        }> tag.`
+                    );
                 } else {
-                    codegen.addError(`Invalid usage of the <${this.tagName}> nested tag. Tag not nested within a custom tag.`);
+                    codegen.addError(
+                        `Invalid usage of the <${
+                            this.tagName
+                        }> nested tag. Tag not nested within a custom tag.`
+                    );
                 }
 
                 return null;
@@ -655,19 +762,23 @@ class CustomTag extends HtmlElement {
 
             let hasBody = body && body.length;
 
-            if (hasBody && context.isServerTarget() && !parentCustomTag.isFlagSet(HAS_RENDER_BODY_PROP_ADDED)) {
+            if (
+                hasBody &&
+                context.isServerTarget() &&
+                !parentCustomTag.isFlagSet(HAS_RENDER_BODY_PROP_ADDED)
+            ) {
                 parentCustomTag.setFlag(HAS_RENDER_BODY_PROP_ADDED);
 
                 let hasRenderBodyKey = context.addStaticVar(
-                    'hasRenderBodyKey',
+                    "hasRenderBodyKey",
                     builder.functionCall(
                         builder.memberExpression(
-                            builder.identifier('Symbol'),
-                            builder.identifier('for')
+                            builder.identifier("Symbol"),
+                            builder.identifier("for")
                         ),
-                        [
-                            builder.literal('hasRenderBody')
-                        ]));
+                        [builder.literal("hasRenderBody")]
+                    )
+                );
 
                 // We flag tags that have a `renderBody` function on the input
                 // since those tags must be handled differently if it happens to
@@ -675,29 +786,46 @@ class CustomTag extends HtmlElement {
                 // be serializable (functions are not serializable). If know
                 // that a top-level UI component has non-serializable input
                 // then we won't use it as the browser-side re-render root
-                parentCustomTag.setAttributeValue(hasRenderBodyKey, codegen.builder.literal(true));
+                parentCustomTag.setAttributeValue(
+                    hasRenderBodyKey,
+                    codegen.builder.literal(true)
+                );
             }
 
-            if (checkIfNestedTagCanBeAddedDirectlyToInput(this, parentCustomTag)) {
-                let renderBody = hasBody ? builder.renderBodyFunction(body) : null;
+            if (
+                checkIfNestedTagCanBeAddedDirectlyToInput(this, parentCustomTag)
+            ) {
+                let renderBody = hasBody
+                    ? builder.renderBodyFunction(body)
+                    : null;
                 let additionalAttrs = renderBody ? { renderBody } : null;
                 let inputProps = this.buildInputProps(codegen, additionalAttrs);
 
                 if (tagDef.isRepeated) {
-                    let currentValue = parentCustomTag.getAttributeValue(tagDef.targetProperty);
+                    let currentValue = parentCustomTag.getAttributeValue(
+                        tagDef.targetProperty
+                    );
                     if (currentValue) {
                         currentValue.elements.push(inputProps);
                     } else {
-                        parentCustomTag.setAttributeValue(tagDef.targetProperty, builder.arrayExpression([
-                            inputProps
-                        ]));
+                        parentCustomTag.setAttributeValue(
+                            tagDef.targetProperty,
+                            builder.arrayExpression([inputProps])
+                        );
                     }
                 } else {
                     let nestedTagValue = inputProps;
                     if (this._condition) {
-                        nestedTagValue = builder.binaryExpression(this._condition, '&&', nestedTagValue);
+                        nestedTagValue = builder.binaryExpression(
+                            this._condition,
+                            "&&",
+                            nestedTagValue
+                        );
                     }
-                    parentCustomTag.setAttributeValue(tagDef.targetProperty, nestedTagValue);
+                    parentCustomTag.setAttributeValue(
+                        tagDef.targetProperty,
+                        nestedTagValue
+                    );
                 }
 
                 return null;
@@ -716,39 +844,47 @@ class CustomTag extends HtmlElement {
 
         if (renderBody && bodyOnlyIf) {
             // Move the renderBody function into a local variable
-            renderBodyFunctionVarIdentifier = builder.identifier(getNextRenderBodyVar(context));
-            renderBodyFunctionVar = builder.var(renderBodyFunctionVarIdentifier, renderBody);
+            renderBodyFunctionVarIdentifier = builder.identifier(
+                getNextRenderBodyVar(context)
+            );
+            renderBodyFunctionVar = builder.var(
+                renderBodyFunctionVarIdentifier,
+                renderBody
+            );
             renderBody = renderBodyFunctionVarIdentifier;
         }
 
         let additionalAttrs;
-        
+
         if (renderBody) {
             if (tagDef.bodyFunction) {
                 let bodyFunctionName = tagDef.bodyFunction.name;
-                additionalAttrs = { [bodyFunctionName]:renderBody };
+                additionalAttrs = { [bodyFunctionName]: renderBody };
             } else {
                 additionalAttrs = { renderBody };
             }
         }
 
         let inputProps = this.buildInputProps(codegen, additionalAttrs);
-        let renderTagNode = this.generateRenderNode(codegen, tagDef, inputProps, parentCustomTag);
+        let renderTagNode = this.generateRenderNode(
+            codegen,
+            tagDef,
+            inputProps,
+            parentCustomTag
+        );
 
         if (bodyOnlyIf && renderBodyFunctionVar) {
             let ifStatement = builder.ifStatement(
                 bodyOnlyIf,
                 [
-                    builder.functionCall(renderBodyFunctionVarIdentifier, [builder.identifierOut()])
+                    builder.functionCall(renderBodyFunctionVarIdentifier, [
+                        builder.identifierOut()
+                    ])
                 ],
-                builder.elseStatement([
-                    renderTagNode
-                ]));
+                builder.elseStatement([renderTagNode])
+            );
 
-            return [
-                renderBodyFunctionVar,
-                ifStatement
-            ];
+            return [renderBodyFunctionVar, ifStatement];
         } else {
             return renderTagNode;
         }
diff --git a/src/compiler/ast/Declaration.js b/src/compiler/ast/Declaration.js
index 4877d69ec..24c0aeb91 100644
--- a/src/compiler/ast/Declaration.js
+++ b/src/compiler/ast/Declaration.js
@@ -1,9 +1,9 @@
-'use strict';
-var Node = require('./Node');
+"use strict";
+var Node = require("./Node");
 
 class Declaration extends Node {
     constructor(def) {
-        super('Declaration');
+        super("Declaration");
         this.declaration = def.declaration;
     }
 
@@ -11,9 +11,9 @@ class Declaration extends Node {
         var builder = codegen.builder;
 
         return [
-            builder.htmlLiteral('<?'),
+            builder.htmlLiteral("<?"),
             codegen.generateCode(builder.text(this.declaration)),
-            builder.htmlLiteral('?>')
+            builder.htmlLiteral("?>")
         ];
     }
 
@@ -25,4 +25,4 @@ class Declaration extends Node {
     }
 }
 
-module.exports = Declaration;
\ No newline at end of file
+module.exports = Declaration;
diff --git a/src/compiler/ast/DocumentType.js b/src/compiler/ast/DocumentType.js
index adf381637..117eda028 100644
--- a/src/compiler/ast/DocumentType.js
+++ b/src/compiler/ast/DocumentType.js
@@ -1,9 +1,9 @@
-'use strict';
-var Node = require('./Node');
+"use strict";
+var Node = require("./Node");
 
 class DocumentType extends Node {
     constructor(def) {
-        super('DocumentType');
+        super("DocumentType");
         this.documentType = def.documentType;
     }
 
@@ -11,13 +11,13 @@ class DocumentType extends Node {
         var builder = codegen.builder;
 
         return [
-            builder.htmlLiteral('<!'),
+            builder.htmlLiteral("<!"),
             builder.html(codegen.generateCode(this.documentType)),
-            builder.htmlLiteral('>')
+            builder.htmlLiteral(">")
         ];
     }
 
-    generateVDOMCode(codegen) {
+    generateVDOMCode() {
         return null;
     }
 
diff --git a/src/compiler/ast/Else.js b/src/compiler/ast/Else.js
index d1bed7e9b..9cb5c7dac 100644
--- a/src/compiler/ast/Else.js
+++ b/src/compiler/ast/Else.js
@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class Else extends Node {
     constructor(def) {
-        super('Else');
+        super("Else");
         this.body = this.makeContainer(def.body);
         this.matched = false;
     }
 
     generateCode(codegen) {
         if (!this.matched) {
-            codegen.addError('Unmatched else statement');
+            codegen.addError("Unmatched else statement");
             return;
         }
 
@@ -22,7 +22,7 @@ class Else extends Node {
     writeCode(writer) {
         var body = this.body;
         writer.writeBlock(body);
-        writer.write('\n');
+        writer.write("\n");
     }
 
     walk(walker) {
@@ -30,4 +30,4 @@ class Else extends Node {
     }
 }
 
-module.exports = Else;
\ No newline at end of file
+module.exports = Else;
diff --git a/src/compiler/ast/ElseIf.js b/src/compiler/ast/ElseIf.js
index cb103757e..e931d8a41 100644
--- a/src/compiler/ast/ElseIf.js
+++ b/src/compiler/ast/ElseIf.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ElseIf extends Node {
     constructor(def) {
-        super('ElseIf');
+        super("ElseIf");
         this.test = def.test;
         this.body = this.makeContainer(def.body);
         this.else = def.else;
@@ -13,7 +13,7 @@ class ElseIf extends Node {
 
     generateCode(codegen) {
         if (!this.matched) {
-            codegen.addError('Unmatched else statement');
+            codegen.addError("Unmatched else statement");
             return;
         }
 
@@ -27,4 +27,4 @@ class ElseIf extends Node {
     }
 }
 
-module.exports = ElseIf;
\ No newline at end of file
+module.exports = ElseIf;
diff --git a/src/compiler/ast/Expression.js b/src/compiler/ast/Expression.js
index 01803a7d9..dbc76e315 100644
--- a/src/compiler/ast/Expression.js
+++ b/src/compiler/ast/Expression.js
@@ -1,16 +1,16 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var ok = require('assert').ok;
+var Node = require("./Node");
+var ok = require("assert").ok;
 
 class Expression extends Node {
     constructor(def) {
-        super('Expression');
+        super("Expression");
         this.value = def.value;
-        ok(this.value != null, 'Invalid expression');
+        ok(this.value != null, "Invalid expression");
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
@@ -27,4 +27,4 @@ class Expression extends Node {
     }
 }
 
-module.exports = Expression;
\ No newline at end of file
+module.exports = Expression;
diff --git a/src/compiler/ast/ForEach.js b/src/compiler/ast/ForEach.js
index bde1ec391..8ea85f173 100644
--- a/src/compiler/ast/ForEach.js
+++ b/src/compiler/ast/ForEach.js
@@ -1,10 +1,10 @@
-'use strict';
-var ok = require('assert').ok;
-var Node = require('./Node');
+"use strict";
+var ok = require("assert").ok;
+var Node = require("./Node");
 
 class ForEach extends Node {
     constructor(def) {
-        super('ForEach');
+        super("ForEach");
         this.varName = def.varName;
         this.in = def.in;
         this.body = this.makeContainer(def.body);
@@ -28,7 +28,7 @@ class ForEach extends Node {
         var isArray = this.isArray;
 
         if (separator && !statusVarName) {
-            statusVarName = '__loop';
+            statusVarName = "__loop";
         }
 
         if (iterator) {
@@ -43,13 +43,16 @@ class ForEach extends Node {
                 builder.functionDeclaration(null, params, this.body)
             ]);
         } else if (statusVarName) {
-
             let body = this.body;
 
             if (separator) {
                 let isNotLastTest = builder.functionCall(
-                    builder.memberExpression(statusVarName, builder.identifier('isLast')),
-                    []);
+                    builder.memberExpression(
+                        statusVarName,
+                        builder.identifier("isLast")
+                    ),
+                    []
+                );
 
                 isNotLastTest = builder.negate(isNotLastTest);
 
@@ -60,34 +63,58 @@ class ForEach extends Node {
                 ]);
             }
 
-            return builder.functionCall(context.helper('forEachWithStatusVar'), [
-                inExpression,
-                builder.functionDeclaration(null, [varName, statusVarName], body)
-            ]);
+            return builder.functionCall(
+                context.helper("forEachWithStatusVar"),
+                [
+                    inExpression,
+                    builder.functionDeclaration(
+                        null,
+                        [varName, statusVarName],
+                        body
+                    )
+                ]
+            );
         } else {
             if (isArray) {
                 context.addVar(varName.name);
-                var indexVarId = context.addVar(varName.name + '__i');
-                var arrayVarId = context.addVar(varName.name + '__array');
-                var lengthVarId = context.addVar(varName.name + '__len');
+                var indexVarId = context.addVar(varName.name + "__i");
+                var arrayVarId = context.addVar(varName.name + "__array");
+                var lengthVarId = context.addVar(varName.name + "__len");
 
                 var init = builder.sequenceExpression([
                     builder.assignment(indexVarId, builder.literal(0)),
                     builder.assignment(arrayVarId, inExpression),
-                    builder.assignment(lengthVarId, builder.binaryExpression(arrayVarId, '&&', builder.memberExpression(arrayVarId, builder.identifier('length'))))
+                    builder.assignment(
+                        lengthVarId,
+                        builder.binaryExpression(
+                            arrayVarId,
+                            "&&",
+                            builder.memberExpression(
+                                arrayVarId,
+                                builder.identifier("length")
+                            )
+                        )
+                    )
                 ]);
 
-                var test = builder.binaryExpression(indexVarId, '<', lengthVarId);
+                var test = builder.binaryExpression(
+                    indexVarId,
+                    "<",
+                    lengthVarId
+                );
 
-                var update = builder.unaryExpression(indexVarId, '++');
+                var update = builder.unaryExpression(indexVarId, "++");
 
                 var loopBody = [
-                        builder.assignment(varName, builder.memberExpression(arrayVarId, indexVarId, true))
-                    ].concat(this.body);
+                    builder.assignment(
+                        varName,
+                        builder.memberExpression(arrayVarId, indexVarId, true)
+                    )
+                ].concat(this.body);
 
                 return builder.forStatement(init, test, update, loopBody);
             } else {
-                return builder.functionCall(context.helper('forEach'), [
+                return builder.functionCall(context.helper("forEach"), [
                     inExpression,
                     builder.functionDeclaration(null, [varName], this.body)
                 ]);
@@ -105,4 +132,4 @@ class ForEach extends Node {
     }
 }
 
-module.exports = ForEach;
\ No newline at end of file
+module.exports = ForEach;
diff --git a/src/compiler/ast/ForEachProp.js b/src/compiler/ast/ForEachProp.js
index e7fe6fce9..e7cf6bfc2 100644
--- a/src/compiler/ast/ForEachProp.js
+++ b/src/compiler/ast/ForEachProp.js
@@ -1,10 +1,10 @@
-'use strict';
-var ok = require('assert').ok;
-var Node = require('./Node');
+"use strict";
+var ok = require("assert").ok;
+var Node = require("./Node");
 
 class ForEachProp extends Node {
     constructor(def) {
-        super('ForEachProp');
+        super("ForEachProp");
         this.nameVarName = def.nameVarName;
         this.valueVarName = def.valueVarName;
         this.in = def.in;
@@ -27,20 +27,27 @@ class ForEachProp extends Node {
         var statusVarName = this.statusVarName;
 
         if (separator && !statusVarName) {
-            statusVarName = '__loop';
+            statusVarName = "__loop";
         }
 
         var builder = codegen.builder;
 
         if (statusVarName) {
-            let helperVar = context.helper('forEachPropStatusVar');
-            let forEachVarName = codegen.addStaticVar('forEacPropStatusVar', helperVar);
+            let helperVar = context.helper("forEachPropStatusVar");
+            let forEachVarName = codegen.addStaticVar(
+                "forEacPropStatusVar",
+                helperVar
+            );
             let body = this.body;
 
             if (separator) {
                 let isNotLastTest = builder.functionCall(
-                    builder.memberExpression(statusVarName, builder.identifier('isLast')),
-                    []);
+                    builder.memberExpression(
+                        statusVarName,
+                        builder.identifier("isLast")
+                    ),
+                    []
+                );
 
                 isNotLastTest = builder.negate(isNotLastTest);
 
@@ -53,15 +60,21 @@ class ForEachProp extends Node {
 
             return builder.functionCall(forEachVarName, [
                 inExpression,
-                builder.functionDeclaration(null, [nameVarName, valueVarName, statusVarName], body)
+                builder.functionDeclaration(
+                    null,
+                    [nameVarName, valueVarName, statusVarName],
+                    body
+                )
             ]);
         } else {
-            return builder.functionCall(
-                context.helper('forEachProp'),
-                [
-                    inExpression,
-                    builder.functionDeclaration(null, [nameVarName, valueVarName], body)
-                ]);
+            return builder.functionCall(context.helper("forEachProp"), [
+                inExpression,
+                builder.functionDeclaration(
+                    null,
+                    [nameVarName, valueVarName],
+                    body
+                )
+            ]);
         }
     }
 
@@ -73,4 +86,4 @@ class ForEachProp extends Node {
     }
 }
 
-module.exports = ForEachProp;
\ No newline at end of file
+module.exports = ForEachProp;
diff --git a/src/compiler/ast/ForRange.js b/src/compiler/ast/ForRange.js
index 6bfa9bfce..bef35087e 100644
--- a/src/compiler/ast/ForRange.js
+++ b/src/compiler/ast/ForRange.js
@@ -1,12 +1,12 @@
-'use strict';
-var ok = require('assert').ok;
-var Node = require('./Node');
-var Literal = require('./Literal');
-var Identifier = require('./Identifier');
+"use strict";
+var ok = require("assert").ok;
+var Node = require("./Node");
+var Literal = require("./Literal");
+var Identifier = require("./Identifier");
 
 class ForRange extends Node {
     constructor(def) {
-        super('ForRange');
+        super("ForRange");
         this.varName = def.varName;
         this.body = this.makeContainer(def.body);
         this.from = def.from;
@@ -32,10 +32,13 @@ class ForRange extends Node {
         }
 
         if (step == null) {
-            let fromLiteral = (from instanceof Literal) && from.value;
-            let toLiteral = (to instanceof Literal) && to.value;
+            let fromLiteral = from instanceof Literal && from.value;
+            let toLiteral = to instanceof Literal && to.value;
 
-            if (typeof fromLiteral === 'number' && typeof toLiteral === 'number') {
+            if (
+                typeof fromLiteral === "number" &&
+                typeof toLiteral === "number"
+            ) {
                 if (fromLiteral > toLiteral) {
                     step = builder.literal(-1);
                 } else {
@@ -48,7 +51,7 @@ class ForRange extends Node {
             step = builder.literalNull();
         }
 
-        return builder.functionCall(context.helper('forRange'), [
+        return builder.functionCall(context.helper("forRange"), [
             from,
             to,
             step,
@@ -65,4 +68,4 @@ class ForRange extends Node {
     }
 }
 
-module.exports = ForRange;
\ No newline at end of file
+module.exports = ForRange;
diff --git a/src/compiler/ast/ForStatement.js b/src/compiler/ast/ForStatement.js
index 4e86d1319..2bb1ef5f6 100644
--- a/src/compiler/ast/ForStatement.js
+++ b/src/compiler/ast/ForStatement.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ForStatement extends Node {
     constructor(def) {
-        super('ForStatement');
+        super("ForStatement");
         this.init = def.init;
         this.test = def.test;
         this.update = def.update;
@@ -25,29 +25,29 @@ class ForStatement extends Node {
         var update = this.update;
         var body = this.body;
 
-        writer.write('for (');
+        writer.write("for (");
 
         if (init) {
             writer.write(init);
         }
 
-        writer.write('; ');
+        writer.write("; ");
 
         if (test) {
             writer.write(test);
         }
 
-        writer.write('; ');
+        writer.write("; ");
 
         if (update) {
             writer.write(update);
         }
 
-        writer.write(') ');
+        writer.write(") ");
 
         writer.writeBlock(body);
 
-        writer.write('\n');
+        writer.write("\n");
     }
 
     walk(walker) {
@@ -58,4 +58,4 @@ class ForStatement extends Node {
     }
 }
 
-module.exports = ForStatement;
\ No newline at end of file
+module.exports = ForStatement;
diff --git a/src/compiler/ast/FunctionCall.js b/src/compiler/ast/FunctionCall.js
index 78f3127c9..c7d0e048a 100644
--- a/src/compiler/ast/FunctionCall.js
+++ b/src/compiler/ast/FunctionCall.js
@@ -1,27 +1,32 @@
-'use strict';
-var ok = require('assert').ok;
+"use strict";
+var ok = require("assert").ok;
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 class FunctionCall extends Node {
     constructor(def) {
-        super('FunctionCall');
+        super("FunctionCall");
         this.callee = def.callee;
 
         ok(this.callee, '"callee" is required');
 
-        let args = this.args = def.args;
+        let args = (this.args = def.args);
 
         if (args) {
             if (!Array.isArray(args)) {
-                throw new Error('Invalid args');
+                throw new Error("Invalid args");
             }
 
-            for (let i=0; i<args.length; i++) {
+            for (let i = 0; i < args.length; i++) {
                 let arg = args[i];
                 if (!arg) {
-                    throw new Error('Arg ' + i + ' is not valid for function call: ' + JSON.stringify(this.toJSON(), null, 2));
+                    throw new Error(
+                        "Arg " +
+                            i +
+                            " is not valid for function call: " +
+                            JSON.stringify(this.toJSON(), null, 2)
+                    );
                 }
             }
         }
@@ -41,34 +46,37 @@ class FunctionCall extends Node {
         var wrapWithParens = isCompoundExpression(callee);
 
         if (wrapWithParens) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(callee);
 
         if (wrapWithParens) {
-            writer.write(')');
+            writer.write(")");
         }
 
-        writer.write('(');
+        writer.write("(");
 
         if (args && args.length) {
-            for (let i=0, argsLen = args.length; i<argsLen; i++) {
+            for (let i = 0, argsLen = args.length; i < argsLen; i++) {
                 if (i !== 0) {
-                    writer.write(', ');
+                    writer.write(", ");
                 }
 
                 let arg = args[i];
                 if (!arg) {
-                    throw new Error('Arg ' + i + ' is not valid for function call: ' + JSON.stringify(this.toJSON()));
+                    throw new Error(
+                        "Arg " +
+                            i +
+                            " is not valid for function call: " +
+                            JSON.stringify(this.toJSON())
+                    );
                 }
                 writer.write(arg);
             }
         }
 
-        writer.write(')');
-
-
+        writer.write(")");
     }
 
     walk(walker) {
@@ -80,25 +88,30 @@ class FunctionCall extends Node {
         var callee = this.callee;
         var args = this.args;
 
-        var result = callee.toString() + '(';
+        var result = callee.toString() + "(";
 
         if (args && args.length) {
-            for (let i=0, argsLen = args.length; i<argsLen; i++) {
+            for (let i = 0, argsLen = args.length; i < argsLen; i++) {
                 if (i !== 0) {
-                    result += ', ';
+                    result += ", ";
                 }
 
                 let arg = args[i];
                 if (!arg) {
-                    throw new Error('Arg ' + i + ' is not valid for function call: ' + JSON.stringify(this.toJSON()));
+                    throw new Error(
+                        "Arg " +
+                            i +
+                            " is not valid for function call: " +
+                            JSON.stringify(this.toJSON())
+                    );
                 }
                 result += arg;
             }
         }
 
-        result += ')';
+        result += ")";
         return result;
     }
 }
 
-module.exports = FunctionCall;
\ No newline at end of file
+module.exports = FunctionCall;
diff --git a/src/compiler/ast/FunctionDeclaration.js b/src/compiler/ast/FunctionDeclaration.js
index 675ab37ad..884471985 100644
--- a/src/compiler/ast/FunctionDeclaration.js
+++ b/src/compiler/ast/FunctionDeclaration.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var ok = require('assert').ok;
+var Node = require("./Node");
+var ok = require("assert").ok;
 
 class FunctionDeclaration extends Node {
     constructor(def) {
-        super('FunctionDeclaration');
+        super("FunctionDeclaration");
         this.name = def.name;
         this.params = def.params;
         this.body = this.makeContainer(def.body);
@@ -26,41 +26,49 @@ class FunctionDeclaration extends Node {
         var statement = this.statement;
 
         if (name != null) {
-            ok(typeof name === 'string' || name.type === 'Identifier', 'Function name should be a string or Identifier');
+            ok(
+                typeof name === "string" || name.type === "Identifier",
+                "Function name should be a string or Identifier"
+            );
         }
 
         if (name) {
-            writer.write('function ');
+            writer.write("function ");
             writer.write(name);
-            writer.write('(');
+            writer.write("(");
         } else {
-            writer.write('function(');
+            writer.write("function(");
         }
 
         if (params && params.length) {
-            for (let i=0, paramsLen = params.length; i<paramsLen; i++) {
+            for (let i = 0, paramsLen = params.length; i < paramsLen; i++) {
                 if (i !== 0) {
-                    writer.write(', ');
+                    writer.write(", ");
                 }
                 var param = params[i];
 
-                if (typeof param === 'string') {
+                if (typeof param === "string") {
                     writer.write(param);
                 } else {
-                    if (param.type !== 'Identifier') {
-                        throw new Error('Illegal param ' + JSON.stringify(param) + ' for FunctionDeclaration: ' + JSON.stringify(this));
+                    if (param.type !== "Identifier") {
+                        throw new Error(
+                            "Illegal param " +
+                                JSON.stringify(param) +
+                                " for FunctionDeclaration: " +
+                                JSON.stringify(this)
+                        );
                     }
                     writer.write(param);
                 }
             }
         }
 
-        writer.write(') ');
+        writer.write(") ");
 
         writer.writeBlock(body);
 
         if (statement) {
-            writer.write('\n');
+            writer.write("\n");
         }
     }
 
@@ -75,4 +83,4 @@ class FunctionDeclaration extends Node {
     }
 }
 
-module.exports = FunctionDeclaration;
\ No newline at end of file
+module.exports = FunctionDeclaration;
diff --git a/src/compiler/ast/Html.js b/src/compiler/ast/Html.js
index 6504e56fe..786edd10f 100644
--- a/src/compiler/ast/Html.js
+++ b/src/compiler/ast/Html.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var Literal = require('./Literal');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var Literal = require("./Literal");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 class Html extends Node {
     constructor(def) {
-        super('Html');
+        super("Html");
         this.argument = def.argument;
     }
 
@@ -15,7 +15,7 @@ class Html extends Node {
 
         if (Array.isArray(argument)) {
             var len = argument.length;
-            var last = argument[len-1];
+            var last = argument[len - 1];
 
             if (last instanceof Literal && appendArgument instanceof Literal) {
                 last.value += appendArgument.value;
@@ -23,10 +23,13 @@ class Html extends Node {
                 this.argument.push(appendArgument);
             }
         } else {
-            if (argument instanceof Literal && appendArgument instanceof Literal) {
+            if (
+                argument instanceof Literal &&
+                appendArgument instanceof Literal
+            ) {
                 argument.value += appendArgument.value;
             } else {
-                this.argument = [ this.argument, appendArgument ];
+                this.argument = [this.argument, appendArgument];
             }
         }
     }
@@ -54,29 +57,29 @@ class Html extends Node {
         if (Array.isArray(argument)) {
             let args = argument;
 
-            for (let i=0, len=args.length; i<len; i++) {
+            for (let i = 0, len = args.length; i < len; i++) {
                 let arg = args[i];
 
                 if (i === 0) {
-                    writer.write('out.w(');
+                    writer.write("out.w(");
                 } else {
-                    writer.write(' +\n');
+                    writer.write(" +\n");
                     writer.writeLineIndent();
                     writer.writeIndent();
                 }
 
                 if (isCompoundExpression(arg)) {
-                    writer.write(['(', arg, ')']);
+                    writer.write(["(", arg, ")"]);
                 } else {
                     writer.write(arg);
                 }
             }
 
-            writer.write(')');
+            writer.write(")");
         } else {
-            writer.write('out.w(');
+            writer.write("out.w(");
             writer.write(argument);
-            writer.write(')');
+            writer.write(")");
         }
     }
 
@@ -85,4 +88,4 @@ class Html extends Node {
     }
 }
 
-module.exports = Html;
\ No newline at end of file
+module.exports = Html;
diff --git a/src/compiler/ast/HtmlAttribute/html/generateCode.js b/src/compiler/ast/HtmlAttribute/html/generateCode.js
index 063853dcf..7588615de 100644
--- a/src/compiler/ast/HtmlAttribute/html/generateCode.js
+++ b/src/compiler/ast/HtmlAttribute/html/generateCode.js
@@ -1,23 +1,22 @@
-'use strict';
+"use strict";
 
-var runtimeHtmlHelpers = require('../../../../runtime/html/helpers');
+var runtimeHtmlHelpers = require("../../../../runtime/html/helpers");
 var attr = runtimeHtmlHelpers.a;
 var escapeXmlAttr = runtimeHtmlHelpers.xa;
 
 function isStringLiteral(node) {
-    return node.type === 'Literal' && typeof node.value === 'string';
+    return node.type === "Literal" && typeof node.value === "string";
 }
 
 function isNoEscapeXml(node) {
-    return node.type === 'AttributePlaceholder' &&
-        node.escape === false;
+    return node.type === "AttributePlaceholder" && node.escape === false;
 }
 
 function flattenAttrConcats(node) {
     // return [node];
 
     function flattenHelper(node) {
-        if (node.type === 'BinaryExpression' && node.operator === '+') {
+        if (node.type === "BinaryExpression" && node.operator === "+") {
             let left = flattenHelper(node.left);
             let right = flattenHelper(node.right);
 
@@ -34,11 +33,11 @@ function flattenAttrConcats(node) {
                     concats: [node]
                 };
             }
-
         }
 
         return {
-            isString: isStringLiteral(node) || node.type === 'AttributePlaceholder',
+            isString:
+                isStringLiteral(node) || node.type === "AttributePlaceholder",
             concats: [node]
         };
     }
@@ -63,36 +62,52 @@ function generateCodeForExpressionAttr(name, value, escape, codegen) {
         finalNodes.push(builder.htmlLiteral(value));
     }
 
-
-    for (let i=0; i<flattenedConcats.length; i++) {
-        if (flattenedConcats[i].type === 'Literal' || flattenedConcats[i].type === 'AttributePlaceholder') {
+    for (let i = 0; i < flattenedConcats.length; i++) {
+        if (
+            flattenedConcats[i].type === "Literal" ||
+            flattenedConcats[i].type === "AttributePlaceholder"
+        ) {
             hasLiteral = true;
             break;
         }
     }
 
     if (hasLiteral) {
-        addHtmlLiteral(' ' + name + '="');
-        for (let i=0; i<flattenedConcats.length; i++) {
+        addHtmlLiteral(" " + name + '="');
+        for (let i = 0; i < flattenedConcats.length; i++) {
             var part = flattenedConcats[i];
             if (isStringLiteral(part)) {
                 part.value = escapeXmlAttr(part.value);
-            } else if (part.type === 'Literal') {
-            } else if (isNoEscapeXml(part)) {
-                part = codegen.builder.functionCall(context.helper('str'), [part]);
-            } else {
-                if (escape !== false) {
-                    part = builder.functionCall(context.helper('escapeXmlAttr'), [part]);
+            } else if (part.type !== "Literal") {
+                if (isNoEscapeXml(part)) {
+                    part = codegen.builder.functionCall(context.helper("str"), [
+                        part
+                    ]);
+                } else {
+                    if (escape !== false) {
+                        part = builder.functionCall(
+                            context.helper("escapeXmlAttr"),
+                            [part]
+                        );
+                    }
                 }
             }
             addHtml(part);
         }
         addHtmlLiteral('"');
     } else {
-        if (name === 'class') {
-            addHtml(codegen.builder.functionCall(context.helper('classAttr'), [value]));
-        } else if (name === 'style') {
-            addHtml(codegen.builder.functionCall(context.helper('styleAttr'), [value]));
+        if (name === "class") {
+            addHtml(
+                codegen.builder.functionCall(context.helper("classAttr"), [
+                    value
+                ])
+            );
+        } else if (name === "style") {
+            addHtml(
+                codegen.builder.functionCall(context.helper("styleAttr"), [
+                    value
+                ])
+            );
         } else {
             if (escape === false || isNoEscapeXml(value)) {
                 escape = false;
@@ -104,7 +119,9 @@ function generateCodeForExpressionAttr(name, value, escape, codegen) {
                 attrArgs.push(codegen.builder.literal(false));
             }
 
-            addHtml(codegen.builder.functionCall(context.helper('attr'), attrArgs));
+            addHtml(
+                codegen.builder.functionCall(context.helper("attr"), attrArgs)
+            );
         }
     }
 
@@ -134,12 +151,12 @@ module.exports = function generateCode(node, codegen) {
         return generateCodeForExpressionAttr(name, value, escape, codegen);
     } else if (argument) {
         return [
-            builder.htmlLiteral(' ' + name + '('),
+            builder.htmlLiteral(" " + name + "("),
             builder.htmlLiteral(argument),
-            builder.htmlLiteral(')')
+            builder.htmlLiteral(")")
         ];
     } else {
         // Attribute with no value is a boolean attribute
-        return builder.htmlLiteral(' ' + name);
+        return builder.htmlLiteral(" " + name);
     }
 };
diff --git a/src/compiler/ast/HtmlAttribute/index.js b/src/compiler/ast/HtmlAttribute/index.js
index 11eb8d369..48dd708ce 100644
--- a/src/compiler/ast/HtmlAttribute/index.js
+++ b/src/compiler/ast/HtmlAttribute/index.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-var Node = require('../Node');
-var Literal = require('../Literal');
-var ok = require('assert').ok;
-var compiler = require('../../');
-var generateHTMLCode = require('./html/generateCode');
-var generateVDOMCode = require('./vdom/generateCode');
-var vdomUtil = require('../../util/vdom');
+var Node = require("../Node");
+var Literal = require("../Literal");
+var ok = require("assert").ok;
+var compiler = require("../../");
+var generateHTMLCode = require("./html/generateCode");
+var generateVDOMCode = require("./vdom/generateCode");
+var vdomUtil = require("../../util/vdom");
 
 function beforeGenerateCode(event) {
     event.codegen.isInAttribute = true;
@@ -18,17 +18,17 @@ function afterGenerateCode(event) {
 
 class HtmlAttribute extends Node {
     constructor(def) {
-        super('HtmlAttribute');
+        super("HtmlAttribute");
 
-        ok(def, 'Invalid attribute definition');
-        this.type = 'HtmlAttribute';
+        ok(def, "Invalid attribute definition");
+        this.type = "HtmlAttribute";
         this.name = def.name;
         this.value = def.value;
         this.rawValue = def.rawValue;
         this.escape = def.escape;
         this.spread = def.spread;
 
-        if (typeof this.value === 'string') {
+        if (typeof this.value === "string") {
             this.value = compiler.builder.parseExpression(this.value);
         }
 
@@ -40,8 +40,8 @@ class HtmlAttribute extends Node {
 
         this.def = def.def; // The attribute definition loaded from the taglib (if any)
 
-        this.on('beforeGenerateCode', beforeGenerateCode);
-        this.on('afterGenerateCode', afterGenerateCode);
+        this.on("beforeGenerateCode", beforeGenerateCode);
+        this.on("afterGenerateCode", afterGenerateCode);
     }
 
     generateHTMLCode(codegen) {
@@ -57,13 +57,11 @@ class HtmlAttribute extends Node {
     }
 
     isLiteralString() {
-        return this.isLiteralValue() &&
-            typeof this.value.value === 'string';
+        return this.isLiteralValue() && typeof this.value.value === "string";
     }
 
     isLiteralBoolean() {
-        return this.isLiteralValue() &&
-            typeof this.value.value === 'boolean';
+        return this.isLiteralValue() && typeof this.value.value === "boolean";
     }
 
     walk(walker) {
@@ -74,13 +72,16 @@ class HtmlAttribute extends Node {
         if (this.isLiteralValue()) {
             return this.value.value;
         } else {
-            throw new Error('Attribute value is not a literal value. Actual: ' + JSON.stringify(this.value, null, 2));
+            throw new Error(
+                "Attribute value is not a literal value. Actual: " +
+                    JSON.stringify(this.value, null, 2)
+            );
         }
     }
 }
 
 HtmlAttribute.isHtmlAttribute = function(attr) {
-    return (attr instanceof HtmlAttribute);
+    return attr instanceof HtmlAttribute;
 };
 
-module.exports = HtmlAttribute;
\ No newline at end of file
+module.exports = HtmlAttribute;
diff --git a/src/compiler/ast/HtmlAttribute/vdom/generateCode.js b/src/compiler/ast/HtmlAttribute/vdom/generateCode.js
index 9b094545f..174cbe6bc 100644
--- a/src/compiler/ast/HtmlAttribute/vdom/generateCode.js
+++ b/src/compiler/ast/HtmlAttribute/vdom/generateCode.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 module.exports = function generateCode(node, codegen, vdomUtil) {
     var context = codegen.context;
@@ -12,20 +12,24 @@ module.exports = function generateCode(node, codegen, vdomUtil) {
     var attrValue = node.value;
 
     if (attrValue) {
-        if (attrValue.type === 'Literal') {
+        if (attrValue.type === "Literal") {
             var literalValue = attrValue.value;
 
             if (literalValue instanceof RegExp) {
                 node.value = builder.literal(literalValue.source);
             }
         } else {
-            if (name === 'class') {
-                node.value = builder.functionCall(context.helper('classAttr'), [attrValue]);
-            } else if (name === 'style') {
-                node.value = builder.functionCall(context.helper('styleAttr'), [attrValue]);
+            if (name === "class") {
+                node.value = builder.functionCall(context.helper("classAttr"), [
+                    attrValue
+                ]);
+            } else if (name === "style") {
+                node.value = builder.functionCall(context.helper("styleAttr"), [
+                    attrValue
+                ]);
             }
         }
     }
 
     return node;
-};
\ No newline at end of file
+};
diff --git a/src/compiler/ast/HtmlAttributeCollection.js b/src/compiler/ast/HtmlAttributeCollection.js
index e5c5c6505..e9d62264a 100644
--- a/src/compiler/ast/HtmlAttributeCollection.js
+++ b/src/compiler/ast/HtmlAttributeCollection.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 
-var HtmlAttribute = require('./HtmlAttribute');
-var Node = require('./Node');
+var HtmlAttribute = require("./HtmlAttribute");
+var Node = require("./Node");
 
 class HtmlAttributeCollection {
     constructor(attributes) {
@@ -21,9 +21,9 @@ class HtmlAttributeCollection {
 
         var name = newAttr.name;
 
-        if (typeof name === 'string') {
+        if (typeof name === "string") {
             if (this.lookup.hasOwnProperty(name)) {
-                for (var i=0; i<this.all.length; i++) {
+                for (var i = 0; i < this.all.length; i++) {
                     var curAttr = this.all[i];
                     if (curAttr.name === name) {
                         this.all.splice(i, 1);
@@ -40,7 +40,7 @@ class HtmlAttributeCollection {
     }
 
     removeAttribute(name) {
-        ok(typeof name === 'string', 'Invalid attribute name');
+        ok(typeof name === "string", "Invalid attribute name");
 
         if (!this.lookup.hasOwnProperty(name)) {
             return false;
@@ -48,7 +48,7 @@ class HtmlAttributeCollection {
 
         delete this.lookup[name];
 
-        for (var i=0; i<this.all.length; i++) {
+        for (var i = 0; i < this.all.length; i++) {
             var curAttr = this.all[i];
             if (curAttr.name === name) {
                 this.all.splice(i, 1);
@@ -77,7 +77,7 @@ class HtmlAttributeCollection {
     }
 
     hasAttribute(name) {
-        ok(typeof name === 'string', 'Invalid attribute name');
+        ok(typeof name === "string", "Invalid attribute name");
         return this.lookup.hasOwnProperty(name);
     }
 
@@ -93,7 +93,7 @@ class HtmlAttributeCollection {
         var attr = this.getAttribute(name);
         if (attr) {
             attr.value = value;
-            if (typeof escape === 'boolean') {
+            if (typeof escape === "boolean") {
                 attr.escape = escape;
             }
         } else {
@@ -123,7 +123,7 @@ class HtmlAttributeCollection {
 
         if (attributes) {
             if (Array.isArray(attributes)) {
-                attributes.forEach((attr) => {
+                attributes.forEach(attr => {
                     this.addAttribute(attr);
                 });
             } else {
@@ -132,7 +132,11 @@ class HtmlAttributeCollection {
                         let attrValue = attributes[attrName];
                         let attrDef;
 
-                        if (attrValue != null && typeof attrValue === 'object' && !(attrValue instanceof Node)) {
+                        if (
+                            attrValue != null &&
+                            typeof attrValue === "object" &&
+                            !(attrValue instanceof Node)
+                        ) {
                             attrDef = attrValue;
                             attrDef.name = attrName;
                         } else {
diff --git a/src/compiler/ast/HtmlComment.js b/src/compiler/ast/HtmlComment.js
index 65d79d95a..a37b57498 100644
--- a/src/compiler/ast/HtmlComment.js
+++ b/src/compiler/ast/HtmlComment.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class HtmlComment extends Node {
     constructor(def) {
-        super('HtmlComment');
+        super("HtmlComment");
         this.comment = def.comment;
     }
 
@@ -13,9 +13,9 @@ class HtmlComment extends Node {
         var builder = codegen.builder;
 
         return [
-            builder.htmlLiteral('<!--'),
+            builder.htmlLiteral("<!--"),
             builder.html(comment),
-            builder.htmlLiteral('-->')
+            builder.htmlLiteral("-->")
         ];
     }
 
@@ -32,8 +32,10 @@ class HtmlComment extends Node {
         return builder.functionCall(
             builder.memberExpression(
                 builder.identifierOut(),
-                builder.identifier('comment')),
-            commentArgs);
+                builder.identifier("comment")
+            ),
+            commentArgs
+        );
     }
 
     walk(walker) {
diff --git a/src/compiler/ast/HtmlElement/html/EndTag.js b/src/compiler/ast/HtmlElement/html/EndTag.js
index 2bd1c77e4..4c2a1ba5b 100644
--- a/src/compiler/ast/HtmlElement/html/EndTag.js
+++ b/src/compiler/ast/HtmlElement/html/EndTag.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('../../Node');
+var Node = require("../../Node");
 
 class EndTag extends Node {
     constructor(def) {
-        super('EndTag');
+        super("EndTag");
         this.tagName = def.tagName;
     }
 
@@ -13,11 +13,11 @@ class EndTag extends Node {
         var builder = codegen.builder;
 
         return [
-            builder.htmlLiteral('</'),
+            builder.htmlLiteral("</"),
             builder.html(tagName),
-            builder.htmlLiteral('>')
+            builder.htmlLiteral(">")
         ];
     }
 }
 
-module.exports = EndTag;
\ No newline at end of file
+module.exports = EndTag;
diff --git a/src/compiler/ast/HtmlElement/html/StartTag.js b/src/compiler/ast/HtmlElement/html/StartTag.js
index 76766baf9..32a609a39 100644
--- a/src/compiler/ast/HtmlElement/html/StartTag.js
+++ b/src/compiler/ast/HtmlElement/html/StartTag.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('../../Node');
+var Node = require("../../Node");
 
 class StartTag extends Node {
     constructor(def) {
-        super('StartTag');
+        super("StartTag");
 
         this.tagName = def.tagName;
         this.attributes = def.attributes;
@@ -22,32 +22,32 @@ class StartTag extends Node {
         var dynamicAttributes = this.dynamicAttributes;
         var context = codegen.context;
 
-        var nodes = [
-            builder.htmlLiteral('<'),
-            builder.html(tagName),
-        ];
+        var nodes = [builder.htmlLiteral("<"), builder.html(tagName)];
 
         var attributes = this.attributes;
 
         if (attributes) {
             var hasSpread = attributes.find(attr => attr.spread);
             if (!hasSpread) {
-                for (let i=0; i<attributes.length; i++) {
+                for (let i = 0; i < attributes.length; i++) {
                     let attr = attributes[i];
                     nodes.push(codegen.generateCode(attr));
                 }
             } else {
                 let explicitAttrs = null;
                 let attrsExpression = null;
-                let addAttrs = (expr) => {
+                let addAttrs = expr => {
                     if (!attrsExpression) {
                         attrsExpression = expr;
                     } else {
-                        attrsExpression = builder.functionCall(context.helper('merge'), [expr, attrsExpression]);
+                        attrsExpression = builder.functionCall(
+                            context.helper("merge"),
+                            [expr, attrsExpression]
+                        );
                     }
                 };
 
-                for (let i=0; i<attributes.length; i++) {
+                for (let i = 0; i < attributes.length; i++) {
                     let attr = attributes[i];
                     if (attr.spread) {
                         if (explicitAttrs) {
@@ -65,7 +65,10 @@ class StartTag extends Node {
                     addAttrs(builder.objectExpression(explicitAttrs));
                 }
 
-                let attrsFunctionCall = builder.functionCall(context.helper('attrs'), [attrsExpression]);
+                let attrsFunctionCall = builder.functionCall(
+                    context.helper("attrs"),
+                    [attrsExpression]
+                );
                 nodes.push(builder.html(attrsFunctionCall));
             }
         }
@@ -73,15 +76,18 @@ class StartTag extends Node {
         // deprecated
         if (dynamicAttributes) {
             dynamicAttributes.forEach(function(attrsExpression) {
-                let attrsFunctionCall = builder.functionCall(context.helper('attrs'), [attrsExpression]);
+                let attrsFunctionCall = builder.functionCall(
+                    context.helper("attrs"),
+                    [attrsExpression]
+                );
                 nodes.push(builder.html(attrsFunctionCall));
             });
         }
 
         if (selfClosed) {
-            nodes.push(builder.htmlLiteral('/>'));
+            nodes.push(builder.htmlLiteral("/>"));
         } else {
-            nodes.push(builder.htmlLiteral('>'));
+            nodes.push(builder.htmlLiteral(">"));
         }
 
         return nodes;
diff --git a/src/compiler/ast/HtmlElement/html/generateCode.js b/src/compiler/ast/HtmlElement/html/generateCode.js
index 76124be1d..952747f58 100644
--- a/src/compiler/ast/HtmlElement/html/generateCode.js
+++ b/src/compiler/ast/HtmlElement/html/generateCode.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-var StartTag = require('./StartTag');
-var EndTag = require('./EndTag');
+var StartTag = require("./StartTag");
+var EndTag = require("./EndTag");
 
 module.exports = function generateCode(node, codegen) {
     var builder = codegen.builder;
@@ -17,15 +17,18 @@ module.exports = function generateCode(node, codegen) {
     var properties = node.getProperties();
 
     if (properties) {
-        var objectProps = Object.keys(properties).map((propName) => {
+        var objectProps = Object.keys(properties).map(propName => {
             return builder.property(
                 builder.identifier(propName),
-                properties[propName]);
+                properties[propName]
+            );
         });
 
-        node.setAttributeValue('data-marko',
+        node.setAttributeValue(
+            "data-marko",
             builder.objectExpression(objectProps),
-            false);
+            false
+        );
     }
 
     var attributes = node._attributes && node._attributes.all;
@@ -46,7 +49,7 @@ module.exports = function generateCode(node, codegen) {
     if (hasBody || bodyOnlyIf) {
         openTagOnly = false;
         selfClosed = false;
-    } else if (selfClosed){
+    } else if (selfClosed) {
         openTagOnly = true;
     }
 
@@ -70,12 +73,17 @@ module.exports = function generateCode(node, codegen) {
 
     if (isCustomElement && attributes && attributes.length) {
         propertiesScript = builder.functionCall(
-            codegen.context.helper('propsForPreviousNode'),
+            codegen.context.helper("propsForPreviousNode"),
             [
-                builder.objectExpression(attributes.map((attr) =>
-                    builder.property(builder.identifier(attr.name), attr.value)
-                )),
-                builder.identifier('out')
+                builder.objectExpression(
+                    attributes.map(attr =>
+                        builder.property(
+                            builder.identifier(attr.name),
+                            attr.value
+                        )
+                    )
+                ),
+                builder.identifier("out")
             ]
         );
     }
@@ -89,24 +97,12 @@ module.exports = function generateCode(node, codegen) {
             endTag,
             propertiesScript
         ]);
-        return [
-            startIf,
-            body,
-            endIf
-        ];
+        return [startIf, body, endIf];
     } else {
         if (openTagOnly) {
-            return [
-                codegen.generateCode(startTag),
-                propertiesScript
-            ];
+            return [codegen.generateCode(startTag), propertiesScript];
         } else {
-            return [
-                startTag,
-                body,
-                endTag,
-                propertiesScript
-            ];
+            return [startTag, body, endTag, propertiesScript];
         }
     }
 };
diff --git a/src/compiler/ast/HtmlElement/index.js b/src/compiler/ast/HtmlElement/index.js
index 05533562f..9008dd752 100644
--- a/src/compiler/ast/HtmlElement/index.js
+++ b/src/compiler/ast/HtmlElement/index.js
@@ -1,26 +1,27 @@
-'use strict';
+"use strict";
 
-var Node = require('../Node');
-var Literal = require('../Literal');
-var HtmlAttributeCollection = require('../HtmlAttributeCollection');
-var generateHTMLCode = require('./html/generateCode');
-var generateVDOMCode = require('./vdom/generateCode');
-var vdomUtil = require('../../util/vdom');
+var Node = require("../Node");
+var Literal = require("../Literal");
+var HtmlAttributeCollection = require("../HtmlAttributeCollection");
+var generateHTMLCode = require("./html/generateCode");
+var generateVDOMCode = require("./vdom/generateCode");
+var vdomUtil = require("../../util/vdom");
 
 function beforeGenerateCode(event) {
     var tagName = event.node.tagName;
     var context = event.context;
 
-    var tagDef = typeof tagName === 'string' ? context.getTagDef(tagName) : undefined;
-    if (tagDef && tagDef.htmlType === 'svg') {
-        context.pushFlag('SVG');
+    var tagDef =
+        typeof tagName === "string" ? context.getTagDef(tagName) : undefined;
+    if (tagDef && tagDef.htmlType === "svg") {
+        context.pushFlag("SVG");
     }
 
-    if (tagName === 'script') {
-        context.pushFlag('SCRIPT_BODY');
+    if (tagName === "script") {
+        context.pushFlag("SCRIPT_BODY");
     }
-    if (tagName === 'style') {
-        context.pushFlag('STYLE_BODY');
+    if (tagName === "style") {
+        context.pushFlag("STYLE_BODY");
     }
 }
 
@@ -28,23 +29,24 @@ function afterGenerateCode(event) {
     var tagName = event.node.tagName;
     var context = event.context;
 
-    var tagDef = typeof tagName === 'string' ? context.getTagDef(tagName) : undefined;
+    var tagDef =
+        typeof tagName === "string" ? context.getTagDef(tagName) : undefined;
 
-    if (tagDef && tagDef.htmlType === 'svg') {
-        context.popFlag('SVG');
+    if (tagDef && tagDef.htmlType === "svg") {
+        context.popFlag("SVG");
     }
 
-    if (tagName === 'script') {
-        context.popFlag('SCRIPT_BODY');
+    if (tagName === "script") {
+        context.popFlag("SCRIPT_BODY");
     }
-    if (tagName === 'style') {
-        context.popFlag('STYLE_BODY');
+    if (tagName === "style") {
+        context.popFlag("STYLE_BODY");
     }
 }
 
 class HtmlElement extends Node {
     constructor(def) {
-        super('HtmlElement');
+        super("HtmlElement");
         this.tagName = null;
         this.tagNameExpression = null;
         this.setTagName(def.tagName);
@@ -65,8 +67,8 @@ class HtmlElement extends Node {
         this.runtimeFlags = 0; // Runtime flags are used to flag VDOM nodes with important information (flags are OR'd together)
         this.key = undefined;
 
-        this.on('beforeGenerateCode', beforeGenerateCode);
-        this.on('afterGenerateCode', afterGenerateCode);
+        this.on("beforeGenerateCode", beforeGenerateCode);
+        this.on("afterGenerateCode", afterGenerateCode);
     }
 
     addRuntimeFlag(value) {
@@ -112,7 +114,8 @@ class HtmlElement extends Node {
     }
 
     getAttributeValue(name) {
-        var attr = this._attributes != null && this._attributes.getAttribute(name);
+        var attr =
+            this._attributes != null && this._attributes.getAttribute(name);
         if (attr) {
             return attr.value;
         }
@@ -127,7 +130,7 @@ class HtmlElement extends Node {
             return;
         }
 
-        for(var attrName in attrs) {
+        for (var attrName in attrs) {
             var attrValue = attrs[attrName];
             this.setAttributeValue(attrName, attrValue);
         }
@@ -177,7 +180,7 @@ class HtmlElement extends Node {
     forEachAttribute(callback, thisObj) {
         var attributes = this._attributes.all.concat([]);
 
-        for (let i=0, len=attributes.length; i<len; i++) {
+        for (let i = 0, len = attributes.length; i < len; i++) {
             callback.call(thisObj, attributes[i]);
         }
     }
@@ -193,8 +196,8 @@ class HtmlElement extends Node {
             } else {
                 this.tagNameExpression = tagName;
             }
-        } else if (typeof tagName === 'string') {
-            this.tagNameExpression = new Literal({value: tagName});
+        } else if (typeof tagName === "string") {
+            this.tagNameExpression = new Literal({ value: tagName });
             this.tagName = tagName;
         }
     }
diff --git a/src/compiler/ast/HtmlElement/vdom/EndElementVDOM.js b/src/compiler/ast/HtmlElement/vdom/EndElementVDOM.js
index 0fcde13db..9eb734e01 100644
--- a/src/compiler/ast/HtmlElement/vdom/EndElementVDOM.js
+++ b/src/compiler/ast/HtmlElement/vdom/EndElementVDOM.js
@@ -1,14 +1,14 @@
-'use strict';
-const Node = require('../../Node');
+"use strict";
+const Node = require("../../Node");
 
 class EndElementVDOM extends Node {
     constructor() {
-        super('EndElementVDOM');
+        super("EndElementVDOM");
     }
 
     writeCode(writer) {
-        writer.write('out.ee()');
+        writer.write("out.ee()");
     }
 }
 
-module.exports = EndElementVDOM;
\ No newline at end of file
+module.exports = EndElementVDOM;
diff --git a/src/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js b/src/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
index 967539dfc..a8c3b37da 100644
--- a/src/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
+++ b/src/compiler/ast/HtmlElement/vdom/HtmlElementVDOM.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-const Node = require('../../Node');
-const vdomUtil = require('../../../util/vdom');
+const Node = require("../../Node");
+const vdomUtil = require("../../../util/vdom");
 
 const FLAG_IS_SVG = 1;
 const FLAG_IS_TEXTAREA = 2;
@@ -22,7 +22,7 @@ function finalizeCreateArgs(createArgs, builder) {
     var length = createArgs.length;
     var lastArg;
 
-    for (var i=length-1; i>=0; i--) {
+    for (var i = length - 1; i >= 0; i--) {
         var arg = createArgs[i];
         if (arg) {
             lastArg = arg;
@@ -34,7 +34,6 @@ function finalizeCreateArgs(createArgs, builder) {
                 } else {
                     createArgs[i] = builder.literalNull();
                 }
-
             } else {
                 length--;
             }
@@ -46,25 +45,25 @@ function finalizeCreateArgs(createArgs, builder) {
 }
 
 const MAYBE_SVG = {
-    'a': true,
-    'script': true,
-    'style': true
+    a: true,
+    script: true,
+    style: true
 };
 
 const SIMPLE_ATTRS = {
-    'class': true,
-    'style': true,
-    'id': true
+    class: true,
+    style: true,
+    id: true
 };
 
 function isStaticProperties(properties) {
     for (var k in properties) {
         var v = properties[k];
-        if (v.type !== 'Literal') {
+        if (v.type !== "Literal") {
             return false;
         }
 
-        if (typeof v.value === 'object') {
+        if (typeof v.value === "object") {
             return false;
         }
     }
@@ -74,7 +73,7 @@ function isStaticProperties(properties) {
 
 class HtmlElementVDOM extends Node {
     constructor(def) {
-        super('HtmlElementVDOM');
+        super("HtmlElementVDOM");
         this.tagName = def.tagName;
         this.isStatic = def.isStatic;
         this.isAttrsStatic = def.isAttrsStatic;
@@ -90,8 +89,8 @@ class HtmlElementVDOM extends Node {
         this.isTextArea = false;
         this.hasAttributes = false;
         this.hasSimpleAttrs = false; // This will be set to true if the HTML element
-                                     // only attributes in the following set:
-                                     // ['id', 'style', 'class']
+        // only attributes in the following set:
+        // ['id', 'style', 'class']
 
         this.isChild = false;
         this.createElementId = undefined;
@@ -107,25 +106,27 @@ class HtmlElementVDOM extends Node {
 
         let tagName = this.tagName;
 
-        if (tagName.type === 'Literal' && typeof tagName.value === 'string') {
+        if (tagName.type === "Literal" && typeof tagName.value === "string") {
             let tagDef = context.getTagDef(tagName.value);
             if (tagDef) {
-                if (tagDef.htmlType  === 'svg') {
+                if (tagDef.htmlType === "svg") {
                     this.isSVG = true;
                 } else {
-                    if (MAYBE_SVG[tagName.value] && context.isFlagSet('SVG')) {
+                    if (MAYBE_SVG[tagName.value] && context.isFlagSet("SVG")) {
                         this.isSVG = true;
                     } else {
-                        this.tagName = tagName = builder.literal(tagName.value.toUpperCase());
+                        this.tagName = tagName = builder.literal(
+                            tagName.value.toUpperCase()
+                        );
 
-                        if (tagName.value === 'TEXTAREA') {
+                        if (tagName.value === "TEXTAREA") {
                             this.isTextArea = true;
                         }
                     }
                 }
             }
             this.isLiteralTag = true;
-        } else if (context.isFlagSet('SVG')) {
+        } else if (context.isFlagSet("SVG")) {
             this.isSVG = true;
         }
 
@@ -136,7 +137,8 @@ class HtmlElementVDOM extends Node {
         let attributesArg = null;
 
         var hasNamedAttributes = false;
-        var hasDynamicAttributes = dynamicAttributes != null && dynamicAttributes.length !== 0;
+        var hasDynamicAttributes =
+            dynamicAttributes != null && dynamicAttributes.length !== 0;
         var hasSpreadAttributes = false;
 
         var hasSimpleAttrs = true;
@@ -149,11 +151,14 @@ class HtmlElementVDOM extends Node {
 
         if (attributes != null && attributes.length !== 0) {
             let explicitAttrs = null;
-            let addAttrs = (expr) => {
+            let addAttrs = expr => {
                 if (!attributesArg) {
                     attributesArg = expr;
                 } else {
-                    attributesArg = builder.functionCall(context.helper('merge'), [expr, attributesArg]);
+                    attributesArg = builder.functionCall(
+                        context.helper("merge"),
+                        [expr, attributesArg]
+                    );
                 }
             };
             let addAttr = function(name, value) {
@@ -167,21 +172,24 @@ class HtmlElementVDOM extends Node {
                     explicitAttrs = {};
                 }
 
-                if (value.type === 'Literal') {
+                if (value.type === "Literal") {
                     let literalValue = value.value;
                     if (literalValue == null || literalValue === false) {
                         return;
-                    } else if (typeof literalValue === 'number') {
+                    } else if (typeof literalValue === "number") {
                         value.value = literalValue.toString();
                     }
-                } else if (value.type === 'AttributePlaceholder') {
-                    value = codegen.builder.functionCall(context.helper('str'), [value]);
+                } else if (value.type === "AttributePlaceholder") {
+                    value = codegen.builder.functionCall(
+                        context.helper("str"),
+                        [value]
+                    );
                 }
 
                 explicitAttrs[name] = value;
             };
 
-            attributes.forEach((attr) => {
+            attributes.forEach(attr => {
                 // deprecated
                 if (!attr.name && !attr.spread) {
                     return;
@@ -212,9 +220,9 @@ class HtmlElementVDOM extends Node {
 
         // deprecated
         if (hasDynamicAttributes) {
-            dynamicAttributes.forEach((attrs) => {
+            dynamicAttributes.forEach(attrs => {
                 if (attributesArg) {
-                    let mergeVar = context.helper('merge');
+                    let mergeVar = context.helper("merge");
                     attributesArg = builder.functionCall(mergeVar, [
                         attributesArg, // Input props from the attributes take precedence
                         attrs
@@ -225,7 +233,13 @@ class HtmlElementVDOM extends Node {
             });
         }
 
-        if (!this.isAttrsStatic && hasNamedAttributes && hasSimpleAttrs && !hasDynamicAttributes && !hasSpreadAttributes) {
+        if (
+            !this.isAttrsStatic &&
+            hasNamedAttributes &&
+            hasSimpleAttrs &&
+            !hasDynamicAttributes &&
+            !hasSpreadAttributes
+        ) {
             this.hasSimpleAttrs = true;
         }
 
@@ -268,11 +282,10 @@ class HtmlElementVDOM extends Node {
             createArgs[INDEX_KEY] = key;
 
             if (!this.isStatic) {
-                createArgs[INDEX_COMPONENT] = builder.identifier('component');
+                createArgs[INDEX_COMPONENT] = builder.identifier("component");
             }
         }
 
-
         if (childCount != null) {
             createArgs[INDEX_CHILD_COUNT] = builder.literal(childCount);
         }
@@ -301,7 +314,11 @@ class HtmlElementVDOM extends Node {
 
         let properties = this.properties;
 
-        if (this.properties && properties.type === 'Literal' && Object.keys(properties.value).length === 0) {
+        if (
+            this.properties &&
+            properties.type === "Literal" &&
+            Object.keys(properties.value).length === 0
+        ) {
             properties = null;
         }
         if (properties) {
@@ -315,35 +332,42 @@ class HtmlElementVDOM extends Node {
         let funcCall;
 
         if (this.isChild) {
-            writer.write('.');
+            writer.write(".");
 
             funcCall = builder.functionCall(
-                builder.identifier(this.isLiteralTag || this.isSVG ? 'e' : 'ed'),
-                createArgs);
+                builder.identifier(
+                    this.isLiteralTag || this.isSVG ? "e" : "ed"
+                ),
+                createArgs
+            );
         } else if (this.isStatic && this.createElementId) {
-            funcCall = builder.functionCall(
-                this.createElementId,
-                createArgs);
+            funcCall = builder.functionCall(this.createElementId, createArgs);
         } else if (this.isHtmlOnly) {
-            writer.write('out.');
+            writer.write("out.");
             funcCall = builder.functionCall(
-                builder.identifier(this.isLiteralTag || this.isSVG ? 'e' : 'ed'),
-                createArgs);
+                builder.identifier(
+                    this.isLiteralTag || this.isSVG ? "e" : "ed"
+                ),
+                createArgs
+            );
         } else {
-            writer.write('out.');
+            writer.write("out.");
             funcCall = builder.functionCall(
-                builder.identifier(this.isLiteralTag || this.isSVG ? 'be' : 'bed'),
-                createArgs);
+                builder.identifier(
+                    this.isLiteralTag || this.isSVG ? "be" : "bed"
+                ),
+                createArgs
+            );
         }
 
         writer.write(funcCall);
 
         if (body && body.length) {
             writer.incIndent();
-            for(let i=0; i<body.length; i++) {
+            for (let i = 0; i < body.length; i++) {
                 let child = body[i];
                 child.isChild = true;
-                writer.write('\n');
+                writer.write("\n");
                 writer.writeLineIndent();
                 writer.write(child);
             }
@@ -356,13 +380,18 @@ class HtmlElementVDOM extends Node {
     }
 
     finalizeProperties(context) {
-        if (this.properties.type === 'Literal' && isStaticProperties(this.properties.value)) {
+        if (
+            this.properties.type === "Literal" &&
+            isStaticProperties(this.properties.value)
+        ) {
             if (Object.keys(this.properties.value).length === 0) {
                 this.properties = null;
             } else {
-                this.properties = context.addStaticVar('props', this.properties);
+                this.properties = context.addStaticVar(
+                    "props",
+                    this.properties
+                );
             }
-
         }
     }
 }
diff --git a/src/compiler/ast/HtmlElement/vdom/generateCode.js b/src/compiler/ast/HtmlElement/vdom/generateCode.js
index 073441529..ef5cb4686 100644
--- a/src/compiler/ast/HtmlElement/vdom/generateCode.js
+++ b/src/compiler/ast/HtmlElement/vdom/generateCode.js
@@ -1,10 +1,10 @@
-'use strict';
-var HtmlElementVDOM = require('./HtmlElementVDOM');
-var EndElementVDOM = require('./EndElementVDOM');
+"use strict";
+var HtmlElementVDOM = require("./HtmlElementVDOM");
+var EndElementVDOM = require("./EndElementVDOM");
 
 function checkAttributesStatic(attributes) {
     if (attributes) {
-        for (let i=0; i<attributes.length; i++) {
+        for (let i = 0; i < attributes.length; i++) {
             let attr = attributes[i];
 
             if (!attr.isStatic) {
@@ -19,7 +19,7 @@ function checkAttributesStatic(attributes) {
 function checkPropertiesStatic(properties, vdomUtil) {
     if (properties) {
         var keys = Object.keys(properties);
-        for (var i=0; i<keys.length; i++) {
+        for (var i = 0; i < keys.length; i++) {
             var propName = keys[i];
             var propValue = properties[propName];
             var isStatic = vdomUtil.isStaticValue(propValue);
@@ -47,20 +47,25 @@ module.exports = function(node, codegen, vdomUtil) {
     var isKeyStatic = vdomUtil.isStaticValue(key);
     var isAttrsStatic = checkAttributesStatic(attributes);
     var isPropsStatic = checkPropertiesStatic(properties, vdomUtil);
-    var isStatic = isKeyStatic && isAttrsStatic && isPropsStatic && node.isLiteralTagName();
+    var isStatic =
+        isKeyStatic &&
+        isAttrsStatic &&
+        isPropsStatic &&
+        node.isLiteralTagName();
     var isHtmlOnly = true;
 
     if (body && body.length) {
-        for (var i=0; i<body.length; i++) {
+        for (var i = 0; i < body.length; i++) {
             let child = body[i];
-            if (child.type === 'HtmlElementVDOM' || child.type === 'TextVDOM') {
-                if (child.type === 'TextVDOM' && child.escape === false) {
+            if (child.type === "HtmlElementVDOM" || child.type === "TextVDOM") {
+                if (child.type === "TextVDOM" && child.escape === false) {
                     isHtmlOnly = false;
                 }
                 if (!child.isHtmlOnly) {
                     isStatic = false;
                     isHtmlOnly = false;
-                } if (!child.isStatic) {
+                }
+                if (!child.isStatic) {
                     isStatic = false;
                 }
             } else {
@@ -89,7 +94,6 @@ module.exports = function(node, codegen, vdomUtil) {
         runtimeFlags
     });
 
-
     if (bodyOnlyIf) {
         htmlElVDOM.body = null;
 
@@ -101,11 +105,7 @@ module.exports = function(node, codegen, vdomUtil) {
             new EndElementVDOM()
         ]);
 
-        return [
-            startIf,
-            body,
-            endIf
-        ];
+        return [startIf, body, endIf];
     } else if (isHtmlOnly) {
         return htmlElVDOM;
     } else {
diff --git a/src/compiler/ast/Identifier.js b/src/compiler/ast/Identifier.js
index 0f30f114d..244fbdf56 100644
--- a/src/compiler/ast/Identifier.js
+++ b/src/compiler/ast/Identifier.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class Identifier extends Node {
     constructor(def) {
-        super('Identifier');
+        super("Identifier");
         this.name = def ? def.name : undefined;
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
@@ -22,4 +22,4 @@ class Identifier extends Node {
     }
 }
 
-module.exports = Identifier;
\ No newline at end of file
+module.exports = Identifier;
diff --git a/src/compiler/ast/If.js b/src/compiler/ast/If.js
index b21081407..adc2091d3 100644
--- a/src/compiler/ast/If.js
+++ b/src/compiler/ast/If.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 function removeWhitespaceNodes(whitespaceNodes) {
-    for (var i=0; i<whitespaceNodes.length; i++) {
+    for (var i = 0; i < whitespaceNodes.length; i++) {
         whitespaceNodes[i].detach();
     }
     whitespaceNodes.length = 0;
@@ -11,7 +11,7 @@ function removeWhitespaceNodes(whitespaceNodes) {
 
 class If extends Node {
     constructor(def) {
-        super('If');
+        super("If");
         this.test = def.test;
         this.body = this.makeContainer(def.body);
         this.else = def.else;
@@ -26,8 +26,8 @@ class If extends Node {
             // correctly.
             let previous = this;
             let whitespaceNodes = [];
-            this.forEachNextSibling((curNode) => {
-                if (curNode.type === 'Else') {
+            this.forEachNextSibling(curNode => {
+                if (curNode.type === "Else") {
                     curNode.detach();
                     if (whitespaceNodes.length) {
                         removeWhitespaceNodes(whitespaceNodes);
@@ -35,7 +35,7 @@ class If extends Node {
                     previous.else = curNode;
                     curNode.matched = true;
                     return false; // Stop searching
-                } else if (curNode.type === 'ElseIf') {
+                } else if (curNode.type === "ElseIf") {
                     curNode.detach();
                     if (whitespaceNodes.length) {
                         removeWhitespaceNodes(whitespaceNodes);
@@ -45,7 +45,7 @@ class If extends Node {
                     previous = curNode;
                     curNode.matched = true;
                     return true; // Keep searching since they may be more ElseIf/Else nodes...
-                } else if (curNode.type === 'Text') {
+                } else if (curNode.type === "Text") {
                     if (curNode.isWhitespace()) {
                         whitespaceNodes.push(curNode);
                         return true; // Just whitespace... keep searching
@@ -69,15 +69,15 @@ class If extends Node {
         var test = this.test;
         var body = this.body;
 
-        writer.write('if (');
+        writer.write("if (");
         writer.write(test);
-        writer.write(') ');
+        writer.write(") ");
         writer.writeBlock(body);
         if (this.else) {
-            writer.write(' else ');
+            writer.write(" else ");
             writer.write(this.else);
         } else {
-            writer.write('\n');
+            writer.write("\n");
         }
     }
 
@@ -92,4 +92,4 @@ class If extends Node {
     }
 }
 
-module.exports = If;
\ No newline at end of file
+module.exports = If;
diff --git a/src/compiler/ast/InvokeMacro.js b/src/compiler/ast/InvokeMacro.js
index 9e81ae2cc..66ee4bac9 100644
--- a/src/compiler/ast/InvokeMacro.js
+++ b/src/compiler/ast/InvokeMacro.js
@@ -1,36 +1,38 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var ok = require('assert').ok;
+var Node = require("./Node");
+var ok = require("assert").ok;
 
 function removeTrailingUndefineds(args) {
     var i;
-    var last = args.length-1;
+    var last = args.length - 1;
 
-    for (i=last; i>=0; i--) {
-        if (args[i].type !== 'Literal' || args[i].value !== undefined) {
+    for (i = last; i >= 0; i--) {
+        if (args[i].type !== "Literal" || args[i].value !== undefined) {
             break;
         }
     }
 
     if (i !== last) {
-        args = args.slice(0, i+1);
+        args = args.slice(0, i + 1);
     }
 
     return args;
 }
 
-
 class InvokeMacro extends Node {
     constructor(def) {
-        super('InvokeMacro');
+        super("InvokeMacro");
         this.el = def.el;
         this.name = def.name;
         this.args = def.args;
         this.body = this.makeContainer(def.body);
 
         if (this.name != null) {
-            ok(typeof this.name === 'string', 'Invalid macro name: ' + this.name);
+            ok(
+                typeof this.name === "string",
+                "Invalid macro name: " + this.name
+            );
         }
     }
 
@@ -48,15 +50,23 @@ class InvokeMacro extends Node {
             name = el.tagName;
             body = el.body;
 
-            if (typeof name !== 'string') {
-                codegen.context.addError(el, 'Element node with a dynamic tag name cannot be used to invoke a macro', 'ERR_INVOKE_MACRO');
+            if (typeof name !== "string") {
+                codegen.context.addError(
+                    el,
+                    "Element node with a dynamic tag name cannot be used to invoke a macro",
+                    "ERR_INVOKE_MACRO"
+                );
                 return;
             }
 
             macroDef = codegen.context.getRegisteredMacro(name);
 
             if (!macroDef) {
-                codegen.context.addError(el, 'Element node does not correspond to a macro', 'ERR_INVOKE_MACRO');
+                codegen.context.addError(
+                    el,
+                    "Element node does not correspond to a macro",
+                    "ERR_INVOKE_MACRO"
+                );
                 return;
             }
 
@@ -64,15 +74,23 @@ class InvokeMacro extends Node {
                 args = builder.parseJavaScriptArgs(el.argument);
             } else {
                 args = new Array(macroDef.params.length);
-                for (let i=0; i<args.length; i++) {
+                for (let i = 0; i < args.length; i++) {
                     args[i] = builder.literal(undefined);
                 }
 
-                el.forEachAttribute((attr) => {
+                el.forEachAttribute(attr => {
                     var paramName = attr.name;
                     var paramIndex = macroDef.getParamIndex(paramName);
                     if (paramIndex == null) {
-                        codegen.context.addError(el, 'The "' + name + '" macro does not have a parameter named "' + paramName + '"', 'ERR_INVOKE_MACRO');
+                        codegen.context.addError(
+                            el,
+                            'The "' +
+                                name +
+                                '" macro does not have a parameter named "' +
+                                paramName +
+                                '"',
+                            "ERR_INVOKE_MACRO"
+                        );
                         return;
                     }
 
@@ -86,7 +104,10 @@ class InvokeMacro extends Node {
         } else {
             macroDef = codegen.context.getRegisteredMacro(name);
             if (!macroDef) {
-                codegen.addError('Macro not found with name "' + name + '"', 'ERR_INVOKE_MACRO');
+                codegen.addError(
+                    'Macro not found with name "' + name + '"',
+                    "ERR_INVOKE_MACRO"
+                );
                 return;
             }
         }
@@ -100,14 +121,19 @@ class InvokeMacro extends Node {
         }
 
         if (body && body.length) {
-            args[macroDef.getParamIndex('renderBody')] = builder.renderBodyFunction(body);
+            args[
+                macroDef.getParamIndex("renderBody")
+            ] = builder.renderBodyFunction(body);
         }
 
-        args[macroDef.getParamIndex('out')] = builder.identifier('out');
+        args[macroDef.getParamIndex("out")] = builder.identifier("out");
 
         args = removeTrailingUndefineds(args);
 
-        return builder.functionCall(builder.identifier(macroDef.functionName), args);
+        return builder.functionCall(
+            builder.identifier(macroDef.functionName),
+            args
+        );
     }
 
     walk(walker) {
@@ -118,4 +144,4 @@ class InvokeMacro extends Node {
     }
 }
 
-module.exports = InvokeMacro;
\ No newline at end of file
+module.exports = InvokeMacro;
diff --git a/src/compiler/ast/Literal.js b/src/compiler/ast/Literal.js
index edcb978f8..07281d1b8 100644
--- a/src/compiler/ast/Literal.js
+++ b/src/compiler/ast/Literal.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 var isArray = Array.isArray;
-const isValidJavaScriptVarName = require('../util/isValidJavaScriptVarName');
+const isValidJavaScriptVarName = require("../util/isValidJavaScriptVarName");
 
 function walkValue(value, walker) {
     if (!value) {
@@ -11,16 +11,16 @@ function walkValue(value, walker) {
         return walker.walk(value);
     } else if (isArray(value)) {
         let array = value;
-        for (let i=0; i<array.length; i++) {
+        for (let i = 0; i < array.length; i++) {
             let el = array[i];
             array[i] = walkValue(el, walker);
         }
         return array;
-    } else if (typeof value === 'object') {
+    } else if (typeof value === "object") {
         let object = value;
 
         let keys = Object.keys(object);
-        for (let i=0; i<keys.length; i++) {
+        for (let i = 0; i < keys.length; i++) {
             let key = keys[i];
             let oldValue = object[key];
             let newValue = walkValue(oldValue, walker);
@@ -37,17 +37,17 @@ function walkValue(value, walker) {
 
 class Literal extends Node {
     constructor(def) {
-        super('Literal');
+        super("Literal");
         this.value = def.value;
     }
 
     generateCode(codegen) {
         if (this.value != null) {
             if (isArray(this.value)) {
-                for (var i=0; i<this.value.length; i++) {
+                for (var i = 0; i < this.value.length; i++) {
                     this.value[i] = codegen.generateCode(this.value[i]);
                 }
-            } else if (typeof this.value === 'object') {
+            } else if (typeof this.value === "object") {
                 if (!(this.value instanceof RegExp)) {
                     var newObject = {};
                     for (var k in this.value) {
@@ -70,47 +70,47 @@ class Literal extends Node {
     toString() {
         var value = this.value;
         if (value === null) {
-            return 'null';
+            return "null";
         } else if (value === undefined) {
-            return 'undefined';
-        } else if (typeof value === 'string') {
+            return "undefined";
+        } else if (typeof value === "string") {
             return JSON.stringify(value);
         } else if (value === true) {
-            return 'true';
+            return "true";
         } else if (value === false) {
-            return 'false';
-        }  else if (isArray(value)) {
-            return '[' + value.join(', ') + ']';
-        } else if (typeof value === 'number') {
+            return "false";
+        } else if (isArray(value)) {
+            return "[" + value.join(", ") + "]";
+        } else if (typeof value === "number") {
             return value.toString();
         } else if (value instanceof RegExp) {
             return value.toString();
-        } else if (typeof value === 'object') {
+        } else if (typeof value === "object") {
             let keys = Object.keys(value);
             if (keys.length === 0) {
-                return '{}';
+                return "{}";
             }
 
-            var result = '{ ';
+            var result = "{ ";
 
-            for (let i=0; i<keys.length; i++) {
+            for (let i = 0; i < keys.length; i++) {
                 let k = keys[i];
                 let v = value[k];
 
                 if (i !== 0) {
-                    result += ', ';
+                    result += ", ";
                 }
 
                 if (isValidJavaScriptVarName(k)) {
-                    result += k + ': ';
+                    result += k + ": ";
                 } else {
-                    result += JSON.stringify(k) + ': ';
+                    result += JSON.stringify(k) + ": ";
                 }
 
                 result += v;
             }
 
-            return result + ' }';
+            return result + " }";
         }
     }
 
@@ -119,4 +119,4 @@ class Literal extends Node {
     }
 }
 
-module.exports = Literal;
\ No newline at end of file
+module.exports = Literal;
diff --git a/src/compiler/ast/LogicalExpression.js b/src/compiler/ast/LogicalExpression.js
index b0531cf31..72b7ee6ac 100644
--- a/src/compiler/ast/LogicalExpression.js
+++ b/src/compiler/ast/LogicalExpression.js
@@ -1,35 +1,35 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 function generateCodeForOperand(node, writer) {
     var wrap = isCompoundExpression(node);
 
     if (wrap) {
-        writer.write('(');
+        writer.write("(");
     }
 
     writer.write(node);
 
     if (wrap) {
-        writer.write(')');
+        writer.write(")");
     }
 }
 
 function operandToString(node) {
     var wrap = isCompoundExpression(node);
 
-    var result = '';
+    var result = "";
 
     if (wrap) {
-        result += '(';
+        result += "(";
     }
 
     result += node;
 
     if (wrap) {
-        result += ')';
+        result += ")";
     }
 
     return result;
@@ -37,7 +37,7 @@ function operandToString(node) {
 
 class LogicalExpression extends Node {
     constructor(def) {
-        super('LogicalExpression');
+        super("LogicalExpression");
         this.left = def.left;
         this.operator = def.operator;
         this.right = def.right;
@@ -55,13 +55,13 @@ class LogicalExpression extends Node {
         var right = this.right;
 
         if (!left || !right) {
-            throw new Error('Invalid LogicalExpression: ' + this);
+            throw new Error("Invalid LogicalExpression: " + this);
         }
 
         generateCodeForOperand(left, writer);
-        writer.write(' ');
+        writer.write(" ");
         writer.write(operator);
-        writer.write(' ');
+        writer.write(" ");
         generateCodeForOperand(right, writer);
     }
 
@@ -71,7 +71,7 @@ class LogicalExpression extends Node {
 
     toJSON() {
         return {
-            type: 'LogicalExpression',
+            type: "LogicalExpression",
             left: this.left,
             operator: this.operator,
             right: this.right
@@ -89,11 +89,17 @@ class LogicalExpression extends Node {
         var right = this.right;
 
         if (!left || !right) {
-            throw new Error('Invalid LogicalExpression: ' + this);
+            throw new Error("Invalid LogicalExpression: " + this);
         }
 
-        return operandToString(left) + ' ' + operator + ' ' + operandToString(right);
+        return (
+            operandToString(left) +
+            " " +
+            operator +
+            " " +
+            operandToString(right)
+        );
     }
 }
 
-module.exports = LogicalExpression;
\ No newline at end of file
+module.exports = LogicalExpression;
diff --git a/src/compiler/ast/Macro.js b/src/compiler/ast/Macro.js
index 9ba208242..572186eff 100644
--- a/src/compiler/ast/Macro.js
+++ b/src/compiler/ast/Macro.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var ok = require('assert').ok;
+var Node = require("./Node");
+var ok = require("assert").ok;
 
 class Macro extends Node {
     constructor(def) {
-        super('Macro');
+        super("Macro");
         this.name = def.name;
         this.params = def.params;
         this.body = this.makeContainer(def.body);
@@ -35,4 +35,4 @@ class Macro extends Node {
     }
 }
 
-module.exports = Macro;
\ No newline at end of file
+module.exports = Macro;
diff --git a/src/compiler/ast/MemberExpression.js b/src/compiler/ast/MemberExpression.js
index ef73da5c9..faae1629e 100644
--- a/src/compiler/ast/MemberExpression.js
+++ b/src/compiler/ast/MemberExpression.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
-var ok = require('assert').ok;
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
+var ok = require("assert").ok;
 
 class MemberExpression extends Node {
     constructor(def) {
-        super('MemberExpression');
+        super("MemberExpression");
         this.object = def.object;
         this.property = def.property;
         this.computed = def.computed;
@@ -29,28 +29,28 @@ class MemberExpression extends Node {
         var wrapWithParens = isCompoundExpression(object);
 
         if (wrapWithParens) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(object);
 
         if (wrapWithParens) {
-            writer.write(')');
+            writer.write(")");
         }
 
         if (computed) {
-            writer.write('[');
+            writer.write("[");
             writer.write(property);
-            writer.write(']');
+            writer.write("]");
         } else {
-            writer.write('.');
+            writer.write(".");
             writer.write(property);
         }
     }
 
     toJSON() {
         return {
-            type: 'MemberExpression',
+            type: "MemberExpression",
             object: this.object,
             property: this.property,
             computed: this.computed
@@ -70,9 +70,9 @@ class MemberExpression extends Node {
         var result = object.toString();
 
         if (computed) {
-            result += '[' + property + ']';
+            result += "[" + property + "]";
         } else {
-            result += '.' + property;
+            result += "." + property;
         }
 
         return result;
diff --git a/src/compiler/ast/NewExpression.js b/src/compiler/ast/NewExpression.js
index 41442ebf4..05d600f16 100644
--- a/src/compiler/ast/NewExpression.js
+++ b/src/compiler/ast/NewExpression.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 class NewExpression extends Node {
     constructor(def) {
-        super('NewExpression');
+        super("NewExpression");
         this.callee = def.callee;
         this.args = def.args;
     }
@@ -20,37 +20,42 @@ class NewExpression extends Node {
         var callee = this.callee;
         var args = this.args;
 
-        writer.write('new ');
+        writer.write("new ");
 
         var wrap = isCompoundExpression(callee);
 
         if (wrap) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(callee);
 
         if (wrap) {
-            writer.write(')');
+            writer.write(")");
         }
 
-        writer.write('(');
+        writer.write("(");
 
         if (args && args.length) {
-            for (let i=0, argsLen = args.length; i<argsLen; i++) {
+            for (let i = 0, argsLen = args.length; i < argsLen; i++) {
                 if (i !== 0) {
-                    writer.write(', ');
+                    writer.write(", ");
                 }
 
                 let arg = args[i];
                 if (!arg) {
-                    throw new Error('Arg ' + i + ' is not valid for new expression: ' + JSON.stringify(this.toJSON()));
+                    throw new Error(
+                        "Arg " +
+                            i +
+                            " is not valid for new expression: " +
+                            JSON.stringify(this.toJSON())
+                    );
                 }
                 writer.write(arg);
             }
         }
 
-        writer.write(')');
+        writer.write(")");
     }
 
     isCompoundExpression() {
@@ -59,7 +64,7 @@ class NewExpression extends Node {
 
     toJSON() {
         return {
-            type: 'NewExpression',
+            type: "NewExpression",
             callee: this.callee,
             args: this.args
         };
@@ -74,27 +79,26 @@ class NewExpression extends Node {
         var callee = this.callee;
         var args = this.args;
 
-        let result = 'new ';
+        let result = "new ";
 
         var wrap = isCompoundExpression(callee);
 
         if (wrap) {
-            result += '(';
+            result += "(";
         }
 
         result += callee;
 
         if (wrap) {
-            result += ')';
+            result += ")";
         }
 
-
-        result += '(';
+        result += "(";
 
         if (args && args.length) {
-            for (let i=0, argsLen = args.length; i<argsLen; i++) {
+            for (let i = 0, argsLen = args.length; i < argsLen; i++) {
                 if (i !== 0) {
-                    result += ', ';
+                    result += ", ";
                 }
 
                 let arg = args[i];
@@ -102,10 +106,10 @@ class NewExpression extends Node {
             }
         }
 
-        result += ')';
+        result += ")";
 
         return result;
     }
 }
 
-module.exports = NewExpression;
\ No newline at end of file
+module.exports = NewExpression;
diff --git a/src/compiler/ast/Node.js b/src/compiler/ast/Node.js
index a355fd086..fdffef3ad 100644
--- a/src/compiler/ast/Node.js
+++ b/src/compiler/ast/Node.js
@@ -1,10 +1,10 @@
-'use strict';
-var Container = require('./Container');
-var ArrayContainer = require('./ArrayContainer');
-var ok = require('assert').ok;
-var extend = require('raptor-util/extend');
-var inspect = require('util').inspect;
-var EventEmitter = require('events').EventEmitter;
+"use strict";
+var Container = require("./Container");
+var ArrayContainer = require("./ArrayContainer");
+var ok = require("assert").ok;
+var extend = require("raptor-util/extend");
+var inspect = require("util").inspect;
+var EventEmitter = require("events").EventEmitter;
 
 function trim(textNode) {
     if (textNode.preserveWhitespace === true) {
@@ -17,17 +17,17 @@ function trim(textNode) {
 
     if (isFirst) {
         //First child
-        text = text.replace(/^\r?\n\s*/g, '');
+        text = text.replace(/^\r?\n\s*/g, "");
     }
     if (isLast) {
         //Last child
-        text = text.replace(/\r?\n\s*$/g, '');
+        text = text.replace(/\r?\n\s*$/g, "");
     }
     if (/^\r?\n\s*$/.test(text)) {
         //Whitespace between elements
-        text = '';
+        text = "";
     }
-    text = text.replace(/\s+/g, ' ');
+    text = text.replace(/\s+/g, " ");
     textNode.argument.value = text;
 }
 
@@ -57,7 +57,7 @@ class Node {
         this._events.on(event, listener);
     }
 
-    emit(event, args) {
+    emit() {
         if (this._events) {
             this._events.emit.apply(this._events, arguments);
         }
@@ -72,33 +72,33 @@ class Node {
     }
 
     onBeforeGenerateCode(listener) {
-        this.on('beforeGenerateCode', listener);
+        this.on("beforeGenerateCode", listener);
     }
 
     onAfterGenerateCode(listener) {
-        this.on('afterGenerateCode', listener);
+        this.on("afterGenerateCode", listener);
     }
 
     wrapWith(wrapperNode) {
-        ok(this.container, 'Node does not belong to a container: ' + this);
+        ok(this.container, "Node does not belong to a container: " + this);
         var replaced = this.container.replaceChild(wrapperNode, this);
-        ok(replaced, 'Invalid state. Child does not belong to the container');
+        ok(replaced, "Invalid state. Child does not belong to the container");
         wrapperNode.appendChild(this);
     }
 
     replaceWith(newNode) {
-        ok(this.container, 'Node does not belong to a container: ' + this);
+        ok(this.container, "Node does not belong to a container: " + this);
         var replaced = this.container.replaceChild(newNode, this);
-        ok(replaced, 'Invalid state. Child does not belong to the container');
+        ok(replaced, "Invalid state. Child does not belong to the container");
     }
 
     insertSiblingBefore(newNode) {
-        ok(this.container, 'Node does not belong to a container: ' + this);
+        ok(this.container, "Node does not belong to a container: " + this);
         this.container.insertChildBefore(newNode, this);
     }
 
     insertSiblingAfter(newNode) {
-        ok(this.container, 'Node does not belong to a container: ' + this);
+        ok(this.container, "Node does not belong to a container: " + this);
         this.container.insertChildAfter(newNode, this);
     }
 
@@ -116,24 +116,24 @@ class Node {
     }
 
     prependChild(node) {
-        ok(this.body, 'Node does not support child nodes: ' + this);
+        ok(this.body, "Node does not support child nodes: " + this);
         this.body.prependChild(node);
     }
 
     appendChild(node) {
-        ok(this.body, 'Node does not support child nodes: ' + this);
+        ok(this.body, "Node does not support child nodes: " + this);
         this.body.appendChild(node);
     }
 
     appendChildren(nodes) {
-        ok(this.body, 'Node does not support child nodes: ' + this);
-        nodes.forEach((node) => {
+        ok(this.body, "Node does not support child nodes: " + this);
+        nodes.forEach(node => {
             this.body.appendChild(node);
         });
     }
 
     insertBefore(newNode, referenceNode) {
-        ok(this.body, 'Node does not support child nodes: ' + this);
+        ok(this.body, "Node does not support child nodes: " + this);
         this.body.insertBefore(newNode, referenceNode);
     }
 
@@ -144,8 +144,11 @@ class Node {
     }
 
     moveChildrenTo(targetNode) {
-        ok(this.body, 'Node does not support child nodes: ' + this);
-        ok(this !== targetNode, 'Target node cannot be the same as the source node');
+        ok(this.body, "Node does not support child nodes: " + this);
+        ok(
+            this !== targetNode,
+            "Target node cannot be the same as the source node"
+        );
 
         this.body.moveChildrenTo(targetNode);
     }
@@ -238,7 +241,7 @@ class Node {
      * of this node that is the same version we use when
      * serializing to JSON.
      */
-    inspect(depth, opts) {
+    inspect() {
         // We inspect in the simplified version of this object t
         return this.toJSON();
     }
@@ -256,12 +259,15 @@ class Node {
         if (!this._codeGeneratorFuncs) {
             this._codeGeneratorFuncs = {};
         }
-        this._codeGeneratorFuncs[mode || 'DEFAULT'] = codeGeneratorFunc;
+        this._codeGeneratorFuncs[mode || "DEFAULT"] = codeGeneratorFunc;
     }
 
     getCodeGenerator(mode) {
         if (this._codeGeneratorFuncs) {
-            return this._codeGeneratorFuncs[mode] || this._codeGeneratorFuncs.DEFAULT;
+            return (
+                this._codeGeneratorFuncs[mode] ||
+                this._codeGeneratorFuncs.DEFAULT
+            );
         } else {
             return undefined;
         }
@@ -280,12 +286,12 @@ class Node {
     }
 
     get bodyText() {
-        var bodyText = '';
+        var bodyText = "";
 
-        this.forEachChild((child) => {
-            if (child.type === 'Text') {
+        this.forEachChild(child => {
+            if (child.type === "Text") {
                 var childText = child.argument;
-                if (childText && childText.type === 'Literal') {
+                if (childText && childText.type === "Literal") {
                     bodyText += childText.value;
                 }
             }
@@ -311,7 +317,7 @@ class Node {
         return preserveWhitespace === true;
     }
 
-    setFinalNode(isFinal) {
+    setFinalNode() {
         this._finalNode = true;
     }
 
@@ -326,17 +332,21 @@ class Node {
 
         this._childTextNormalized = true;
 
-        var trimStartEnd = forceTrimStartEnd === true || this._trimStartEnd === true;
+        var trimStartEnd =
+            forceTrimStartEnd === true || this._trimStartEnd === true;
 
         var isPreserveWhitespace = false;
 
         if (!forceTrim) {
-            if (context.isPreserveWhitespace() || this.preserveWhitespace === true || this.isPreserveWhitespace()) {
+            if (
+                context.isPreserveWhitespace() ||
+                this.preserveWhitespace === true ||
+                this.isPreserveWhitespace()
+            ) {
                 isPreserveWhitespace = true;
             }
         }
 
-
         if (isPreserveWhitespace && trimStartEnd !== true) {
             return;
         }
@@ -351,20 +361,24 @@ class Node {
         var currentTextLiteral = null;
         var literalTextNodes = [];
 
-        body.forEach((curChild, i) => {
+        body.forEach(curChild => {
             if (curChild.noOutput) {
                 // Skip over AST nodes that produce no HTML output
                 return;
             }
 
-            if (curChild.type === 'Text' && curChild.isLiteral()) {
-                curChild.isFirst  = null;
-                curChild.isLast  = null;
+            if (curChild.type === "Text" && curChild.isLiteral()) {
+                curChild.isFirst = null;
+                curChild.isLast = null;
 
-                if (currentTextLiteral &&
-                        currentTextLiteral.preserveWhitespace === curChild.preserveWhitespace &&
-                        currentTextLiteral.escape === curChild.escape) {
-                    currentTextLiteral.argument.value += curChild.argument.value;
+                if (
+                    currentTextLiteral &&
+                    currentTextLiteral.preserveWhitespace ===
+                        curChild.preserveWhitespace &&
+                    currentTextLiteral.escape === curChild.escape
+                ) {
+                    currentTextLiteral.argument.value +=
+                        curChild.argument.value;
                     curChild.detach();
                 } else {
                     currentTextLiteral = curChild;
@@ -389,14 +403,21 @@ class Node {
             if (literalTextNodes.length) {
                 // We will only trim the first and last nodes
                 var firstTextNode = literalTextNodes[0];
-                var lastTextNode = literalTextNodes[literalTextNodes.length - 1];
+                var lastTextNode =
+                    literalTextNodes[literalTextNodes.length - 1];
 
                 if (firstTextNode.isFirst) {
-                    firstTextNode.argument.value = firstTextNode.argument.value.replace(/^\s*/, '');
+                    firstTextNode.argument.value = firstTextNode.argument.value.replace(
+                        /^\s*/,
+                        ""
+                    );
                 }
 
                 if (lastTextNode.isLast) {
-                    lastTextNode.argument.value = lastTextNode.argument.value.replace(/\s*$/, '');
+                    lastTextNode.argument.value = lastTextNode.argument.value.replace(
+                        /\s*$/,
+                        ""
+                    );
                 }
             }
         }
@@ -405,15 +426,15 @@ class Node {
             literalTextNodes.forEach(trim);
         }
 
-        literalTextNodes.forEach((textNode) => {
-            if (textNode.argument.value === '') {
+        literalTextNodes.forEach(textNode => {
+            if (textNode.argument.value === "") {
                 textNode.detach();
             }
         });
     }
 
     get childCount() {
-        ok(this.body, 'Node does not support child nodes: ' + this);
+        ok(this.body, "Node does not support child nodes: " + this);
         return this.body.length;
     }
 }
diff --git a/src/compiler/ast/ObjectExpression.js b/src/compiler/ast/ObjectExpression.js
index f34d6875c..b95279a4a 100644
--- a/src/compiler/ast/ObjectExpression.js
+++ b/src/compiler/ast/ObjectExpression.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ObjectExpression extends Node {
     constructor(def) {
-        super('ObjectExpression');
+        super("ObjectExpression");
         this.properties = def.properties;
     }
 
@@ -17,12 +17,12 @@ class ObjectExpression extends Node {
         var properties = this.properties;
 
         if (!properties || !properties.length) {
-            writer.write('{}');
+            writer.write("{}");
             return;
         }
 
         writer.incIndent();
-        writer.write('{\n');
+        writer.write("{\n");
         writer.incIndent();
 
         properties.forEach((prop, i) => {
@@ -30,22 +30,22 @@ class ObjectExpression extends Node {
             writer.write(prop);
 
             if (i < properties.length - 1) {
-                writer.write(',\n');
+                writer.write(",\n");
             } else {
-                writer.write('\n');
+                writer.write("\n");
             }
         });
 
         writer.decIndent();
         writer.writeLineIndent();
-        writer.write('}');
+        writer.write("}");
         writer.decIndent();
     }
 
     getProperty(name) {
         var properties = this.properties;
 
-        for (var i=0; i<properties.length; i++)             {
+        for (var i = 0; i < properties.length; i++) {
             var curProperty = properties[i];
             if (curProperty.literalKeyValue === name) {
                 return curProperty;
@@ -55,12 +55,12 @@ class ObjectExpression extends Node {
     }
 
     addProperties(props) {
-        if (props instanceof ObjectExpression){
+        if (props instanceof ObjectExpression) {
             props = props.properties;
         }
 
         if (Array.isArray(props)) {
-            props.forEach((prop) => {
+            props.forEach(prop => {
                 this.addProperty(prop);
             });
         }
@@ -71,7 +71,7 @@ class ObjectExpression extends Node {
         var properties = this.properties;
 
         if (literalKeyValue) {
-            for (var i=0; i<properties.length; i++)             {
+            for (var i = 0; i < properties.length; i++) {
                 var curProperty = properties[i];
 
                 if (curProperty.literalKeyValue === literalKeyValue) {
@@ -90,7 +90,7 @@ class ObjectExpression extends Node {
 
     toJSON() {
         return {
-            type: 'ObjectExpression',
+            type: "ObjectExpression",
             properties: this.properties
         };
     }
@@ -99,23 +99,24 @@ class ObjectExpression extends Node {
         this.properties = walker.walk(this.properties);
     }
 
-    toString(codegen) {
+    toString() {
         var properties = this.properties;
 
         if (!properties || !properties.length) {
-            return '{}';
+            return "{}";
         }
 
-        let result = '{';
+        let result = "{";
 
         properties.forEach((prop, i) => {
             if (i !== 0) {
-                result += ', ';
+                result += ", ";
             }
             result += prop;
         });
 
-        return result + '}';    }
+        return result + "}";
+    }
 }
 
 module.exports = ObjectExpression;
diff --git a/src/compiler/ast/Program.js b/src/compiler/ast/Program.js
index d034c5674..a866ebcce 100644
--- a/src/compiler/ast/Program.js
+++ b/src/compiler/ast/Program.js
@@ -1,9 +1,9 @@
-'use strict';
-var Node = require('./Node');
+"use strict";
+var Node = require("./Node");
 
 class Program extends Node {
     constructor(def) {
-        super('Program');
+        super("Program");
         this.body = def.body;
     }
 
@@ -21,4 +21,4 @@ class Program extends Node {
     }
 }
 
-module.exports = Program;
\ No newline at end of file
+module.exports = Program;
diff --git a/src/compiler/ast/Property.js b/src/compiler/ast/Property.js
index e16dfeeab..318478f01 100644
--- a/src/compiler/ast/Property.js
+++ b/src/compiler/ast/Property.js
@@ -1,10 +1,10 @@
-'use strict';
-const isValidJavaScriptIdentifier = require('../util/isValidJavaScriptIdentifier');
-const Node = require('./Node');
+"use strict";
+const isValidJavaScriptIdentifier = require("../util/isValidJavaScriptIdentifier");
+const Node = require("./Node");
 
 class Property extends Node {
     constructor(def) {
-        super('Property');
+        super("Property");
         this.key = def.key;
         this.value = def.value;
         this.computed = def.computed === true;
@@ -26,26 +26,30 @@ class Property extends Node {
         var computed = this.computed === true;
 
         if (computed) {
-            writer.write('[');
+            writer.write("[");
         }
 
-        if (key.type === 'Literal' && typeof key.value === 'string' && isValidJavaScriptIdentifier(key.value)) {
+        if (
+            key.type === "Literal" &&
+            typeof key.value === "string" &&
+            isValidJavaScriptIdentifier(key.value)
+        ) {
             writer.write(key.value);
         } else {
             writer.write(key);
         }
 
         if (computed) {
-            writer.write(']');
+            writer.write("]");
         }
 
-        writer.write(': ');
+        writer.write(": ");
         writer.write(value);
     }
 
     toJSON() {
         return {
-            type: 'Property',
+            type: "Property",
             key: this.key,
             value: this.value
         };
@@ -58,9 +62,9 @@ class Property extends Node {
 
     get literalKeyValue() {
         if (!this.computed && this.key) {
-            if (this.key.type === 'Literal') {
+            if (this.key.type === "Literal") {
                 return this.key.value;
-            } else if (this.key.type === 'Identifier') {
+            } else if (this.key.type === "Identifier") {
                 return this.key.name;
             }
         }
@@ -72,14 +76,14 @@ class Property extends Node {
         var key = this.key;
         var value = this.value;
 
-        if (key.type === 'Literal') {
+        if (key.type === "Literal") {
             var propName = key.value;
             if (isValidJavaScriptIdentifier(propName)) {
                 key = propName;
             }
         }
 
-        return key + ': ' + value;
+        return key + ": " + value;
     }
 }
 
diff --git a/src/compiler/ast/Return.js b/src/compiler/ast/Return.js
index f0652b096..d2e5b204c 100644
--- a/src/compiler/ast/Return.js
+++ b/src/compiler/ast/Return.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class Return extends Node {
     constructor(def) {
-        super('Return');
+        super("Return");
         this.argument = def.argument;
     }
 
@@ -21,10 +21,10 @@ class Return extends Node {
         var argument = this.argument;
 
         if (argument) {
-            writer.write('return ');
+            writer.write("return ");
             writer.write(argument);
         } else {
-            writer.write('return');
+            writer.write("return");
         }
     }
 
@@ -33,4 +33,4 @@ class Return extends Node {
     }
 }
 
-module.exports = Return;
\ No newline at end of file
+module.exports = Return;
diff --git a/src/compiler/ast/Scriptlet.js b/src/compiler/ast/Scriptlet.js
index 5629b974d..5479b7ed9 100644
--- a/src/compiler/ast/Scriptlet.js
+++ b/src/compiler/ast/Scriptlet.js
@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var adjustIndent = require('../util/adjustIndent');
+var Node = require("./Node");
+var adjustIndent = require("../util/adjustIndent");
 
 class Scriptlet extends Node {
     constructor(def) {
-        super('Scriptlet');
+        super("Scriptlet");
         this.code = def.code;
         this.tag = def.tag;
         this.block = def.block;
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
@@ -25,7 +25,7 @@ class Scriptlet extends Node {
         code = adjustIndent(code, writer.currentIndent);
 
         writer.write(code);
-        writer.write('\n');
+        writer.write("\n");
     }
 }
 
diff --git a/src/compiler/ast/SelfInvokingFunction.js b/src/compiler/ast/SelfInvokingFunction.js
index 50d6c6709..e27cd9302 100644
--- a/src/compiler/ast/SelfInvokingFunction.js
+++ b/src/compiler/ast/SelfInvokingFunction.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class SelfInvokingFunction extends Node {
     constructor(def) {
-        super('SelfInvokingFunction');
+        super("SelfInvokingFunction");
         this.params = def.params;
         this.args = def.args;
         this.body = this.makeContainer(def.body);
@@ -18,8 +18,15 @@ class SelfInvokingFunction extends Node {
         var body = codegen.generateCode(this.body);
         codegen.inFunction = oldInFunction;
 
-        var functionDeclaration = codegen.builder.functionDeclaration(null, params, body);
-        var functionCall = codegen.builder.functionCall(functionDeclaration, args);
+        var functionDeclaration = codegen.builder.functionDeclaration(
+            null,
+            params,
+            body
+        );
+        var functionCall = codegen.builder.functionCall(
+            functionDeclaration,
+            args
+        );
 
         return functionCall;
     }
@@ -31,4 +38,4 @@ class SelfInvokingFunction extends Node {
     }
 }
 
-module.exports = SelfInvokingFunction;
\ No newline at end of file
+module.exports = SelfInvokingFunction;
diff --git a/src/compiler/ast/SequenceExpression.js b/src/compiler/ast/SequenceExpression.js
index 9bd8295a3..5fc291b22 100644
--- a/src/compiler/ast/SequenceExpression.js
+++ b/src/compiler/ast/SequenceExpression.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class SequenceExpression extends Node {
     constructor(def) {
-        super('SequenceExpression');
+        super("SequenceExpression");
         this.expressions = def.expressions;
     }
 
@@ -14,12 +14,11 @@ class SequenceExpression extends Node {
     }
 
     writeCode(writer) {
-
-        for (var i=0; i<this.expressions.length; i++) {
+        for (var i = 0; i < this.expressions.length; i++) {
             var expression = this.expressions[i];
 
             if (i !== 0) {
-                writer.write(', ');
+                writer.write(", ");
             }
 
             writer.write(expression);
@@ -32,7 +31,7 @@ class SequenceExpression extends Node {
 
     toJSON() {
         return {
-            type: 'SequenceExpression',
+            type: "SequenceExpression",
             expressions: this.expressions
         };
     }
@@ -42,13 +41,13 @@ class SequenceExpression extends Node {
     }
 
     toString() {
-        var code = '';
+        var code = "";
 
-        for (var i=0; i<this.expressions.length; i++) {
+        for (var i = 0; i < this.expressions.length; i++) {
             var expression = this.expressions[i];
 
             if (i !== 0) {
-                code += ', ';
+                code += ", ";
             }
 
             code += expression;
@@ -58,4 +57,4 @@ class SequenceExpression extends Node {
     }
 }
 
-module.exports = SequenceExpression;
\ No newline at end of file
+module.exports = SequenceExpression;
diff --git a/src/compiler/ast/TemplateRoot.js b/src/compiler/ast/TemplateRoot.js
index 7cd869d6a..9b44b560f 100644
--- a/src/compiler/ast/TemplateRoot.js
+++ b/src/compiler/ast/TemplateRoot.js
@@ -1,5 +1,5 @@
-'use strict';
-var Node = require('./Node');
+"use strict";
+var Node = require("./Node");
 
 function createVarsArray(vars) {
     return Object.keys(vars).map(function(varName) {
@@ -14,12 +14,14 @@ function createVarsArray(vars) {
 function _buildVersionComment(builder, context) {
     const version = context.compilerVersion;
     const compilerType = context.compilerType;
-    return builder.comment(`Compiled using ${compilerType}@${version} - DO NOT EDIT`);
+    return builder.comment(
+        `Compiled using ${compilerType}@${version} - DO NOT EDIT`
+    );
 }
 
 class TemplateRoot extends Node {
     constructor(def) {
-        super('TemplateRoot');
+        super("TemplateRoot");
         this.body = this.makeContainer(def.body);
         this.extraRenderParams = null;
         this.generateAssignRenderCode = null;
@@ -48,7 +50,7 @@ class TemplateRoot extends Node {
         var builder = codegen.builder;
 
         let renderStatements = [
-            builder.var('data', builder.identifier('input'))
+            builder.var("data", builder.identifier("input"))
         ];
         var vars = createVarsArray(context.getVars());
         if (vars.length) {
@@ -57,37 +59,44 @@ class TemplateRoot extends Node {
 
         renderStatements = renderStatements.concat(this.body);
 
-        var renderParams = [builder.identifier('input'), builder.identifierOut()];
+        var renderParams = [
+            builder.identifier("input"),
+            builder.identifierOut()
+        ];
         if (this.extraRenderParams) {
             renderParams = renderParams.concat(this.extraRenderParams);
         }
 
         if (context.inline) {
-            var createInlineMarkoTemplateVar = context.helper('createInlineTemplate');
+            var createInlineMarkoTemplateVar = context.helper(
+                "createInlineTemplate"
+            );
 
-            return builder.functionCall(
-                createInlineMarkoTemplateVar,
-                [
-                    builder.identifier('__filename'),
-                    builder.functionDeclaration(
-                        null,
-                        renderParams,
-                        renderStatements)
-                ]);
+            return builder.functionCall(createInlineMarkoTemplateVar, [
+                builder.identifier("__filename"),
+                builder.functionDeclaration(
+                    null,
+                    renderParams,
+                    renderStatements
+                )
+            ]);
         } else {
-            var createArgs = context.useMeta ?
-                [ builder.identifier('__filename') ] :
-                [];
+            var createArgs = context.useMeta
+                ? [builder.identifier("__filename")]
+                : [];
 
-            let templateDeclaration = builder.variableDeclarator('marko_template',
+            let templateDeclaration = builder.variableDeclarator(
+                "marko_template",
                 builder.assignment(
                     builder.moduleExports(),
                     builder.functionCall(
                         builder.memberExpression(
                             builder.require(
-                                builder.literal(context.getModuleRuntimeTarget())
+                                builder.literal(
+                                    context.getModuleRuntimeTarget()
+                                )
                             ),
-                            builder.identifier('t')
+                            builder.identifier("t")
                         ),
                         createArgs
                     )
@@ -100,7 +109,7 @@ class TemplateRoot extends Node {
                 body.push(_buildVersionComment(builder, context));
             }
 
-            body.push(builder.literal('use strict'));
+            body.push(builder.literal("use strict"));
 
             let staticNodes = context.getStaticNodes([templateDeclaration]);
             if (staticNodes.length) {
@@ -108,21 +117,21 @@ class TemplateRoot extends Node {
             }
 
             let renderFunction = builder.functionDeclaration(
-                'render',
+                "render",
                 renderParams,
-                renderStatements);
+                renderStatements
+            );
 
-            body = body.concat([
-                renderFunction,
-            ]);
+            body = body.concat([renderFunction]);
 
             var assignRenderCode;
 
-            let templateVar = builder.identifier('marko_template');
-            let renderFunctionVar = builder.identifier('render');
+            let templateVar = builder.identifier("marko_template");
+            let renderFunctionVar = builder.identifier("render");
             let templateRendererMember = builder.memberExpression(
-                builder.identifier('marko_template'),
-                builder.identifier('_'));
+                builder.identifier("marko_template"),
+                builder.identifier("_")
+            );
 
             if (this.generateAssignRenderCode) {
                 var eventArgs = {
@@ -134,10 +143,10 @@ class TemplateRoot extends Node {
 
                 assignRenderCode = this.generateAssignRenderCode(eventArgs);
             } else {
-
                 assignRenderCode = builder.assignment(
                     templateRendererMember,
-                    renderFunctionVar);
+                    renderFunctionVar
+                );
             }
 
             if (assignRenderCode) {
@@ -145,9 +154,15 @@ class TemplateRoot extends Node {
             }
 
             if (context.useMeta && context.meta) {
-                body.push(builder.assignment(
-                    builder.memberExpression(builder.identifier('marko_template'), builder.identifier('meta')),
-                    builder.literal(context.meta)));
+                body.push(
+                    builder.assignment(
+                        builder.memberExpression(
+                            builder.identifier("marko_template"),
+                            builder.identifier("meta")
+                        ),
+                        builder.literal(context.meta)
+                    )
+                );
             }
 
             return builder.program(body);
@@ -158,7 +173,7 @@ class TemplateRoot extends Node {
         this.moduleCode = moduleCode;
     }
 
-    toJSON(prettyPrinter) {
+    toJSON() {
         return {
             type: this.type,
             body: this.body
diff --git a/src/compiler/ast/Text/html/generateCode.js b/src/compiler/ast/Text/html/generateCode.js
index cb06e9aeb..d0fc6a449 100644
--- a/src/compiler/ast/Text/html/generateCode.js
+++ b/src/compiler/ast/Text/html/generateCode.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-var escapeXml = require('../../../../runtime/html/helpers').x;
-var Literal = require('../../Literal');
+var escapeXml = require("../../../../runtime/html/helpers").x;
+var Literal = require("../../Literal");
 
 module.exports = function(node, codegen) {
     var context = codegen.context;
@@ -16,7 +16,10 @@ module.exports = function(node, codegen) {
                 return;
             }
 
-            if (context.isFlagSet('SCRIPT_BODY') || context.isFlagSet('STYLE_BODY')) {
+            if (
+                context.isFlagSet("SCRIPT_BODY") ||
+                context.isFlagSet("STYLE_BODY")
+            ) {
                 escape = false;
             }
 
@@ -29,23 +32,23 @@ module.exports = function(node, codegen) {
             let builder = codegen.builder;
 
             if (escape) {
-                let escapeIdentifier = context.helper('escapeXml');
+                let escapeIdentifier = context.helper("escapeXml");
 
-                if (context.isFlagSet('SCRIPT_BODY')) {
-                    escapeIdentifier = context.helper('escapeScript');
+                if (context.isFlagSet("SCRIPT_BODY")) {
+                    escapeIdentifier = context.helper("escapeScript");
                 }
 
-                if (context.isFlagSet('STYLE_BODY')) {
-                    escapeIdentifier = context.helper('escapeStyle');
+                if (context.isFlagSet("STYLE_BODY")) {
+                    escapeIdentifier = context.helper("escapeStyle");
                 }
 
                 // TODO Only escape the parts that need to be escaped if it is a compound expression with static
                 //      text parts
-                argument = builder.functionCall(
-                    escapeIdentifier,
-                    [argument]);
+                argument = builder.functionCall(escapeIdentifier, [argument]);
             } else {
-                argument = builder.functionCall(context.helper('str'), [ argument ]);
+                argument = builder.functionCall(context.helper("str"), [
+                    argument
+                ]);
             }
             htmlArray.push(argument);
         }
@@ -62,4 +65,4 @@ module.exports = function(node, codegen) {
     } else {
         return null;
     }
-};
\ No newline at end of file
+};
diff --git a/src/compiler/ast/Text/index.js b/src/compiler/ast/Text/index.js
index af80a0c19..dbfbcc5d8 100644
--- a/src/compiler/ast/Text/index.js
+++ b/src/compiler/ast/Text/index.js
@@ -1,16 +1,16 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
-var Node = require('../Node');
-var Literal = require('../Literal');
+var ok = require("assert").ok;
+var Node = require("../Node");
+var Literal = require("../Literal");
 
-var generateHTMLCode = require('./html/generateCode');
-var generateVDOMCode = require('./vdom/generateCode');
-var vdomUtil = require('../../util/vdom');
+var generateHTMLCode = require("./html/generateCode");
+var generateVDOMCode = require("./vdom/generateCode");
+var vdomUtil = require("../../util/vdom");
 
 class Text extends Node {
     constructor(def) {
-        super('Text');
+        super("Text");
         this.argument = def.argument;
         this.escape = def.escape !== false;
         this.normalized = false;
@@ -18,7 +18,7 @@ class Text extends Node {
         this.isLast = false;
         this.preserveWhitespace = def.preserveWhitespace === true;
 
-        ok(this.argument, 'Invalid argument');
+        ok(this.argument, "Invalid argument");
     }
 
     generateHTMLCode(codegen) {
@@ -30,14 +30,18 @@ class Text extends Node {
     }
 
     isLiteral() {
-        return this.argument instanceof Node && this.argument.type === 'Literal';
+        return (
+            this.argument instanceof Node && this.argument.type === "Literal"
+        );
     }
 
     isWhitespace() {
         var argument = this.argument;
-        return (argument instanceof Literal) &&
-            (typeof argument.value === 'string') &&
-            (argument.value.trim() === '');
+        return (
+            argument instanceof Literal &&
+            typeof argument.value === "string" &&
+            argument.value.trim() === ""
+        );
     }
 
     toJSON() {
@@ -48,4 +52,4 @@ class Text extends Node {
     }
 }
 
-module.exports = Text;
\ No newline at end of file
+module.exports = Text;
diff --git a/src/compiler/ast/Text/vdom/TextVDOM.js b/src/compiler/ast/Text/vdom/TextVDOM.js
index 781fa2945..61ceae3a9 100644
--- a/src/compiler/ast/Text/vdom/TextVDOM.js
+++ b/src/compiler/ast/Text/vdom/TextVDOM.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-const Node = require('../../Node');
-const Literal = require('../../Literal');
-const vdomUtil = require('../../../util/vdom');
+const Node = require("../../Node");
+const Literal = require("../../Literal");
+const vdomUtil = require("../../../util/vdom");
 
 class TextVDOM extends Node {
     constructor(def) {
-        super('TextVDOM');
+        super("TextVDOM");
         this.arguments = [def.argument];
         this.isStatic = def.isStatic;
         this.escape = def.escape !== false;
@@ -27,7 +27,7 @@ class TextVDOM extends Node {
     _append(appendArgument) {
         let args = this.arguments;
         let len = args.length;
-        let last = args[len-1];
+        let last = args[len - 1];
 
         if (last instanceof Literal && appendArgument instanceof Literal) {
             last.value += appendArgument.value;
@@ -59,16 +59,16 @@ class TextVDOM extends Node {
         let args = this.arguments;
         let escape = this.escape;
 
-        var funcName = escape ? 't' : 'h';
+        var funcName = escape ? "t" : "h";
 
         function writeTextArgs() {
-            writer.write('(');
+            writer.write("(");
 
-            for (let i=0, len=args.length; i<len; i++) {
+            for (let i = 0, len = args.length; i < len; i++) {
                 let arg = args[i];
 
                 if (i !== 0) {
-                    writer.write(' +\n');
+                    writer.write(" +\n");
                     writer.writeLineIndent();
                     writer.writeIndent();
                 }
@@ -76,16 +76,16 @@ class TextVDOM extends Node {
                 writer.write(arg);
             }
 
-            writer.write(')');
+            writer.write(")");
         }
 
         if (this.isChild) {
-            writer.write('.');
+            writer.write(".");
             writer.write(builder.identifier(funcName));
         } else if (this.isStatic && this.createTextId) {
             writer.write(this.createTextId);
         } else {
-            writer.write('out.');
+            writer.write("out.");
             writer.write(builder.identifier(funcName));
         }
 
@@ -93,4 +93,4 @@ class TextVDOM extends Node {
     }
 }
 
-module.exports = TextVDOM;
\ No newline at end of file
+module.exports = TextVDOM;
diff --git a/src/compiler/ast/Text/vdom/generateCode.js b/src/compiler/ast/Text/vdom/generateCode.js
index 53e100400..9e5344412 100644
--- a/src/compiler/ast/Text/vdom/generateCode.js
+++ b/src/compiler/ast/Text/vdom/generateCode.js
@@ -1,21 +1,21 @@
-'use strict';
+"use strict";
 
-var TextVDOM = require('./TextVDOM');
-var Literal = require('../../Literal');
-var he = require('he'); // Used for dealing with HTML entities
+var TextVDOM = require("./TextVDOM");
+var Literal = require("../../Literal");
+var he = require("he"); // Used for dealing with HTML entities
 
 module.exports = function(node, codegen, vdomUtil) {
     var argument = codegen.generateCode(node.argument);
     var escape = node.escape !== false;
     var isStatic = null;
 
-    if (codegen.context.isFlagSet('SCRIPT_BODY')) {
+    if (codegen.context.isFlagSet("SCRIPT_BODY")) {
         escape = true;
     }
 
     if (argument instanceof Literal) {
         var literalValue = argument.value;
-        if (literalValue == null || literalValue === '') {
+        if (literalValue == null || literalValue === "") {
             // Don't add empty text nodes to the final tree
             return null;
         }
@@ -23,17 +23,16 @@ module.exports = function(node, codegen, vdomUtil) {
         if (escape === false) {
             escape = true;
 
-            if (typeof literalValue === 'string') {
-                if (literalValue.indexOf('<') !== -1) {
+            if (typeof literalValue === "string") {
+                if (literalValue.indexOf("<") !== -1) {
                     escape = false;
-                } else if (literalValue.indexOf('&') !== -1) {
+                } else if (literalValue.indexOf("&") !== -1) {
                     argument = codegen.builder.literal(he.decode(literalValue));
                 }
             }
         }
-
     }
 
     isStatic = isStatic == null ? vdomUtil.isStaticValue(argument) : isStatic;
     return new TextVDOM({ argument, isStatic, escape });
-};
\ No newline at end of file
+};
diff --git a/src/compiler/ast/ThisExpression.js b/src/compiler/ast/ThisExpression.js
index 590a51054..2c2ebc767 100644
--- a/src/compiler/ast/ThisExpression.js
+++ b/src/compiler/ast/ThisExpression.js
@@ -1,23 +1,23 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class ThisExpression extends Node {
-    constructor(def) {
-        super('ThisExpression');
+    constructor() {
+        super("ThisExpression");
     }
 
-    generateCode(codegen) {
+    generateCode() {
         return this;
     }
 
     writeCode(writer) {
-        writer.write('this');
+        writer.write("this");
     }
 
     toString() {
-        return 'this';
+        return "this";
     }
 }
 
-module.exports = ThisExpression;
\ No newline at end of file
+module.exports = ThisExpression;
diff --git a/src/compiler/ast/UnaryExpression.js b/src/compiler/ast/UnaryExpression.js
index 2d99e85d4..3534a7d93 100644
--- a/src/compiler/ast/UnaryExpression.js
+++ b/src/compiler/ast/UnaryExpression.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 class UnaryExpression extends Node {
     constructor(def) {
-        super('UnaryExpression');
+        super("UnaryExpression");
         this.argument = def.argument;
         this.operator = def.operator;
         this.prefix = def.prefix === true;
@@ -24,21 +24,21 @@ class UnaryExpression extends Node {
         if (prefix) {
             writer.write(operator);
 
-            if (operator === 'typeof' || operator === 'delete') {
-                writer.write(' ');
+            if (operator === "typeof" || operator === "delete") {
+                writer.write(" ");
             }
         }
 
         var wrap = isCompoundExpression(argument);
 
         if (wrap) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(argument);
 
         if (wrap) {
-            writer.write(')');
+            writer.write(")");
         }
 
         if (!prefix) {
@@ -52,7 +52,7 @@ class UnaryExpression extends Node {
 
     toJSON() {
         return {
-            type: 'UnaryExpression',
+            type: "UnaryExpression",
             argument: this.argument,
             operator: this.operator,
             prefix: this.prefix
@@ -68,26 +68,26 @@ class UnaryExpression extends Node {
         var operator = this.operator;
         var prefix = this.prefix;
 
-        let result = '';
+        let result = "";
 
         if (prefix) {
             result += operator;
 
-            if (operator === 'typeof' || operator === 'delete') {
-                result += ' ';
+            if (operator === "typeof" || operator === "delete") {
+                result += " ";
             }
         }
 
         var wrap = isCompoundExpression(argument);
 
         if (wrap) {
-            result += '(';
+            result += "(";
         }
 
         result += argument;
 
         if (wrap) {
-            result += ')';
+            result += ")";
         }
 
         if (!prefix) {
@@ -98,4 +98,4 @@ class UnaryExpression extends Node {
     }
 }
 
-module.exports = UnaryExpression;
\ No newline at end of file
+module.exports = UnaryExpression;
diff --git a/src/compiler/ast/UpdateExpression.js b/src/compiler/ast/UpdateExpression.js
index b661fde7f..76ce0ee34 100644
--- a/src/compiler/ast/UpdateExpression.js
+++ b/src/compiler/ast/UpdateExpression.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var isCompoundExpression = require('../util/isCompoundExpression');
+var Node = require("./Node");
+var isCompoundExpression = require("../util/isCompoundExpression");
 
 class UpdateExpression extends Node {
     constructor(def) {
-        super('UpdateExpression');
+        super("UpdateExpression");
         this.argument = def.argument;
         this.operator = def.operator;
         this.prefix = def.prefix === true;
@@ -28,13 +28,13 @@ class UpdateExpression extends Node {
         var wrap = isCompoundExpression(argument);
 
         if (wrap) {
-            writer.write('(');
+            writer.write("(");
         }
 
         writer.write(argument);
 
         if (wrap) {
-            writer.write(')');
+            writer.write(")");
         }
 
         if (!prefix) {
@@ -48,7 +48,7 @@ class UpdateExpression extends Node {
 
     toJSON() {
         return {
-            type: 'UpdateExpression',
+            type: "UpdateExpression",
             argument: this.argument,
             operator: this.operator,
             prefix: this.prefix
@@ -64,7 +64,7 @@ class UpdateExpression extends Node {
         var operator = this.operator;
         var prefix = this.prefix;
 
-        let result = '';
+        let result = "";
 
         if (prefix) {
             result += operator;
@@ -73,13 +73,13 @@ class UpdateExpression extends Node {
         var wrap = isCompoundExpression(argument);
 
         if (wrap) {
-            result += '(';
+            result += "(";
         }
 
         result += argument;
 
         if (wrap) {
-            result += ')';
+            result += ")";
         }
 
         if (!prefix) {
@@ -90,4 +90,4 @@ class UpdateExpression extends Node {
     }
 }
 
-module.exports = UpdateExpression;
\ No newline at end of file
+module.exports = UpdateExpression;
diff --git a/src/compiler/ast/VariableDeclarator.js b/src/compiler/ast/VariableDeclarator.js
index 5dd33b0c1..ed9564d27 100644
--- a/src/compiler/ast/VariableDeclarator.js
+++ b/src/compiler/ast/VariableDeclarator.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
-var Identifier = require('./Identifier');
-var isValidJavaScriptVarName = require('../util/isValidJavaScriptVarName');
+var Node = require("./Node");
+var Identifier = require("./Identifier");
+var isValidJavaScriptVarName = require("../util/isValidJavaScriptVarName");
 
 class VariableDeclarator extends Node {
     constructor(def) {
-        super('VariableDeclarator');
+        super("VariableDeclarator");
         this.id = def.id;
         this.init = def.init;
 
@@ -16,8 +16,8 @@ class VariableDeclarator extends Node {
         }
 
         if (!isValidJavaScriptVarName(name)) {
-            var error = new Error('Invalid JavaScript variable name: ' + name);
-            error.code = 'INVALID_VAR_NAME';
+            var error = new Error("Invalid JavaScript variable name: " + name);
+            error.code = "INVALID_VAR_NAME";
             throw error;
         }
     }
@@ -32,14 +32,14 @@ class VariableDeclarator extends Node {
         var id = this.id;
         var init = this.init;
 
-        if (!(id instanceof Identifier) && typeof id !== 'string') {
-            throw new Error('Invalid variable name: ' + id);
+        if (!(id instanceof Identifier) && typeof id !== "string") {
+            throw new Error("Invalid variable name: " + id);
         }
 
         writer.write(id);
 
         if (init != null) {
-            writer.write(' = ');
+            writer.write(" = ");
             writer.write(init);
         }
     }
@@ -50,4 +50,4 @@ class VariableDeclarator extends Node {
     }
 }
 
-module.exports = VariableDeclarator;
\ No newline at end of file
+module.exports = VariableDeclarator;
diff --git a/src/compiler/ast/Vars.js b/src/compiler/ast/Vars.js
index 738923156..cb65a69f1 100644
--- a/src/compiler/ast/Vars.js
+++ b/src/compiler/ast/Vars.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class Vars extends Node {
     constructor(def) {
-        super('Vars');
-        this.kind = def.kind || 'var';
+        super("Vars");
+        this.kind = def.kind || "var";
         this.declarations = def.declarations;
         this.body = this.makeContainer(def.body);
     }
@@ -33,18 +33,17 @@ class Vars extends Node {
         var kind = this.kind;
         var isStatement = this.statement;
 
-
         if (!declarations || !declarations.length) {
             return;
         }
 
         writer.incIndent(4);
 
-        for (let i=0; i<declarations.length; i++) {
+        for (let i = 0; i < declarations.length; i++) {
             var declarator = declarations[i];
 
             if (i === 0) {
-                writer.write(kind + ' ');
+                writer.write(kind + " ");
             } else {
                 writer.writeLineIndent();
             }
@@ -52,10 +51,10 @@ class Vars extends Node {
             writer.write(declarator);
 
             if (i < declarations.length - 1) {
-                writer.write(',\n');
+                writer.write(",\n");
             } else {
                 if (isStatement) {
-                    writer.write(';\n');
+                    writer.write(";\n");
                 }
             }
         }
@@ -75,4 +74,4 @@ class Vars extends Node {
     }
 }
 
-module.exports = Vars;
\ No newline at end of file
+module.exports = Vars;
diff --git a/src/compiler/ast/WhileStatement.js b/src/compiler/ast/WhileStatement.js
index 9470086b3..49d771334 100644
--- a/src/compiler/ast/WhileStatement.js
+++ b/src/compiler/ast/WhileStatement.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var Node = require('./Node');
+var Node = require("./Node");
 
 class WhileStatement extends Node {
     constructor(def) {
-        super('WhileStatement');
+        super("WhileStatement");
         this.test = def.test;
         this.body = this.makeContainer(def.body);
     }
@@ -19,13 +19,13 @@ class WhileStatement extends Node {
         var test = this.test;
         var body = this.body;
 
-        writer.write('while (');
+        writer.write("while (");
         writer.write(test);
-        writer.write(') ');
+        writer.write(") ");
 
         writer.write(body);
 
-        writer.write('\n');
+        writer.write("\n");
     }
 
     walk(walker) {
@@ -34,4 +34,4 @@ class WhileStatement extends Node {
     }
 }
 
-module.exports = WhileStatement;
\ No newline at end of file
+module.exports = WhileStatement;
diff --git a/src/compiler/browser.json b/src/compiler/browser.json
index 214a8fc97..678dc4f56 100644
--- a/src/compiler/browser.json
+++ b/src/compiler/browser.json
@@ -4,4 +4,4 @@
         "../components/compiler.browser.json",
         "../runtime/compiler.browser.json"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/compiler/config.js b/src/compiler/config.js
index 4d97c91ec..6d4e545a3 100644
--- a/src/compiler/config.js
+++ b/src/compiler/config.js
@@ -1,7 +1,7 @@
 var config;
 
 /* globals window */
-var g = typeof window === 'undefined' ? global : window;
+var g = typeof window === "undefined" ? global : window;
 
 function shouldAssumeUpToDate() {
     if (process.env.MARKO_CLEAN != null) {
@@ -48,7 +48,7 @@ if (g.__MARKO_CONFIG) {
         preserveWhitespace: false,
 
         // The default output mode for compiled templates
-        output: 'html',
+        output: "html",
 
         /**
          * Whether the version should be written to the template as a comment e.g.
diff --git a/src/compiler/index.js b/src/compiler/index.js
index 80822e65f..47b508712 100644
--- a/src/compiler/index.js
+++ b/src/compiler/index.js
@@ -1,29 +1,32 @@
-'use strict';
+"use strict";
 
-var Compiler = require('./Compiler');
-var Walker = require('./Walker');
-var Parser = require('./Parser');
-var HtmlJsParser = require('./HtmlJsParser');
-var Builder = require('./Builder');
-var extend = require('raptor-util/extend');
-var CompileContext = require('./CompileContext');
-var globalConfig = require('./config');
-var CompileContext = require('./CompileContext');
-var InlineCompiler = require('./InlineCompiler');
-var ok = require('assert').ok;
-var fs = require('fs');
-var taglibLoader = require('./taglib-loader');
+var Compiler = require("./Compiler");
+var Walker = require("./Walker");
+var Parser = require("./Parser");
+var HtmlJsParser = require("./HtmlJsParser");
+var Builder = require("./Builder");
+var extend = require("raptor-util/extend");
+var CompileContext = require("./CompileContext");
+var globalConfig = require("./config");
+var InlineCompiler = require("./InlineCompiler");
+var ok = require("assert").ok;
+var fs = require("fs");
+var taglibLoader = require("./taglib-loader");
 
 var defaults = extend({}, globalConfig);
 
-Object.defineProperty(exports, 'defaultOptions', {
-    get: function() { return globalConfig;  },
+Object.defineProperty(exports, "defaultOptions", {
+    get: function() {
+        return globalConfig;
+    },
     enumerable: true,
     configurable: false
 });
 
-Object.defineProperty(exports, 'config', {
-    get: function() { return globalConfig;  },
+Object.defineProperty(exports, "config", {
+    get: function() {
+        return globalConfig;
+    },
     enumerable: true,
     configurable: false
 });
@@ -35,7 +38,8 @@ var rawParser = new Parser(
     }),
     {
         raw: true
-    });
+    }
+);
 
 function configure(newConfig) {
     if (!newConfig) {
@@ -60,14 +64,14 @@ function createWalker(options) {
 }
 
 function shouldIgnoreUnrecognizedTags(path) {
-    return path.endsWith('.xml') || path.endsWith('.xml.marko');
+    return path.endsWith(".xml") || path.endsWith(".xml.marko");
 }
 
 function _compile(src, filename, userOptions, callback) {
     registerCoreTaglibs();
 
     ok(filename, '"filename" argument is required');
-    ok(typeof filename === 'string', '"filename" argument should be a string');
+    ok(typeof filename === "string", '"filename" argument should be a string');
 
     var options = {};
 
@@ -90,7 +94,7 @@ function _compile(src, filename, userOptions, callback) {
 
         try {
             compiled = compiler.compile(src, context);
-        } catch(e) {
+        } catch (e) {
             return callback(e);
         }
 
@@ -102,7 +106,7 @@ function _compile(src, filename, userOptions, callback) {
 }
 
 function compile(src, filename, options, callback) {
-    if (typeof options === 'function') {
+    if (typeof options === "function") {
         callback = options;
         options = null;
     }
@@ -114,23 +118,26 @@ function compile(src, filename, options, callback) {
 }
 
 function compileForBrowser(src, filename, options, callback) {
-    if (typeof options === 'function') {
+    if (typeof options === "function") {
         callback = options;
         options = null;
     }
 
-    options = extend({
-        output: 'vdom',
-        meta: false,
-        browser: true,
-        sourceOnly: false
-    }, options);
+    options = extend(
+        {
+            output: "vdom",
+            meta: false,
+            browser: true,
+            sourceOnly: false
+        },
+        options
+    );
 
     return compile(src, filename, options, callback);
 }
 
 function compileFile(filename, options, callback) {
-    if (typeof options === 'function') {
+    if (typeof options === "function") {
         callback = options;
         options = null;
     }
@@ -139,7 +146,7 @@ function compileFile(filename, options, callback) {
     options.sourceOnly = options.sourceOnly !== false;
 
     if (callback) {
-        fs.readFile(filename, {encoding: 'utf8'}, function(err, templateSrc) {
+        fs.readFile(filename, { encoding: "utf8" }, function(err, templateSrc) {
             if (err) {
                 return callback(err);
             }
@@ -147,22 +154,24 @@ function compileFile(filename, options, callback) {
             _compile(templateSrc, filename, options, callback);
         });
     } else {
-        let templateSrc = fs.readFileSync(filename, {encoding: 'utf8'});
+        let templateSrc = fs.readFileSync(filename, { encoding: "utf8" });
         return _compile(templateSrc, filename, options, callback);
     }
 }
 
 function compileFileForBrowser(filename, options, callback) {
-    if (typeof options === 'function') {
+    if (typeof options === "function") {
         callback = options;
         options = null;
     }
 
-    options = extend({output: 'vdom', meta: false, browser: true, sourceOnly: false}, options);
+    options = extend(
+        { output: "vdom", meta: false, browser: true, sourceOnly: false },
+        options
+    );
     return compileFile(filename, options, callback);
 }
 
-
 function createInlineCompiler(filename, userOptions) {
     registerCoreTaglibs();
 
@@ -175,16 +184,16 @@ function createInlineCompiler(filename, userOptions) {
     }
 
     var compiler = defaultCompiler;
-    var context = new CompileContext('', filename, compiler.builder, options);
+    var context = new CompileContext("", filename, compiler.builder, options);
     return new InlineCompiler(context, compiler);
 }
 
-function checkUpToDate(templateFile, templateJsFile) {
+function checkUpToDate(/*templateFile, templateJsFile*/) {
     return false; // TODO Implement checkUpToDate
 }
 
 function getLastModified(path, options, callback) {
-    if (typeof options === 'function') {
+    if (typeof options === "function") {
         callback = options;
         options = null;
     }
@@ -200,16 +209,23 @@ function clearCaches() {
 
 function parseRaw(templateSrc, filename) {
     registerCoreTaglibs();
-    var context = new CompileContext(templateSrc, filename, Builder.DEFAULT_BUILDER);
+    var context = new CompileContext(
+        templateSrc,
+        filename,
+        Builder.DEFAULT_BUILDER
+    );
     var parsed = rawParser.parse(templateSrc, context);
 
     if (context.hasErrors()) {
         var errors = context.getErrors();
 
-        var message = 'An error occurred while trying to compile template at path "' + filename + '". Error(s) in template:\n';
+        var message =
+            'An error occurred while trying to compile template at path "' +
+            filename +
+            '". Error(s) in template:\n';
         for (var i = 0, len = errors.length; i < len; i++) {
             let error = errors[i];
-            message += (i + 1) + ') ' + error.toString() + '\n';
+            message += i + 1 + ") " + error.toString() + "\n";
         }
         var error = new Error(message);
         error.errors = errors;
@@ -234,10 +250,10 @@ exports.builder = Builder.DEFAULT_BUILDER;
 exports.configure = configure;
 exports.clearCaches = clearCaches;
 
-var taglibLookup = require('./taglib-lookup');
+var taglibLookup = require("./taglib-lookup");
 exports.taglibLookup = taglibLookup;
 exports.taglibLoader = taglibLoader;
-exports.taglibFinder = require('./taglib-finder');
+exports.taglibFinder = require("./taglib-finder");
 
 function registerTaglib(taglibProps, taglibPath) {
     var taglib = taglibLoader.createTaglib(taglibPath);
@@ -250,15 +266,35 @@ var coreTaglibsRegistered = false;
 function registerCoreTaglibs() {
     if (!coreTaglibsRegistered) {
         coreTaglibsRegistered = true;
-        registerTaglib(require('../taglibs/core/marko.json'), require.resolve('../taglibs/core/marko.json'));
-        registerTaglib(require('../taglibs/layout/marko.json'), require.resolve('../taglibs/layout/marko.json'));
-        registerTaglib(require('../taglibs/html/marko.json'), require.resolve('../taglibs/html/marko.json'));
-        registerTaglib(require('../taglibs/svg/marko.json'), require.resolve('../taglibs/svg/marko.json'));
-        registerTaglib(require('../taglibs/async/marko.json'), require.resolve('../taglibs/async/marko.json'));
-        registerTaglib(require('../taglibs/cache/marko.json'), require.resolve('../taglibs/cache/marko.json'));
-        registerTaglib(require('../components/taglib/marko.json'), require.resolve('../components/taglib/marko.json'));
+        registerTaglib(
+            require("../taglibs/core/marko.json"),
+            require.resolve("../taglibs/core/marko.json")
+        );
+        registerTaglib(
+            require("../taglibs/layout/marko.json"),
+            require.resolve("../taglibs/layout/marko.json")
+        );
+        registerTaglib(
+            require("../taglibs/html/marko.json"),
+            require.resolve("../taglibs/html/marko.json")
+        );
+        registerTaglib(
+            require("../taglibs/svg/marko.json"),
+            require.resolve("../taglibs/svg/marko.json")
+        );
+        registerTaglib(
+            require("../taglibs/async/marko.json"),
+            require.resolve("../taglibs/async/marko.json")
+        );
+        registerTaglib(
+            require("../taglibs/cache/marko.json"),
+            require.resolve("../taglibs/cache/marko.json")
+        );
+        registerTaglib(
+            require("../components/taglib/marko.json"),
+            require.resolve("../components/taglib/marko.json")
+        );
     }
-
 }
 
 function buildTaglibLookup(dirname) {
@@ -271,11 +307,11 @@ exports.buildTaglibLookup = buildTaglibLookup;
 exports.registerTaglib = function(filePath) {
     registerCoreTaglibs();
 
-    ok(typeof filePath === 'string', '"filePath" should be a string');
+    ok(typeof filePath === "string", '"filePath" should be a string');
     var taglib = taglibLoader.loadTaglibFromFile(filePath);
     taglibLookup.registerTaglib(taglib);
     clearCaches();
 };
 
 exports.isVDOMSupported = true;
-exports.modules = require('./modules');
+exports.modules = require("./modules");
diff --git a/src/compiler/modules.js b/src/compiler/modules.js
index 809ccf635..545031f9b 100644
--- a/src/compiler/modules.js
+++ b/src/compiler/modules.js
@@ -1,19 +1,18 @@
-'use strict';
+"use strict";
 
 var nativeRequire = require;
-var resolveFrom = require('resolve-from');
-var deresolve = require('./util/deresolve');
+var resolveFrom = require("resolve-from");
+var deresolve = require("./util/deresolve");
 
 const deresolveOptions = {
     shouldRemoveExt(ext) {
-        return ext === '.js' || ext === '.json' || ext === '.es6';
+        return ext === ".js" || ext === ".json" || ext === ".es6";
     }
 };
 
 // This allows us to swap out a different implementation in the browser...
 // We only need this to make Try Online work :/
 
-
 var helpers = {
     require: function(path) {
         return nativeRequire(path);
@@ -32,5 +31,4 @@ var helpers = {
     }
 };
 
-
 module.exports = helpers;
diff --git a/src/compiler/taglib-finder/index.js b/src/compiler/taglib-finder/index.js
index f4d9599eb..62121325f 100644
--- a/src/compiler/taglib-finder/index.js
+++ b/src/compiler/taglib-finder/index.js
@@ -1,16 +1,15 @@
-'use strict';
-var taglibLoader = require('../taglib-loader');
-var nodePath = require('path');
-var lassoPackageRoot = require('lasso-package-root');
-var resolveFrom = require('resolve-from');
-var scanTagsDir = require('../taglib-loader/scanTagsDir');
-var DependencyChain = require('../taglib-loader/DependencyChain');
-var lassoCachingFS = require('lasso-caching-fs');
+"use strict";
+var taglibLoader = require("../taglib-loader");
+var nodePath = require("path");
+var lassoPackageRoot = require("lasso-package-root");
+var resolveFrom = require("resolve-from");
+var scanTagsDir = require("../taglib-loader/scanTagsDir");
+var DependencyChain = require("../taglib-loader/DependencyChain");
+var lassoCachingFS = require("lasso-caching-fs");
 
 var findCache = {};
 var excludedDirs = {};
 var excludedPackages = {};
-var taglibsForNodeModulesDirCache = {};
 
 /**
  * Reset all internal state to the default state. This
@@ -21,7 +20,6 @@ function reset() {
     findCache = {};
     excludedDirs = {};
     excludedPackages = {};
-    taglibsForNodeModulesDirCache = {};
 }
 
 function existsCached(path) {
@@ -31,7 +29,7 @@ function existsCached(path) {
 function getModuleRootPackage(dirname) {
     try {
         return lassoPackageRoot.getRootPackage(dirname);
-    } catch(e) {
+    } catch (e) {
         return undefined;
     }
 }
@@ -40,19 +38,19 @@ function getAllDependencyNames(pkg) {
     var map = {};
 
     if (pkg.dependencies) {
-        Object.keys(pkg.dependencies).forEach((name) => {
+        Object.keys(pkg.dependencies).forEach(name => {
             map[name] = true;
         });
     }
 
     if (pkg.peerDependencies) {
-        Object.keys(pkg.peerDependencies).forEach((name) => {
+        Object.keys(pkg.peerDependencies).forEach(name => {
             map[name] = true;
         });
     }
 
     if (pkg.devDependencies) {
-        Object.keys(pkg.devDependencies).forEach((name) => {
+        Object.keys(pkg.devDependencies).forEach(name => {
             map[name] = true;
         });
     }
@@ -91,12 +89,12 @@ function find(dirname, registeredTaglibs) {
         rootDirname = rootPkg.__dirname; // Use the package's root directory as the top-level directory
     }
 
-
     // First walk up the directory tree looking for marko.json files or components/ directories
     let curDirname = dirname;
-    while(true) {
-        if(!excludedDirs[curDirname]) {
-            let taglibPath = nodePath.join(curDirname, 'marko.json');
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        if (!excludedDirs[curDirname]) {
+            let taglibPath = nodePath.join(curDirname, "marko.json");
             let taglib;
 
             if (existsCached(taglibPath)) {
@@ -105,15 +103,24 @@ function find(dirname, registeredTaglibs) {
             }
 
             if (!taglib || taglib.tagsDir === undefined) {
-                let componentsPath = nodePath.join(curDirname, 'components');
+                let componentsPath = nodePath.join(curDirname, "components");
 
-                if (existsCached(componentsPath) && !excludedDirs[componentsPath] && !helper.alreadyAdded(componentsPath)) {
+                if (
+                    existsCached(componentsPath) &&
+                    !excludedDirs[componentsPath] &&
+                    !helper.alreadyAdded(componentsPath)
+                ) {
                     let taglib = taglibLoader.createTaglib(componentsPath);
-                    scanTagsDir(componentsPath, nodePath.dirname(componentsPath), './components', taglib, new DependencyChain([componentsPath]));
+                    scanTagsDir(
+                        componentsPath,
+                        nodePath.dirname(componentsPath),
+                        "./components",
+                        taglib,
+                        new DependencyChain([componentsPath])
+                    );
                     helper.addTaglib(taglib);
                 }
             }
-
         }
 
         if (curDirname === rootDirname) {
@@ -129,9 +136,12 @@ function find(dirname, registeredTaglibs) {
 
     if (rootPkg) {
         // Now look for `marko.json` from installed packages
-        getAllDependencyNames(rootPkg).forEach((name) => {
+        getAllDependencyNames(rootPkg).forEach(name => {
             if (!excludedPackages[name]) {
-                let taglibPath = resolveFrom(rootPkg.__dirname, name + '/marko.json');
+                let taglibPath = resolveFrom(
+                    rootPkg.__dirname,
+                    name + "/marko.json"
+                );
                 if (taglibPath) {
                     var taglib = taglibLoader.loadTaglibFromFile(taglibPath);
                     helper.addTaglib(taglib);
@@ -150,7 +160,6 @@ function find(dirname, registeredTaglibs) {
 function clearCache() {
     lassoCachingFS.clearCaches();
     findCache = {};
-    taglibsForNodeModulesDirCache = {};
 }
 
 function excludeDir(dir) {
@@ -165,4 +174,4 @@ exports.reset = reset;
 exports.find = find;
 exports.clearCache = clearCache;
 exports.excludeDir = excludeDir;
-exports.excludePackage = excludePackage;
\ No newline at end of file
+exports.excludePackage = excludePackage;
diff --git a/src/compiler/taglib-loader/Attribute.js b/src/compiler/taglib-loader/Attribute.js
index 967dcacd9..2f49db355 100644
--- a/src/compiler/taglib-loader/Attribute.js
+++ b/src/compiler/taglib-loader/Attribute.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class Attribute {
     constructor(name) {
@@ -12,4 +12,4 @@ class Attribute {
     }
 }
 
-module.exports = Attribute;
\ No newline at end of file
+module.exports = Attribute;
diff --git a/src/compiler/taglib-loader/DependencyChain.js b/src/compiler/taglib-loader/DependencyChain.js
index ef81ce81a..12da59294 100644
--- a/src/compiler/taglib-loader/DependencyChain.js
+++ b/src/compiler/taglib-loader/DependencyChain.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class DependencyChain {
     constructor(array) {
@@ -10,8 +10,8 @@ class DependencyChain {
     }
 
     toString() {
-        return '[' + this.array.join(' → ') + ']';
+        return "[" + this.array.join(" → ") + "]";
     }
 }
 
-module.exports = DependencyChain;
\ No newline at end of file
+module.exports = DependencyChain;
diff --git a/src/compiler/taglib-loader/ImportedVariable.js b/src/compiler/taglib-loader/ImportedVariable.js
index e6c2cef99..f523ee135 100644
--- a/src/compiler/taglib-loader/ImportedVariable.js
+++ b/src/compiler/taglib-loader/ImportedVariable.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class ImportedVariable {
     constructor() {
@@ -7,4 +7,4 @@ class ImportedVariable {
     }
 }
 
-module.exports = ImportedVariable;
\ No newline at end of file
+module.exports = ImportedVariable;
diff --git a/src/compiler/taglib-loader/NestedVariable.js b/src/compiler/taglib-loader/NestedVariable.js
index 4506596df..9e924e171 100644
--- a/src/compiler/taglib-loader/NestedVariable.js
+++ b/src/compiler/taglib-loader/NestedVariable.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class NestedVariable {
     constructor() {
@@ -6,4 +6,4 @@ class NestedVariable {
     }
 }
 
-module.exports = NestedVariable;
\ No newline at end of file
+module.exports = NestedVariable;
diff --git a/src/compiler/taglib-loader/Property.js b/src/compiler/taglib-loader/Property.js
index d593287a2..f89eaffc4 100644
--- a/src/compiler/taglib-loader/Property.js
+++ b/src/compiler/taglib-loader/Property.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
 class Property {
     constructor() {
         this.name = null;
-        this.type = 'string';
+        this.type = "string";
         this.value = undefined;
     }
 }
 
-module.exports = Property;
\ No newline at end of file
+module.exports = Property;
diff --git a/src/compiler/taglib-loader/Tag.js b/src/compiler/taglib-loader/Tag.js
index 6a0e010f2..7b2c998e8 100644
--- a/src/compiler/taglib-loader/Tag.js
+++ b/src/compiler/taglib-loader/Tag.js
@@ -1,12 +1,12 @@
-'use strict';
-var forEachEntry = require('raptor-util/forEachEntry');
-var ok = require('assert').ok;
+"use strict";
+var forEachEntry = require("raptor-util/forEachEntry");
+var ok = require("assert").ok;
 var CustomTag;
-var path = require('path');
-var markoModules = require('../modules');
+var path = require("path");
+var markoModules = require("../modules");
 
 function createCustomTag(el, tagDef) {
-    CustomTag = CustomTag || require('../ast/CustomTag');
+    CustomTag = CustomTag || require("../ast/CustomTag");
     return new CustomTag(el, tagDef);
 }
 
@@ -16,7 +16,7 @@ function createCustomTagNodeFactory(tagDef) {
     };
 }
 
-class Tag{
+class Tag {
     constructor(filePath) {
         this.filePath = filePath;
         if (filePath) {
@@ -64,13 +64,13 @@ class Tag{
             return;
         }
 
-        forEachEntry(this.importedVariables, function (key, importedVariable) {
+        forEachEntry(this.importedVariables, function(key, importedVariable) {
             callback.call(thisObj, importedVariable);
         });
     }
 
     forEachTransformer(callback, thisObj) {
-        forEachEntry(this.transformers, function (key, transformer) {
+        forEachEntry(this.transformers, function(key, transformer) {
             callback.call(thisObj, transformer);
         });
     }
@@ -80,7 +80,6 @@ class Tag{
             if (this.transformers.hasOwnProperty(k)) {
                 return true;
             }
-
         }
         return false;
     }
@@ -90,15 +89,16 @@ class Tag{
         if (attr.pattern) {
             this.patternAttributes.push(attr);
         } else {
-            if (attr.name === '*') {
+            if (attr.name === "*") {
                 attr.dynamicAttribute = true;
 
-                if (attr.targetProperty === null || attr.targetProperty === '') {
+                if (
+                    attr.targetProperty === null ||
+                    attr.targetProperty === ""
+                ) {
                     attr.targetProperty = null;
-
-                }
-                else if (!attr.targetProperty) {
-                    attr.targetProperty = '*';
+                } else if (!attr.targetProperty) {
+                    attr.targetProperty = "*";
                 }
             }
 
@@ -106,7 +106,7 @@ class Tag{
         }
     }
     toString() {
-        return '[Tag: <' + this.name + '@' + this.taglibId + '>]';
+        return "[Tag: <" + this.name + "@" + this.taglibId + ">]";
     }
     forEachAttribute(callback, thisObj) {
         for (var attrName in this.attributes) {
@@ -119,7 +119,7 @@ class Tag{
         var attributes = this.attributes;
 
         // try by exact match first
-        var attribute = attributes[attrName] || attributes['*'];
+        var attribute = attributes[attrName] || attributes["*"];
 
         if (attribute === undefined && this.patternAttributes) {
             // try searching by pattern
@@ -191,7 +191,7 @@ class Tag{
             return;
         }
 
-        forEachEntry(this.nestedTags, function (key, nestedTag) {
+        forEachEntry(this.nestedTags, function(key, nestedTag) {
             callback.call(thisObj, nestedTag);
         });
     }
@@ -207,7 +207,9 @@ class Tag{
         let codeGeneratorModulePath = this.codeGeneratorModulePath;
 
         if (this.codeGeneratorModulePath) {
-            var loadedCodeGenerator = markoModules.require(this.codeGeneratorModulePath);
+            var loadedCodeGenerator = markoModules.require(
+                this.codeGeneratorModulePath
+            );
             nodeFactory = function(elNode) {
                 elNode.setType(codeGeneratorModulePath);
                 elNode.setCodeGenerator(loadedCodeGenerator);
@@ -215,8 +217,12 @@ class Tag{
             };
         } else if (this.nodeFactoryPath) {
             nodeFactory = markoModules.require(this.nodeFactoryPath);
-            if (typeof nodeFactory !== 'function') {
-                throw new Error('Invalid node factory exported by module at path "' + this.nodeFactoryPath + '"');
+            if (typeof nodeFactory !== "function") {
+                throw new Error(
+                    'Invalid node factory exported by module at path "' +
+                        this.nodeFactoryPath +
+                        '"'
+                );
             }
         } else if (this.renderer || this.template || this.isNestedTag) {
             nodeFactory = createCustomTagNodeFactory(this);
diff --git a/src/compiler/taglib-loader/Taglib.js b/src/compiler/taglib-loader/Taglib.js
index 5d2fbaae0..8ffc87861 100644
--- a/src/compiler/taglib-loader/Taglib.js
+++ b/src/compiler/taglib-loader/Taglib.js
@@ -1,8 +1,8 @@
-'use strict';
-var forEachEntry = require('raptor-util/forEachEntry');
-var ok = require('assert').ok;
-var path = require('path');
-var loaders = require('./loaders');
+"use strict";
+var forEachEntry = require("raptor-util/forEachEntry");
+var ok = require("assert").ok;
+var path = require("path");
+var loaders = require("./loaders");
 
 function handleImport(taglib, importedTaglib) {
     var importsLookup = taglib.importsLookup || (taglib.importsLookup = {});
@@ -46,7 +46,9 @@ class Taglib {
         attribute.filePath = this.filePath;
 
         if (!attribute.pattern && !attribute.name) {
-            throw new Error('Invalid attribute: ' + require('util').inspect(attribute));
+            throw new Error(
+                "Invalid attribute: " + require("util").inspect(attribute)
+            );
         }
 
         this.attributes[attribute.key] = attribute;
@@ -64,7 +66,7 @@ class Taglib {
         return attribute;
     }
     addTag(tag) {
-        ok(arguments.length === 1, 'Invalid args');
+        ok(arguments.length === 1, "Invalid args");
         if (!tag.name) {
             throw new Error('"tag.name" is required: ' + JSON.stringify(tag));
         }
@@ -78,9 +80,13 @@ class Taglib {
         this.transformers.push(transformer);
     }
     forEachTag(callback, thisObj) {
-        forEachEntry(this.tags, function (key, tag) {
-            callback.call(thisObj, tag);
-        }, this);
+        forEachEntry(
+            this.tags,
+            function(key, tag) {
+                callback.call(thisObj, tag);
+            },
+            this
+        );
     }
 
     addImport(path) {
@@ -100,4 +106,4 @@ class Taglib {
     }
 }
 
-module.exports = Taglib;
\ No newline at end of file
+module.exports = Taglib;
diff --git a/src/compiler/taglib-loader/Transformer.js b/src/compiler/taglib-loader/Transformer.js
index 8a2e3082d..526541d90 100644
--- a/src/compiler/taglib-loader/Transformer.js
+++ b/src/compiler/taglib-loader/Transformer.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 var nextTransformerId = 0;
-var markoModules = require('../modules');
+var markoModules = require("../modules");
 
 class Transformer {
     constructor() {
@@ -15,13 +15,17 @@ class Transformer {
 
     getFunc() {
         if (!this.path) {
-            throw new Error('Transformer path not defined for tag transformer (tag=' + this.tag + ')');
+            throw new Error(
+                "Transformer path not defined for tag transformer (tag=" +
+                    this.tag +
+                    ")"
+            );
         }
 
         if (!this._func) {
             var transformer = markoModules.require(this.path);
 
-            if (typeof transformer === 'function') {
+            if (typeof transformer === "function") {
                 if (transformer.prototype.process) {
                     var Clazz = transformer;
                     var instance = new Clazz();
@@ -37,8 +41,8 @@ class Transformer {
         return this._func;
     }
     toString() {
-        return '[Taglib.Transformer: ' + this.path + ']';
+        return "[Taglib.Transformer: " + this.path + "]";
     }
 }
 
-module.exports = Transformer;
\ No newline at end of file
+module.exports = Transformer;
diff --git a/src/compiler/taglib-loader/cache.js b/src/compiler/taglib-loader/cache.js
index 67fd8c325..660d157ce 100644
--- a/src/compiler/taglib-loader/cache.js
+++ b/src/compiler/taglib-loader/cache.js
@@ -14,4 +14,4 @@ function clear() {
 
 exports.get = get;
 exports.put = put;
-exports.clear = clear;
\ No newline at end of file
+exports.clear = clear;
diff --git a/src/compiler/taglib-loader/index.js b/src/compiler/taglib-loader/index.js
index 858a0b438..1125e8994 100644
--- a/src/compiler/taglib-loader/index.js
+++ b/src/compiler/taglib-loader/index.js
@@ -1,8 +1,8 @@
-var cache = require('./cache');
+var cache = require("./cache");
 
-var types = require('./types');
-var loaders = require('./loaders');
-var DependencyChain = require('./DependencyChain');
+var types = require("./types");
+var loaders = require("./loaders");
+var DependencyChain = require("./DependencyChain");
 
 function loadTaglibFromProps(taglib, taglibProps) {
     return loaders.loadTaglibFromProps(taglib, taglibProps);
@@ -22,7 +22,11 @@ function createTaglib(filePath) {
 
 function loadTag(tagProps, filePath) {
     var tag = new types.Tag(filePath);
-    loaders.loadTagFromProps(tag, tagProps, new DependencyChain(filePath ? [filePath] : []));
+    loaders.loadTagFromProps(
+        tag,
+        tagProps,
+        new DependencyChain(filePath ? [filePath] : [])
+    );
     return tag;
 }
 
@@ -30,4 +34,4 @@ exports.clearCache = clearCache;
 exports.createTaglib = createTaglib;
 exports.loadTaglibFromProps = loadTaglibFromProps;
 exports.loadTaglibFromFile = loadTaglibFromFile;
-exports.loadTag = loadTag;
\ No newline at end of file
+exports.loadTag = loadTag;
diff --git a/src/compiler/taglib-loader/json-file-reader.js b/src/compiler/taglib-loader/json-file-reader.js
index e7d241bd4..34f4a6216 100644
--- a/src/compiler/taglib-loader/json-file-reader.js
+++ b/src/compiler/taglib-loader/json-file-reader.js
@@ -1,14 +1,16 @@
-var fs = require('fs');
-var stripJsonComments = require('strip-json-comments');
-var fsReadOptions = { encoding: 'utf8' };
+var fs = require("fs");
+var stripJsonComments = require("strip-json-comments");
+var fsReadOptions = { encoding: "utf8" };
 
-exports.readFileSync = function (path) {
+exports.readFileSync = function(path) {
     var json = fs.readFileSync(path, fsReadOptions);
 
     try {
         var taglibProps = JSON.parse(stripJsonComments(json));
         return taglibProps;
-    } catch(e) {
-        throw new Error('Unable to parse JSON file at path "' + path + '". Error: ' + e);
+    } catch (e) {
+        throw new Error(
+            'Unable to parse JSON file at path "' + path + '". Error: ' + e
+        );
     }
 };
diff --git a/src/compiler/taglib-loader/loadAttributeFromProps.js b/src/compiler/taglib-loader/loadAttributeFromProps.js
index 41825c754..70677e3aa 100644
--- a/src/compiler/taglib-loader/loadAttributeFromProps.js
+++ b/src/compiler/taglib-loader/loadAttributeFromProps.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var assert = require('assert');
-var raptorRegexp = require('raptor-regexp');
-var propertyHandlers = require('property-handlers');
-var types = require('./types');
-var createError = require('raptor-util/createError');
+var assert = require("assert");
+var raptorRegexp = require("raptor-regexp");
+var propertyHandlers = require("property-handlers");
+var types = require("./types");
+var createError = require("raptor-util/createError");
 
 class AttrLoader {
     constructor(attr, dependencyChain) {
@@ -20,12 +20,12 @@ class AttrLoader {
 
         if (attrProps == null) {
             attrProps = {};
-        } else if (typeof attrProps === 'string') {
+        } else if (typeof attrProps === "string") {
             attrProps = {
                 type: attrProps
             };
         } else {
-            assert.ok(typeof attrProps === 'object', 'Invalid "attrProps"');
+            assert.ok(typeof attrProps === "object", 'Invalid "attrProps"');
         }
 
         propertyHandlers(attrProps, this, this.dependencyChain.toString());
@@ -47,7 +47,7 @@ class AttrLoader {
      */
     type(value) {
         var attr = this.attr;
-        if (value.charAt(0) === '#') {
+        if (value.charAt(0) === "#") {
             attr.ref = value.substring(1);
         } else {
             attr.type = value;
@@ -132,9 +132,7 @@ class AttrLoader {
     /**
      * The description of the attribute. Only used for documentation.
      */
-    description() {
-
-    }
+    description() {}
 
     /**
      * The "set-flag" property allows a "flag" to be added to a Node instance
@@ -210,9 +208,8 @@ class AttrLoader {
     }
 }
 
-
 function loadAttributeFromProps(attrName, attrProps, dependencyChain) {
-    assert.ok(typeof attrName === 'string');
+    assert.ok(typeof attrName === "string");
     assert.ok(dependencyChain, '"dependencyChain" is required');
 
     var attr = new types.Attribute(attrName);
@@ -221,8 +218,16 @@ function loadAttributeFromProps(attrName, attrProps, dependencyChain) {
 
     try {
         attrLoader.load(attrProps);
-    } catch(err) {
-        throw createError('Unable to load attribute "' + attrName + '" (' + dependencyChain + '): ' + err, err);
+    } catch (err) {
+        throw createError(
+            'Unable to load attribute "' +
+                attrName +
+                '" (' +
+                dependencyChain +
+                "): " +
+                err,
+            err
+        );
     }
 
     return attr;
@@ -232,5 +237,4 @@ loadAttributeFromProps.isSupportedProperty = function(name) {
     return AttrLoader.prototype.hasOwnProperty(name);
 };
 
-
 module.exports = loadAttributeFromProps;
diff --git a/src/compiler/taglib-loader/loadAttributes.js b/src/compiler/taglib-loader/loadAttributes.js
index 6dbd82d76..080a3cad3 100644
--- a/src/compiler/taglib-loader/loadAttributes.js
+++ b/src/compiler/taglib-loader/loadAttributes.js
@@ -1,6 +1,6 @@
-var ok = require('assert').ok;
-var forEachEntry = require('raptor-util/forEachEntry');
-var loaders = require('./loaders');
+var ok = require("assert").ok;
+var forEachEntry = require("raptor-util/forEachEntry");
+var loaders = require("./loaders");
 
 module.exports = function loadAttributes(value, parent, dependencyChain) {
     ok(parent);
@@ -10,8 +10,9 @@ module.exports = function loadAttributes(value, parent, dependencyChain) {
         var attr = loaders.loadAttributeFromProps(
             attrName,
             attrProps,
-            dependencyChain.append('@' + attrName));
+            dependencyChain.append("@" + attrName)
+        );
 
         parent.addAttribute(attr);
     });
-};
\ No newline at end of file
+};
diff --git a/src/compiler/taglib-loader/loadTagFromFile.js b/src/compiler/taglib-loader/loadTagFromFile.js
index c49a99762..ae3db7dce 100644
--- a/src/compiler/taglib-loader/loadTagFromFile.js
+++ b/src/compiler/taglib-loader/loadTagFromFile.js
@@ -1,9 +1,9 @@
-var jsonFileReader = require('./json-file-reader');
-var types = require('./types');
-var cache = require('./cache');
-var loaders = require('./loaders');
+var jsonFileReader = require("./json-file-reader");
+var types = require("./types");
+var cache = require("./cache");
+var loaders = require("./loaders");
 
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 
 function loadTagFromFile(filePath) {
     ok(filePath, '"filePath" is required');
@@ -18,10 +18,9 @@ function loadTagFromFile(filePath) {
 
         var tagProps = jsonFileReader.readFileSync(filePath);
         loaders.loadTagFromProps(tag, tagProps);
-
     }
 
     return tag;
 }
 
-module.exports = loadTagFromFile;
\ No newline at end of file
+module.exports = loadTagFromFile;
diff --git a/src/compiler/taglib-loader/loadTagFromProps.js b/src/compiler/taglib-loader/loadTagFromProps.js
index fc3049b19..67c346d44 100644
--- a/src/compiler/taglib-loader/loadTagFromProps.js
+++ b/src/compiler/taglib-loader/loadTagFromProps.js
@@ -1,32 +1,29 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
-var propertyHandlers = require('property-handlers');
-var isObjectEmpty = require('raptor-util/isObjectEmpty');
-var nodePath = require('path');
-var markoModules = require('../modules'); // NOTE: different implementation for browser
-var ok = require('assert').ok;
+var ok = require("assert").ok;
+var propertyHandlers = require("property-handlers");
+var isObjectEmpty = require("raptor-util/isObjectEmpty");
+var nodePath = require("path");
+var markoModules = require("../modules"); // NOTE: different implementation for browser
 var bodyFunctionRegExp = /^([A-Za-z_$][A-Za-z0-9_]*)(?:\(([^)]*)\))?$/;
 var safeVarName = /^[A-Za-z_$][A-Za-z0-9_]*$/;
-var propertyHandlers = require('property-handlers');
-var forEachEntry = require('raptor-util/forEachEntry');
-var markoCompiler = require('../');
-var createError = require('raptor-util/createError');
-var types = require('./types');
-var loaders = require('./loaders');
-
+var forEachEntry = require("raptor-util/forEachEntry");
+var markoCompiler = require("../");
+var createError = require("raptor-util/createError");
+var types = require("./types");
+var loaders = require("./loaders");
 
 function exists(path) {
     try {
         markoModules.resolve(path);
         return true;
-    } catch(e) {
+    } catch (e) {
         return false;
     }
 }
 
 function removeDashes(str) {
-    return str.replace(/-([a-z])/g, function (match, lower) {
+    return str.replace(/-([a-z])/g, function(match, lower) {
         return lower.toUpperCase();
     });
 }
@@ -37,7 +34,7 @@ function hasAttributes(tagProps) {
     }
 
     for (var name in tagProps) {
-        if (tagProps.hasOwnProperty(name) && name.startsWith('@')) {
+        if (tagProps.hasOwnProperty(name) && name.startsWith("@")) {
             return true;
         }
     }
@@ -45,7 +42,6 @@ function hasAttributes(tagProps) {
     return false;
 }
 
-
 /**
  * We load tag definition using this class. Properties in the taglib
  * definition (which is just a JavaScript object with properties)
@@ -68,16 +64,14 @@ class TagLoader {
         if (!hasAttributes(tagProps)) {
             // allow any attributes if no attributes are declared
             tagProps.attributes = {
-                '*': {
-                    type: 'string',
+                "*": {
+                    type: "string",
                     targetProperty: null,
                     preserveName: false
                 }
             };
         }
 
-
-
         propertyHandlers(tagProps, this, this.dependencyChain.toString());
     }
 
@@ -86,27 +80,33 @@ class TagLoader {
 
         var nestedVariable;
 
-        if (typeof value === 'string') {
+        if (typeof value === "string") {
             nestedVariable = {
                 name: value
             };
         } else {
             nestedVariable = {};
 
-            propertyHandlers(value, {
+            propertyHandlers(
+                value,
+                {
+                    name: function(value) {
+                        nestedVariable.name = value;
+                    },
 
-                name: function(value) {
-                    nestedVariable.name = value;
+                    nameFromAttribute: function(value) {
+                        nestedVariable.nameFromAttribute = value;
+                    }
                 },
-
-                nameFromAttribute: function(value) {
-                    nestedVariable.nameFromAttribute = value;
-                }
-
-            }, dependencyChain.toString());
+                dependencyChain.toString()
+            );
 
             if (!nestedVariable.name && !nestedVariable.nameFromAttribute) {
-                throw new Error('The "name" or "name-from-attribute" attribute is required for a nested variable (' + dependencyChain + ')');
+                throw new Error(
+                    'The "name" or "name-from-attribute" attribute is required for a nested variable (' +
+                        dependencyChain +
+                        ")"
+                );
             }
         }
 
@@ -119,7 +119,7 @@ class TagLoader {
      * match properties in the form of "@attr_name" or
      * "<nested_tag_name>"
      */
-    '*'(name, value) {
+    "*"(name, value) {
         var tag = this.tag;
         var dependencyChain = this.dependencyChain;
         var parts = name.split(/\s+|\s+[,]\s+/);
@@ -133,16 +133,16 @@ class TagLoader {
 
         // We do one pass to figure out if there is an
         // attribute or nested tag or both
-        for (i=0; i<parts.length; i++) {
+        for (i = 0; i < parts.length; i++) {
             part = parts[i];
-            if (part.startsWith('@')) {
+            if (part.startsWith("@")) {
                 hasAttr = true;
 
                 if (i === 0) {
                     // Use the first attribute value as the name of the target property
                     nestedTagTargetProperty = part.substring(1);
                 }
-            } else if (part.startsWith('<')) {
+            } else if (part.startsWith("<")) {
                 hasNestedTag = true;
             } else {
                 // Unmatched property that is not an attribute or a
@@ -155,10 +155,10 @@ class TagLoader {
         var tagProps = {};
         var k;
 
-        if (value != null && typeof value === 'object') {
+        if (value != null && typeof value === "object") {
             for (k in value) {
                 if (value.hasOwnProperty(k)) {
-                    if (k.startsWith('@') || k.startsWith('<')) {
+                    if (k.startsWith("@") || k.startsWith("<")) {
                         // Move over all of the attributes and nested tags
                         // to the tag definition.
                         tagProps[k] = value[k];
@@ -170,8 +170,10 @@ class TagLoader {
                         // and attribute definition.
                         var propNameDashes = removeDashes(k);
 
-                        if (isSupportedProperty(propNameDashes) &&
-                            loaders.isSupportedAttributeProperty(propNameDashes)) {
+                        if (
+                            isSupportedProperty(propNameDashes) &&
+                            loaders.isSupportedAttributeProperty(propNameDashes)
+                        ) {
                             // Move over all of the properties that are associated with a tag
                             // and attribute
                             tagProps[k] = value[k];
@@ -181,7 +183,9 @@ class TagLoader {
                             // Move over all of the properties that are associated with a tag
                             tagProps[k] = value[k];
                             delete value[k];
-                        } else if (loaders.isSupportedAttributeProperty(propNameDashes)) {
+                        } else if (
+                            loaders.isSupportedAttributeProperty(propNameDashes)
+                        ) {
                             // Move over all of the properties that are associated with an attr
                             attrProps[k] = value[k];
                             delete value[k];
@@ -193,18 +197,20 @@ class TagLoader {
             // If there are any left over properties then something is wrong
             // with the user's taglib.
             if (!isObjectEmpty(value)) {
-                throw new Error('Unsupported properties of [' +
-                    Object.keys(value).join(', ') +
-                    ']');
+                throw new Error(
+                    "Unsupported properties of [" +
+                        Object.keys(value).join(", ") +
+                        "]"
+                );
             }
 
             var type = attrProps.type;
             if (!type && hasAttr && hasNestedTag) {
                 // If we have an attribute and a nested tag then default
                 // the attribute type to "expression"
-                attrProps.type = 'expression';
+                attrProps.type = "expression";
             }
-        } else if (typeof value === 'string') {
+        } else if (typeof value === "string") {
             if (hasNestedTag && hasAttr) {
                 tagProps = attrProps = {
                     type: value
@@ -222,49 +228,52 @@ class TagLoader {
 
         // Now that we have separated out attribute properties and tag properties
         // we need to create the actual attributes and nested tags
-        for (i=0; i<parts.length; i++) {
+        for (i = 0; i < parts.length; i++) {
             part = parts[i];
-            if (part.startsWith('@')) {
+            if (part.startsWith("@")) {
                 // This is a shorthand attribute
                 var attrName = part.substring(1);
 
                 var attr = loaders.loadAttributeFromProps(
                     attrName,
                     attrProps,
-                    dependencyChain.append(part));
+                    dependencyChain.append(part)
+                );
 
                 tag.addAttribute(attr);
-            } else if (part.startsWith('<')) {
-
+            } else if (part.startsWith("<")) {
                 // This is a shorthand nested tag
                 let nestedTag = new types.Tag(this.filePath);
 
                 loadTagFromProps(
                     nestedTag,
                     tagProps,
-                    dependencyChain.append(part));
+                    dependencyChain.append(part)
+                );
 
                 // We use the '[]' suffix to indicate that a nested tag
                 // can be repeated
                 var isNestedTagRepeated = false;
-                if (part.endsWith('[]')) {
+                if (part.endsWith("[]")) {
                     isNestedTagRepeated = true;
                     part = part.slice(0, -2);
                 }
 
-                var nestedTagName = part.substring(1, part.length-1);
+                var nestedTagName = part.substring(1, part.length - 1);
                 nestedTag.name = nestedTagName;
                 nestedTag.isRepeated = isNestedTagRepeated;
                 // Use the name of the attribute as the target property unless
                 // this target property was explicitly provided
-                nestedTag.targetProperty = attrProps.targetProperty || nestedTagTargetProperty;
+                nestedTag.targetProperty =
+                    attrProps.targetProperty || nestedTagTargetProperty;
                 tag.addNestedTag(nestedTag);
 
                 if (!nestedTag.isRepeated) {
                     let attr = loaders.loadAttributeFromProps(
                         nestedTag.targetProperty,
-                        { type: 'object' },
-                        dependencyChain.append(part));
+                        { type: "object" },
+                        dependencyChain.append(part)
+                    );
 
                     tag.addAttribute(attr);
                 }
@@ -328,7 +337,11 @@ class TagLoader {
     attributes(value) {
         var tag = this.tag;
 
-        loaders.loadAttributes(value, tag, this.dependencyChain.append('attributes'));
+        loaders.loadAttributes(
+            value,
+            tag,
+            this.dependencyChain.append("attributes")
+        );
     }
 
     /**
@@ -382,7 +395,7 @@ class TagLoader {
 
         var transformer = new types.Transformer();
 
-        if (typeof value === 'string') {
+        if (typeof value === "string") {
             // The value is a simple string type
             // so treat the value as the path to the JS
             // module for the transformer
@@ -396,30 +409,34 @@ class TagLoader {
          * to process each property to load the Transformer
          * definition.
          */
-        propertyHandlers(value, {
-            path(value) {
-                var path = markoModules.resolveFrom(dirname, value);
-                transformer.path = path;
-            },
+        propertyHandlers(
+            value,
+            {
+                path(value) {
+                    var path = markoModules.resolveFrom(dirname, value);
+                    transformer.path = path;
+                },
 
-            priority(value) {
-                transformer.priority = value;
-            },
+                priority(value) {
+                    transformer.priority = value;
+                },
 
-            name(value) {
-                transformer.name = value;
-            },
+                name(value) {
+                    transformer.name = value;
+                },
 
-            properties(value) {
-                var properties = transformer.properties || (transformer.properties = {});
-                for (var k in value) {
-                    if (value.hasOwnProperty(k)) {
-                        properties[k] = value[k];
+                properties(value) {
+                    var properties =
+                        transformer.properties || (transformer.properties = {});
+                    for (var k in value) {
+                        if (value.hasOwnProperty(k)) {
+                            properties[k] = value[k];
+                        }
                     }
                 }
-            }
-
-        }, this.dependencyChain.append('transformer'));
+            },
+            this.dependencyChain.append("transformer")
+        );
 
         ok(transformer.path, '"path" is required for transformer');
 
@@ -443,7 +460,7 @@ class TagLoader {
      * }
      */
     var(value) {
-        this._handleVar(value, this.dependencyChain.append('var'));
+        this._handleVar(value, this.dependencyChain.append("var"));
     }
     /**
      * The "vars" property is equivalent to the "var" property
@@ -452,7 +469,10 @@ class TagLoader {
     vars(value) {
         if (value) {
             value.forEach((v, i) => {
-                this._handleVar(v, this.dependencyChain.append('vars[' + i + ']'));
+                this._handleVar(
+                    v,
+                    this.dependencyChain.append("vars[" + i + "]")
+                );
             });
         }
     }
@@ -469,18 +489,32 @@ class TagLoader {
         var tag = this.tag;
         var parts = bodyFunctionRegExp.exec(value);
         if (!parts) {
-            throw new Error('Invalid value of "' + value + '" for "body-function". Expected value to be of the following form: <function-name>([param1, param2, ...])');
+            throw new Error(
+                'Invalid value of "' +
+                    value +
+                    '" for "body-function". Expected value to be of the following form: <function-name>([param1, param2, ...])'
+            );
         }
 
         var functionName = parts[1];
         var params = parts[2];
         if (params) {
             params = params.trim().split(/\s*,\s*/);
-            for (var i=0; i<params.length; i++) {
+            for (var i = 0; i < params.length; i++) {
                 if (params[i].length === 0) {
-                    throw new Error('Invalid parameters for body-function with value of "' + value + '"');
+                    throw new Error(
+                        'Invalid parameters for body-function with value of "' +
+                            value +
+                            '"'
+                    );
                 } else if (!safeVarName.test(params[i])) {
-                    throw new Error('Invalid parameter name of "' + params[i] + '" for body-function with value of "' + value + '"');
+                    throw new Error(
+                        'Invalid parameter name of "' +
+                            params[i] +
+                            '" for body-function with value of "' +
+                            value +
+                            '"'
+                    );
                 }
             }
         } else {
@@ -510,16 +544,19 @@ class TagLoader {
 
             if (!expression) {
                 expression = varName;
-            }
-            else if (typeof expression === 'object') {
+            } else if (typeof expression === "object") {
                 expression = expression.expression;
             }
 
             if (!expression) {
-                throw new Error('Invalid "import-var": ' + require('util').inspect(varValue));
+                throw new Error(
+                    'Invalid "import-var": ' + require("util").inspect(varValue)
+                );
             }
 
-            importedVar.expression = markoCompiler.builder.parseExpression(expression);
+            importedVar.expression = markoCompiler.builder.parseExpression(
+                expression
+            );
             tag.addImportedVariable(importedVar);
         });
     }
@@ -549,13 +586,12 @@ class TagLoader {
         var tag = this.tag;
 
         forEachEntry(value, (nestedTagName, nestedTagDef) => {
-            var dependencyChain = this.dependencyChain.append(`nestedTags["${nestedTagName}]`);
+            var dependencyChain = this.dependencyChain.append(
+                `nestedTags["${nestedTagName}]`
+            );
             var nestedTag = new types.Tag(filePath);
 
-            loadTagFromProps(
-                nestedTag,
-                nestedTagDef,
-                dependencyChain);
+            loadTagFromProps(nestedTag, nestedTagDef, dependencyChain);
 
             nestedTag.name = nestedTagName;
             tag.addNestedTag(nestedTag);
@@ -563,8 +599,9 @@ class TagLoader {
             if (!nestedTag.isRepeated) {
                 let attr = loaders.loadAttributeFromProps(
                     nestedTag.targetProperty,
-                    { type: 'object' },
-                    dependencyChain);
+                    { type: "object" },
+                    dependencyChain
+                );
 
                 tag.addAttribute(attr);
             }
@@ -581,10 +618,16 @@ class TagLoader {
      * content is parsed.
      */
     body(value) {
-        if (value === 'static-text' || value === 'parsed-text' || value === 'html') {
+        if (
+            value === "static-text" ||
+            value === "parsed-text" ||
+            value === "html"
+        ) {
             this.tag.body = value;
         } else {
-            throw new Error('Invalid value for "body". Allowed: "static-text", "parsed-text" or "html"');
+            throw new Error(
+                'Invalid value for "body". Allowed: "static-text", "parsed-text" or "html"'
+            );
         }
     }
 
@@ -617,7 +660,8 @@ class TagLoader {
             return;
         }
 
-        var attributeGroups = this.tag.attributeGroups || (this.tag.attributeGroups = []);
+        var attributeGroups =
+            this.tag.attributeGroups || (this.tag.attributeGroups = []);
         this.tag.attributeGroups = attributeGroups.concat(value);
     }
 
@@ -635,22 +679,23 @@ function isSupportedProperty(name) {
 }
 
 function loadTagFromProps(tag, tagProps, dependencyChain) {
-    ok(typeof tagProps === 'object', 'Invalid "tagProps"');
+    ok(typeof tagProps === "object", 'Invalid "tagProps"');
     ok(dependencyChain, '"dependencyChain" is required');
 
     var tagLoader = new TagLoader(tag, dependencyChain);
 
     try {
         tagLoader.load(tagProps);
-    } catch(err) {
-        throw createError('Unable to load tag (' + dependencyChain + '): ' + err, err);
+    } catch (err) {
+        throw createError(
+            "Unable to load tag (" + dependencyChain + "): " + err,
+            err
+        );
     }
 
     return tag;
 }
 
-
-
 module.exports = loadTagFromProps;
 
 loadTagFromProps.isSupportedProperty = isSupportedProperty;
diff --git a/src/compiler/taglib-loader/loadTaglibFromFile.js b/src/compiler/taglib-loader/loadTaglibFromFile.js
index f657f1be8..c53daa5d6 100644
--- a/src/compiler/taglib-loader/loadTaglibFromFile.js
+++ b/src/compiler/taglib-loader/loadTaglibFromFile.js
@@ -1,9 +1,9 @@
-var jsonFileReader = require('./json-file-reader');
-var types = require('./types');
-var cache = require('./cache');
-var loaders = require('./loaders');
+var jsonFileReader = require("./json-file-reader");
+var types = require("./types");
+var cache = require("./cache");
+var loaders = require("./loaders");
 
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 
 function loadFromFile(filePath) {
     ok(filePath, '"filePath" is required');
@@ -23,4 +23,4 @@ function loadFromFile(filePath) {
     return taglib;
 }
 
-module.exports = loadFromFile;
\ No newline at end of file
+module.exports = loadFromFile;
diff --git a/src/compiler/taglib-loader/loadTaglibFromProps.js b/src/compiler/taglib-loader/loadTaglibFromProps.js
index 4043c6314..ac898c0ec 100644
--- a/src/compiler/taglib-loader/loadTaglibFromProps.js
+++ b/src/compiler/taglib-loader/loadTaglibFromProps.js
@@ -1,24 +1,23 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
-var types = require('./types');
-var nodePath = require('path');
-var scanTagsDir = require('./scanTagsDir');
-var markoModules = require('../modules'); // NOTE: different implementation for browser
-var propertyHandlers = require('property-handlers');
-var types = require('./types');
-var jsonFileReader = require('./json-file-reader');
-var tryRequire = require('try-require');
-var resolveFrom = tryRequire('resolve-from', require);
-var DependencyChain = require('./DependencyChain');
-var createError = require('raptor-util/createError');
-var loaders = require('./loaders');
+var ok = require("assert").ok;
+var types = require("./types");
+var nodePath = require("path");
+var scanTagsDir = require("./scanTagsDir");
+var markoModules = require("../modules"); // NOTE: different implementation for browser
+var propertyHandlers = require("property-handlers");
+var jsonFileReader = require("./json-file-reader");
+var tryRequire = require("try-require");
+var resolveFrom = tryRequire("resolve-from", require);
+var DependencyChain = require("./DependencyChain");
+var createError = require("raptor-util/createError");
+var loaders = require("./loaders");
 
 function exists(path) {
     try {
         markoModules.resolve(path);
         return true;
-    } catch(e) {
+    } catch (e) {
         return false;
     }
 }
@@ -34,7 +33,10 @@ function exists(path) {
  */
 class TaglibLoader {
     constructor(taglib, dependencyChain) {
-        ok(dependencyChain instanceof DependencyChain, '"dependencyChain" is not valid');
+        ok(
+            dependencyChain instanceof DependencyChain,
+            '"dependencyChain" is not valid'
+        );
 
         this.dependencyChain = dependencyChain;
 
@@ -44,7 +46,6 @@ class TaglibLoader {
     }
 
     load(taglibProps) {
-
         var taglib = this.taglib;
 
         propertyHandlers(taglibProps, this, this.dependencyChain.toString());
@@ -63,13 +64,14 @@ class TaglibLoader {
             var filePath = this.filePath;
             var dirname = this.dirname;
 
-            var packageJsonPath = nodePath.join(dirname, 'package.json');
-
+            var packageJsonPath = nodePath.join(dirname, "package.json");
 
             try {
                 var pkg = jsonFileReader.readFileSync(packageJsonPath);
                 taglib.id = pkg.name;
-            } catch(e) {}
+            } catch (e) {
+                /* ignore error */
+            }
 
             if (!taglib.id) {
                 taglib.id = filePath;
@@ -83,12 +85,17 @@ class TaglibLoader {
 
         var tag;
 
-        if (typeof value === 'string') {
+        if (typeof value === "string") {
             tagFilePath = nodePath.resolve(this.dirname, value);
 
-
             if (!exists(tagFilePath)) {
-                throw new Error('Tag at path "' + tagFilePath + '" does not exist. (' + dependencyChain + ')');
+                throw new Error(
+                    'Tag at path "' +
+                        tagFilePath +
+                        '" does not exist. (' +
+                        dependencyChain +
+                        ")"
+                );
             }
 
             tag = new types.Tag(tagFilePath);
@@ -111,20 +118,21 @@ class TaglibLoader {
 
     // We register a wildcard handler to handle "@my-attr" and "<my-tag>"
     // properties (shorthand syntax)
-    '*'(name, value) {
+    "*"(name, value) {
         var taglib = this.taglib;
         var filePath = this.filePath;
 
-        if (name.startsWith('<')) {
+        if (name.startsWith("<")) {
             let tagName = name.slice(1, -1);
             this._handleTag(tagName, value, this.dependencyChain.append(name));
-        } else if (name.startsWith('@')) {
+        } else if (name.startsWith("@")) {
             var attrKey = name.substring(1);
 
             var attr = loaders.loadAttributeFromProps(
                 attrKey,
                 value,
-                this.dependencyChain.append('@' + attrKey));
+                this.dependencyChain.append("@" + attrKey)
+            );
 
             attr.filePath = filePath;
             attr.key = attrKey;
@@ -151,13 +159,14 @@ class TaglibLoader {
         // }
         var taglib = this.taglib;
 
-        Object.keys(value).forEach((attrName) => {
+        Object.keys(value).forEach(attrName => {
             var attrDef = value[attrName];
 
             var attr = loaders.loadAttributeFromProps(
                 attrName,
                 attrDef,
-                this.dependencyChain.append('@' + attrName));
+                this.dependencyChain.append("@" + attrName)
+            );
 
             attr.key = attrName;
 
@@ -182,7 +191,11 @@ class TaglibLoader {
 
         for (var tagName in tags) {
             if (tags.hasOwnProperty(tagName)) {
-                this._handleTag(tagName, tags[tagName], this.dependencyChain.append('tags.' + tagName));
+                this._handleTag(
+                    tagName,
+                    tags[tagName],
+                    this.dependencyChain.append("tags." + tagName)
+                );
             }
         }
     }
@@ -202,10 +215,22 @@ class TaglibLoader {
         if (dir != null) {
             if (Array.isArray(dir)) {
                 for (var i = 0; i < dir.length; i++) {
-                    scanTagsDir(path, dirname, dir[i], taglib, this.dependencyChain.append(`tags-dir[${i}]`));
+                    scanTagsDir(
+                        path,
+                        dirname,
+                        dir[i],
+                        taglib,
+                        this.dependencyChain.append(`tags-dir[${i}]`)
+                    );
                 }
             } else {
-                scanTagsDir(path, dirname, dir, taglib, this.dependencyChain.append(`tags-dir`));
+                scanTagsDir(
+                    path,
+                    dirname,
+                    dir,
+                    taglib,
+                    this.dependencyChain.append(`tags-dir`)
+                );
             }
         }
     }
@@ -227,21 +252,27 @@ class TaglibLoader {
         var importPath;
 
         if (imports && Array.isArray(imports)) {
-            for (var i=0; i<imports.length; i++) {
+            for (var i = 0; i < imports.length; i++) {
                 var curImport = imports[i];
-                if (typeof curImport === 'string') {
+                if (typeof curImport === "string") {
                     var basename = nodePath.basename(curImport);
-                    if (basename === 'package.json') {
-                        var packagePath = markoModules.resolveFrom(dirname, curImport);
+                    if (basename === "package.json") {
+                        var packagePath = markoModules.resolveFrom(
+                            dirname,
+                            curImport
+                        );
                         var packageDir = nodePath.dirname(packagePath);
                         var pkg = jsonFileReader.readFileSync(packagePath);
                         var dependencies = pkg.dependencies;
                         if (dependencies) {
                             var dependencyNames = Object.keys(dependencies);
-                            for (var j=0; j<dependencyNames.length; j++) {
+                            for (var j = 0; j < dependencyNames.length; j++) {
                                 var dependencyName = dependencyNames[j];
 
-                                importPath = resolveFrom(packageDir, dependencyName + '/marko.json');
+                                importPath = resolveFrom(
+                                    packageDir,
+                                    dependencyName + "/marko.json"
+                                );
 
                                 if (importPath) {
                                     taglib.addImport(importPath);
@@ -253,7 +284,13 @@ class TaglibLoader {
                         if (importPath) {
                             taglib.addImport(importPath);
                         } else {
-                            throw new Error('Import not found: ' + curImport + ' (from ' + dirname + ')');
+                            throw new Error(
+                                "Import not found: " +
+                                    curImport +
+                                    " (from " +
+                                    dirname +
+                                    ")"
+                            );
                         }
                     }
                 }
@@ -269,19 +306,22 @@ class TaglibLoader {
 
         var transformer = new types.Transformer();
 
-        if (typeof value === 'string') {
+        if (typeof value === "string") {
             value = {
                 path: value
             };
         }
 
-        propertyHandlers(value, {
-            path(value) {
-                var path = markoModules.resolveFrom(dirname, value);
-                transformer.path = path;
-            }
-
-        }, this.dependencyChain.append('textTransformer').toString());
+        propertyHandlers(
+            value,
+            {
+                path(value) {
+                    var path = markoModules.resolveFrom(dirname, value);
+                    transformer.path = path;
+                }
+            },
+            this.dependencyChain.append("textTransformer").toString()
+        );
 
         ok(transformer.path, '"path" is required for transformer');
 
@@ -310,19 +350,22 @@ class TaglibLoader {
 
         var transformer = new types.Transformer();
 
-        if (typeof value === 'string') {
+        if (typeof value === "string") {
             value = {
                 path: value
             };
         }
 
-        propertyHandlers(value, {
-            path(value) {
-                var path = markoModules.resolveFrom(dirname, value);
-                transformer.path = path;
-            }
-
-        }, this.dependencyChain.append('transformer').toString());
+        propertyHandlers(
+            value,
+            {
+                path(value) {
+                    var path = markoModules.resolveFrom(dirname, value);
+                    transformer.path = path;
+                }
+            },
+            this.dependencyChain.append("transformer").toString()
+        );
 
         ok(transformer.path, '"path" is required for transformer');
 
@@ -331,22 +374,26 @@ class TaglibLoader {
 
     attributeGroups(value) {
         let taglib = this.taglib;
-        let attributeGroups = taglib.attributeGroups || (taglib.attributeGroups = {});
-        let dependencyChain = this.dependencyChain.append('attribute-groups');
+        let attributeGroups =
+            taglib.attributeGroups || (taglib.attributeGroups = {});
+        let dependencyChain = this.dependencyChain.append("attribute-groups");
 
-        Object.keys(value).forEach((attrGroupName) => {
-            let attrGroup = attributeGroups[attrGroupName] = {};
-            let attrGroupDependencyChain = dependencyChain.append(attrGroupName);
+        Object.keys(value).forEach(attrGroupName => {
+            let attrGroup = (attributeGroups[attrGroupName] = {});
+            let attrGroupDependencyChain = dependencyChain.append(
+                attrGroupName
+            );
 
             let rawAttrGroup = value[attrGroupName];
 
-            Object.keys(rawAttrGroup).forEach((attrName) => {
+            Object.keys(rawAttrGroup).forEach(attrName => {
                 var rawAttrDef = rawAttrGroup[attrName];
 
                 let attr = loaders.loadAttributeFromProps(
                     attrName,
                     rawAttrDef,
-                    attrGroupDependencyChain.append('@' + attrName));
+                    attrGroupDependencyChain.append("@" + attrName)
+                );
 
                 attrGroup[attrName] = attr;
             });
@@ -354,7 +401,6 @@ class TaglibLoader {
     }
 }
 
-
 function loadTaglibFromProps(taglib, taglibProps, dependencyChain) {
     ok(taglib, '"taglib" is required');
     ok(taglibProps, '"taglibProps" is required');
@@ -368,11 +414,14 @@ function loadTaglibFromProps(taglib, taglibProps, dependencyChain) {
 
     try {
         taglibLoader.load(taglibProps);
-    } catch(err) {
-        throw createError('Unable to load taglib (' + dependencyChain + '): ' + err, err);
+    } catch (err) {
+        throw createError(
+            "Unable to load taglib (" + dependencyChain + "): " + err,
+            err
+        );
     }
 
     return taglib;
 }
 
-module.exports = loadTaglibFromProps;
\ No newline at end of file
+module.exports = loadTaglibFromProps;
diff --git a/src/compiler/taglib-loader/loaders.js b/src/compiler/taglib-loader/loaders.js
index 979e29970..2fb639c0a 100644
--- a/src/compiler/taglib-loader/loaders.js
+++ b/src/compiler/taglib-loader/loaders.js
@@ -1,4 +1,4 @@
-var types = require('./types');
+var types = require("./types");
 
 function isSupportedAttributeProperty(propertyName) {
     return exports.loadAttributeFromProps.isSupportedProperty(propertyName);
@@ -13,11 +13,11 @@ function createTaglib(taglibPath) {
 }
 
 exports.createTaglib = createTaglib;
-exports.loadAttributeFromProps = require('./loadAttributeFromProps');
-exports.loadTagFromProps = require('./loadTagFromProps');
-exports.loadTagFromFile = require('./loadTagFromFile');
-exports.loadTaglibFromProps = require('./loadTaglibFromProps');
-exports.loadTaglibFromFile = require('./loadTaglibFromFile');
-exports.loadAttributes = require('./loadAttributes');
+exports.loadAttributeFromProps = require("./loadAttributeFromProps");
+exports.loadTagFromProps = require("./loadTagFromProps");
+exports.loadTagFromFile = require("./loadTagFromFile");
+exports.loadTaglibFromProps = require("./loadTaglibFromProps");
+exports.loadTaglibFromFile = require("./loadTaglibFromFile");
+exports.loadAttributes = require("./loadAttributes");
 exports.isSupportedAttributeProperty = isSupportedAttributeProperty;
-exports.isSupportedTagProperty = isSupportedTagProperty;
\ No newline at end of file
+exports.isSupportedTagProperty = isSupportedTagProperty;
diff --git a/src/compiler/taglib-loader/scanTagsDir.js b/src/compiler/taglib-loader/scanTagsDir.js
index 56821be67..2fc177fab 100644
--- a/src/compiler/taglib-loader/scanTagsDir.js
+++ b/src/compiler/taglib-loader/scanTagsDir.js
@@ -1,38 +1,38 @@
-'use strict';
+"use strict";
 
-const nodePath = require('path');
-const fs = require('fs');
-const stripJsonComments = require('strip-json-comments');
-const tagDefFromCode = require('./tag-def-from-code');
-const loaders = require('./loaders');
-const fsReadOptions = { encoding: 'utf8' };
-const extend = require('raptor-util/extend');
-const types = require('./types');
+const nodePath = require("path");
+const fs = require("fs");
+const stripJsonComments = require("strip-json-comments");
+const tagDefFromCode = require("./tag-def-from-code");
+const loaders = require("./loaders");
+const fsReadOptions = { encoding: "utf8" };
+const extend = require("raptor-util/extend");
+const types = require("./types");
 
 const tagFileTypes = [
-    'template',
-    'renderer',
-    'transformer',
-    'code-generator',
-    'node-factory',
+    "template",
+    "renderer",
+    "transformer",
+    "code-generator",
+    "node-factory"
 ];
 
 const searchFiles = [
-    { name:'index.marko', type:'template' },
-    { name:'renderer', type:'renderer' },
-    { name:'index', type:'renderer' },
-    { name:'template.marko', type:'template' },
-    { name:'template.html', type:'template' },
-    { name:'code-generator', type:'code-generator' },
-    { name:'node-factory', type:'node-factory' },
-    { name:'transformer', type:'transformer' },
+    { name: "index.marko", type: "template" },
+    { name: "renderer", type: "renderer" },
+    { name: "index", type: "renderer" },
+    { name: "template.marko", type: "template" },
+    { name: "template.html", type: "template" },
+    { name: "code-generator", type: "code-generator" },
+    { name: "node-factory", type: "node-factory" },
+    { name: "transformer", type: "transformer" }
 ];
 
 function createDefaultTagDef() {
     return {
         attributes: {
-            '*': {
-                type: 'string',
+            "*": {
+                type: "string",
                 targetProperty: null,
                 preserveName: false
             }
@@ -46,7 +46,7 @@ function getFileMap(dirname) {
 
     files.forEach(file => {
         let extName = nodePath.extname(file);
-        let baseName = file.slice(0, -1*extName.length);
+        let baseName = file.slice(0, -1 * extName.length);
         let fullPath = nodePath.join(dirname, file);
         fileMap[baseName] = fileMap[baseName] || {};
         fileMap[baseName][extName] = fullPath;
@@ -60,26 +60,26 @@ function getFileMap(dirname) {
 function getPath(filename, fileMap) {
     let file = fileMap[filename];
 
-    if(!file) return;
-    if(file.__path) return file.__path;
-    if(file.js) return file['.js'];
+    if (!file) return;
+    if (file.__path) return file.__path;
+    if (file.js) return file[".js"];
 
     return file[Object.keys(file)[0]];
 }
 
 function findAndSetFile(tagDef, tagDirname) {
-    if(!fs.statSync(tagDirname).isDirectory()) {
+    if (!fs.statSync(tagDirname).isDirectory()) {
         return;
     }
 
     let fileMap = getFileMap(tagDirname);
 
-    for(let i = 0; i < searchFiles.length; i++) {
+    for (let i = 0; i < searchFiles.length; i++) {
         let name = searchFiles[i].name;
         let type = searchFiles[i].type;
         let path = getPath(name, fileMap);
 
-        if(path) {
+        if (path) {
             tagDef[type] = path;
             return true;
         }
@@ -87,8 +87,8 @@ function findAndSetFile(tagDef, tagDirname) {
 }
 
 function hasFile(tagDef) {
-    for(let i = 0; i < tagFileTypes.length; i++) {
-        if(tagDef[tagFileTypes[i]]) return true;
+    for (let i = 0; i < tagFileTypes.length; i++) {
+        if (tagDef[tagFileTypes[i]]) return true;
     }
     return false;
 }
@@ -99,28 +99,31 @@ function hasFile(tagDef) {
  * @param {String|Object} dir the path to directory to scan
  * @param {String} taglib the taglib that is being loaded
  */
-module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, taglib, dependencyChain) {
+module.exports = function scanTagsDir(
+    tagsConfigPath,
+    tagsConfigDirname,
+    dir,
+    taglib,
+    dependencyChain
+) {
     let prefix;
 
-    if (typeof dir === 'object') {
+    if (typeof dir === "object") {
         prefix = dir.prefix;
         dir = dir.path;
     }
 
     if (prefix == null) {
         // no prefix by default
-        prefix = '';
+        prefix = "";
     }
 
     dir = nodePath.resolve(tagsConfigDirname, dir);
     let children = fs.readdirSync(dir);
 
-    let rendererJSFile;
-
-    for (let i=0, len=children.length; i<len; i++) {
-        rendererJSFile = null;
+    for (let i = 0, len = children.length; i < len; i++) {
         let childFilename = children[i];
-        if (childFilename === 'node_modules') {
+        if (childFilename === "node_modules") {
             continue;
         }
 
@@ -130,7 +133,7 @@ module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, ta
         let tagJsonPath;
 
         let ext = nodePath.extname(childFilename);
-        if (ext === '.marko') {
+        if (ext === ".marko") {
             tagName = childFilename.slice(0, 0 - ext.length);
             tagDirname = dir;
             tagDef = createDefaultTagDef();
@@ -139,16 +142,25 @@ module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, ta
             tagName = prefix + childFilename;
 
             tagDirname = nodePath.join(dir, childFilename);
-            tagJsonPath = nodePath.join(tagDirname, 'marko-tag.json');
+            tagJsonPath = nodePath.join(tagDirname, "marko-tag.json");
 
             let hasTagJson = false;
             if (fs.existsSync(tagJsonPath)) {
                 hasTagJson = true;
                 // marko-tag.json exists in the directory, use that as the tag definition
                 try {
-                    tagDef = JSON.parse(stripJsonComments(fs.readFileSync(tagJsonPath, fsReadOptions)));
-                } catch(e) {
-                    throw new Error('Unable to parse JSON file at path "' + tagJsonPath + '". Error: ' + e);
+                    tagDef = JSON.parse(
+                        stripJsonComments(
+                            fs.readFileSync(tagJsonPath, fsReadOptions)
+                        )
+                    );
+                } catch (e) {
+                    throw new Error(
+                        'Unable to parse JSON file at path "' +
+                            tagJsonPath +
+                            '". Error: ' +
+                            e
+                    );
                 }
             } else {
                 tagJsonPath = null;
@@ -157,9 +169,14 @@ module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, ta
 
             if (!hasFile(tagDef)) {
                 let fileWasSet = findAndSetFile(tagDef, tagDirname);
-                if(!fileWasSet) {
+                if (!fileWasSet) {
                     if (hasTagJson) {
-                        throw new Error('Invalid tag file: ' + tagJsonPath + '. Neither a renderer or a template was found for tag. ' + JSON.stringify(tagDef, null, 2));
+                        throw new Error(
+                            "Invalid tag file: " +
+                                tagJsonPath +
+                                ". Neither a renderer or a template was found for tag. " +
+                                JSON.stringify(tagDef, null, 2)
+                        );
                     } else {
                         // Skip this directory... there doesn't appear to be anything in it
                         continue;
@@ -168,8 +185,13 @@ module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, ta
             }
 
             if (!hasTagJson && (tagDef.renderer || tagDef.template)) {
-                let templateCode = fs.readFileSync(tagDef.renderer || tagDef.template, fsReadOptions);
-                let extractedTagDef = tagDefFromCode.extractTagDef(templateCode);
+                let templateCode = fs.readFileSync(
+                    tagDef.renderer || tagDef.template,
+                    fsReadOptions
+                );
+                let extractedTagDef = tagDefFromCode.extractTagDef(
+                    templateCode
+                );
                 if (extractedTagDef) {
                     extend(tagDef, extractedTagDef);
                 }
diff --git a/src/compiler/taglib-loader/tag-def-from-code.js b/src/compiler/taglib-loader/tag-def-from-code.js
index cf3fdb3fb..c537cb21f 100644
--- a/src/compiler/taglib-loader/tag-def-from-code.js
+++ b/src/compiler/taglib-loader/tag-def-from-code.js
@@ -3,10 +3,9 @@
 var tagStartRegExp = /(^\s*(?:(?:exports.(?:tag|TAG))|(?:TAG))\s*=\s*)\{/m;
 
 // Tokens: "<string>", '<string>', /*<some comment*/, //<single line comment>, {, }, ;
-var tokensRegExp = /"(?:[^"]|\\")*"|'(?:[^'])|(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(\/\/.*)|[\{\};]/g;
+var tokensRegExp = /"(?:[^"]|\\")*"|'(?:[^'])|(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(\/\/.*)|[{};]/g;
 
 function extractTagDef(code) {
-
     var startMatches = tagStartRegExp.exec(code);
 
     var tagDefStart;
@@ -19,16 +18,15 @@ function extractTagDef(code) {
         var depth = 0;
 
         while ((nextTokenMatches = tokensRegExp.exec(code))) {
-            if (nextTokenMatches[0] === '{') {
+            if (nextTokenMatches[0] === "{") {
                 depth++;
                 continue;
-            } else if (nextTokenMatches[0] === '}') {
+            } else if (nextTokenMatches[0] === "}") {
                 if (--depth === 0) {
                     tagDefEnd = tokensRegExp.lastIndex;
                     break;
                 }
-            }
-            else if (nextTokenMatches[0] === ';') {
+            } else if (nextTokenMatches[0] === ";") {
                 tagDefEnd = nextTokenMatches.index;
                 break;
             }
@@ -41,11 +39,11 @@ function extractTagDef(code) {
             try {
                 // Try parsing it as JSON
                 tagDefObject = JSON.parse(jsTagDef);
-            } catch(e) {
+            } catch (e) {
                 // Try parsing it as JavaScript
                 try {
-                    tagDefObject = eval('(' + jsTagDef + ')');
-                } catch(e) {
+                    tagDefObject = eval("(" + jsTagDef + ")");
+                } catch (e) {
                     tagDefObject = {};
                 }
             }
@@ -56,4 +54,4 @@ function extractTagDef(code) {
     }
 }
 
-exports.extractTagDef = extractTagDef;
\ No newline at end of file
+exports.extractTagDef = extractTagDef;
diff --git a/src/compiler/taglib-loader/types.js b/src/compiler/taglib-loader/types.js
index eff2fa84c..bf0ddd7b5 100644
--- a/src/compiler/taglib-loader/types.js
+++ b/src/compiler/taglib-loader/types.js
@@ -1,7 +1,7 @@
-exports.Taglib = require('./Taglib');
-exports.Tag = require('./Tag');
-exports.Attribute = require('./Attribute');
-exports.Property = require('./Property');
-exports.NestedVariable = require('./NestedVariable');
-exports.ImportedVariable = require('./ImportedVariable');
-exports.Transformer = require('./Transformer');
\ No newline at end of file
+exports.Taglib = require("./Taglib");
+exports.Tag = require("./Tag");
+exports.Attribute = require("./Attribute");
+exports.Property = require("./Property");
+exports.NestedVariable = require("./NestedVariable");
+exports.ImportedVariable = require("./ImportedVariable");
+exports.Transformer = require("./Transformer");
diff --git a/src/compiler/taglib-lookup/TaglibLookup.js b/src/compiler/taglib-lookup/TaglibLookup.js
index 1ac76b8f9..d3ffd7dbd 100644
--- a/src/compiler/taglib-lookup/TaglibLookup.js
+++ b/src/compiler/taglib-lookup/TaglibLookup.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
-var taglibTypes = require('../taglib-loader/types');
-var Text = require('../ast/Text');
-var extend = require('raptor-util/extend');
+var ok = require("assert").ok;
+var taglibTypes = require("../taglib-loader/types");
+var Text = require("../ast/Text");
+var extend = require("raptor-util/extend");
 
 function transformerComparator(a, b) {
     a = a.priority;
@@ -29,20 +29,21 @@ function TAG_COMPARATOR(a, b) {
 function merge(target, source) {
     for (var k in source) {
         if (source.hasOwnProperty(k)) {
-            if (target[k] && typeof target[k] === 'object' &&
-                source[k] && typeof source[k] === 'object') {
-
+            if (
+                target[k] &&
+                typeof target[k] === "object" &&
+                source[k] &&
+                typeof source[k] === "object"
+            ) {
                 if (source.__noMerge) {
                     // Don't merge objects that are explicitly marked as "do not merge"
                     continue;
                 }
 
                 if (Array.isArray(target[k]) || Array.isArray(source[k])) {
-
                     var targetArray = target[k];
                     var sourceArray = source[k];
 
-
                     if (!Array.isArray(targetArray)) {
                         targetArray = [targetArray];
                     }
@@ -59,7 +60,6 @@ function merge(target, source) {
                     merge(newTarget, source[k]);
                     target[k] = newTarget;
                 }
-
             } else {
                 target[k] = source[k];
             }
@@ -97,7 +97,7 @@ class TaglibLookup {
 
         function handleNestedTags(tag, parentTagName) {
             tag.forEachNestedTag(function(nestedTag) {
-                var fullyQualifiedName = parentTagName + ':' + nestedTag.name;
+                var fullyQualifiedName = parentTagName + ":" + nestedTag.name;
                 // Create a clone of the nested tag since we need to add some new
                 // properties
                 var clonedNestedTag = new Tag();
@@ -147,7 +147,7 @@ class TaglibLookup {
 
         if (sortedTags === undefined) {
             sortedTags = this._sortedTags = [];
-            this.forEachTag((tag) => {
+            this.forEachTag(tag => {
                 sortedTags.push(tag);
             });
             sortedTags.sort(TAG_COMPARATOR);
@@ -180,8 +180,6 @@ class TaglibLookup {
         var globalAttributes = this.merged.attributes;
         var taglibAttributeGroups = this.merged.attributeGroups;
 
-
-
         function findAttributesForTagName(tagName) {
             var tag = tags[tagName];
             if (!tag) {
@@ -207,9 +205,10 @@ class TaglibLookup {
             }
 
             if (tag.attributeGroups) {
-                for (let i=0; i<tag.attributeGroups.length; i++) {
+                for (let i = 0; i < tag.attributeGroups.length; i++) {
                     let attributeGroupName = tag.attributeGroups[i];
-                    let attributeGroup = taglibAttributeGroups[attributeGroupName];
+                    let attributeGroup =
+                        taglibAttributeGroups[attributeGroupName];
                     if (attributeGroup) {
                         for (let attrName in attributeGroup) {
                             handleAttr(attributeGroup[attrName]);
@@ -224,11 +223,11 @@ class TaglibLookup {
         }
 
         findAttributesForTagName(tagName); // Look for an exact match at the tag level
-        findAttributesForTagName('*'); // Including attributes that apply to all tags
+        findAttributesForTagName("*"); // Including attributes that apply to all tags
     }
 
     getTag(element) {
-        if (typeof element === 'string') {
+        if (typeof element === "string") {
             element = {
                 tagName: element
             };
@@ -243,13 +242,13 @@ class TaglibLookup {
     }
 
     getAttribute(element, attr) {
-        if (typeof element === 'string') {
+        if (typeof element === "string") {
             element = {
                 tagName: element
             };
         }
 
-        if (typeof attr === 'string') {
+        if (typeof attr === "string") {
             attr = {
                 name: attr
             };
@@ -270,9 +269,10 @@ class TaglibLookup {
             var attribute = attributes[attrName];
             if (attribute === undefined) {
                 if (tag.attributeGroups) {
-                    for (let i=0; i<tag.attributeGroups.length; i++) {
+                    for (let i = 0; i < tag.attributeGroups.length; i++) {
                         let attributeGroupName = tag.attributeGroups[i];
-                        let attributeGroup = taglibAttributeGroups[attributeGroupName];
+                        let attributeGroup =
+                            taglibAttributeGroups[attributeGroupName];
                         if (attributeGroup) {
                             attribute = attributeGroup[attrName];
                             if (attribute !== undefined) {
@@ -283,10 +283,14 @@ class TaglibLookup {
                 }
             }
 
-            if (attribute === undefined && attrName !== '*') {
+            if (attribute === undefined && attrName !== "*") {
                 if (tag.patternAttributes) {
                     // try searching by pattern
-                    for (var i = 0, len = tag.patternAttributes.length; i < len; i++) {
+                    for (
+                        var i = 0, len = tag.patternAttributes.length;
+                        i < len;
+                        i++
+                    ) {
                         var patternAttribute = tag.patternAttributes[i];
                         if (patternAttribute.pattern.test(attrName)) {
                             attribute = patternAttribute;
@@ -310,9 +314,10 @@ class TaglibLookup {
             return findAttributeForTag(tag, tag.attributes, attrName);
         }
 
-        var attrDef = tryAttribute(tagName, attrName) || // Look for an exact match at the tag level
-            tryAttribute('*', attrName) || // If not there, see if there is a exact match on the attribute name for attributes that apply to all tags
-            tryAttribute(tagName, '*'); // Otherwise, see if there is a splat attribute for the tag
+        var attrDef =
+            tryAttribute(tagName, attrName) || // Look for an exact match at the tag level
+            tryAttribute("*", attrName) || // If not there, see if there is a exact match on the attribute name for attributes that apply to all tags
+            tryAttribute(tagName, "*"); // Otherwise, see if there is a splat attribute for the tag
 
         if (attrDef && attrDef.ref) {
             attrDef = globalAttributes[attrDef.ref];
@@ -340,7 +345,7 @@ class TaglibLookup {
     }
 
     forEachTagTransformer(element, callback, thisObj) {
-        if (typeof element === 'string') {
+        if (typeof element === "string") {
             element = {
                 tagName: element
             };
@@ -356,7 +361,7 @@ class TaglibLookup {
 
         function addTransformer(transformer) {
             if (!transformer || !transformer.getFunc) {
-                throw new Error('Invalid transformer');
+                throw new Error("Invalid transformer");
             }
 
             transformers.push(transformer);
@@ -371,12 +376,14 @@ class TaglibLookup {
         if (this.merged.tags) {
             if (tagName) {
                 if (this.merged.tags[tagName]) {
-                    this.merged.tags[tagName].forEachTransformer(addTransformer);
+                    this.merged.tags[tagName].forEachTransformer(
+                        addTransformer
+                    );
                 }
             }
 
-            if (this.merged.tags['*']) {
-                this.merged.tags['*'].forEachTransformer(addTransformer);
+            if (this.merged.tags["*"]) {
+                this.merged.tags["*"].forEachTransformer(addTransformer);
             }
         }
 
@@ -398,11 +405,12 @@ class TaglibLookup {
 
             for (var taglibId in this.taglibsById) {
                 if (this.taglibsById.hasOwnProperty(taglibId)) {
-
-                    var taglibInputFiles = this.taglibsById[taglibId].getInputFiles();
+                    var taglibInputFiles = this.taglibsById[
+                        taglibId
+                    ].getInputFiles();
                     var len = taglibInputFiles.length;
                     if (len) {
-                        for (var i=0; i<len; i++) {
+                        for (var i = 0; i < len; i++) {
                             inputFilesSet[taglibInputFiles[i]] = true;
                         }
                     }
@@ -416,8 +424,8 @@ class TaglibLookup {
     }
 
     toString() {
-        return 'lookup: ' + this.getInputFiles().join(', ');
+        return "lookup: " + this.getInputFiles().join(", ");
     }
 }
 
-module.exports = TaglibLookup;
\ No newline at end of file
+module.exports = TaglibLookup;
diff --git a/src/compiler/taglib-lookup/index.js b/src/compiler/taglib-lookup/index.js
index aa66a0127..cd39a14d9 100644
--- a/src/compiler/taglib-lookup/index.js
+++ b/src/compiler/taglib-lookup/index.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 exports.registerTaglib = registerTaglib;
 exports.buildLookup = buildLookup;
 exports.clearCache = clearCache;
@@ -12,48 +12,48 @@ exports.registeredTaglibs = [];
 var lookupCache = {};
 
 function handleImports(lookup, taglib) {
-	if (taglib.imports) {
-		for (var i=0; i<taglib.imports.length; i++) {
-			var importedTaglib = taglib.imports[i];
+    if (taglib.imports) {
+        for (var i = 0; i < taglib.imports.length; i++) {
+            var importedTaglib = taglib.imports[i];
 
-			if (!lookup.hasTaglib(importedTaglib)) {
-				lookup.addTaglib(importedTaglib);
-			}
-		}
-	}
+            if (!lookup.hasTaglib(importedTaglib)) {
+                lookup.addTaglib(importedTaglib);
+            }
+        }
+    }
 }
 
 function buildLookup(dirname) {
-	var taglibs = taglibFinder.find(dirname, exports.registeredTaglibs);
+    var taglibs = taglibFinder.find(dirname, exports.registeredTaglibs);
 
-	var lookupCacheKey = taglibs
-		.map(function(taglib) {
-			return taglib.id;
-		})
-		.join(',');
+    var lookupCacheKey = taglibs
+        .map(function(taglib) {
+            return taglib.id;
+        })
+        .join(",");
 
-	var lookup = lookupCache[lookupCacheKey];
-	if (lookup === undefined) {
-		lookup = new TaglibLookup();
-		// The taglibs "closer" to the template will be earlier in the list
-		// and the taglibs "farther" from the template will be later. We
-		// want closer taglibs to take precedence (especially when de-duping)
-		// so we loop from beginning to end. We used to loop from the end
-		// to the beginning, but that appears to have been a mistake.
-        for (var i=0; i<taglibs.length; i++) {
-			var taglib = taglibs[i];
-			lookup.addTaglib(taglib);
-			handleImports(lookup, taglib);
-		}
+    var lookup = lookupCache[lookupCacheKey];
+    if (lookup === undefined) {
+        lookup = new TaglibLookup();
+        // The taglibs "closer" to the template will be earlier in the list
+        // and the taglibs "farther" from the template will be later. We
+        // want closer taglibs to take precedence (especially when de-duping)
+        // so we loop from beginning to end. We used to loop from the end
+        // to the beginning, but that appears to have been a mistake.
+        for (var i = 0; i < taglibs.length; i++) {
+            var taglib = taglibs[i];
+            lookup.addTaglib(taglib);
+            handleImports(lookup, taglib);
+        }
 
-		lookupCache[lookupCacheKey] = lookup;
-	}
+        lookupCache[lookupCacheKey] = lookup;
+    }
 
-	return lookup;
+    return lookup;
 }
 
 function registerTaglib(taglib) {
-    if (typeof taglib === 'string') {
+    if (typeof taglib === "string") {
         let taglibPath = taglib;
         taglib = taglibLoader.loadFromFile(taglibPath);
     }
@@ -62,9 +62,9 @@ function registerTaglib(taglib) {
 }
 
 function clearCache() {
-	lookupCache = {};
+    lookupCache = {};
 }
 
-taglibLoader = require('../taglib-loader');
-taglibFinder = require('../taglib-finder');
-TaglibLookup = require('./TaglibLookup');
\ No newline at end of file
+taglibLoader = require("../taglib-loader");
+taglibFinder = require("../taglib-finder");
+TaglibLookup = require("./TaglibLookup");
diff --git a/src/compiler/util/PosInfo.js b/src/compiler/util/PosInfo.js
index a7e84c397..b4d8a1fdd 100644
--- a/src/compiler/util/PosInfo.js
+++ b/src/compiler/util/PosInfo.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-var path = require('path');
+var path = require("path");
 
 function getRelativePath(absolutePath) {
-    if (typeof window === 'undefined') {
+    if (typeof window === "undefined") {
         absolutePath = path.resolve(process.cwd(), absolutePath);
         return path.relative(process.cwd(), absolutePath);
     } else {
@@ -19,8 +19,11 @@ class PosInfo {
     }
 
     toString() {
-        return this.path + (this.line != null ? (":" + this.line + ":" + this.column) : '');
+        return (
+            this.path +
+            (this.line != null ? ":" + this.line + ":" + this.column : "")
+        );
     }
 }
 
-module.exports = PosInfo;
\ No newline at end of file
+module.exports = PosInfo;
diff --git a/src/compiler/util/UniqueVars.js b/src/compiler/util/UniqueVars.js
index 1c52add1b..b74400a60 100644
--- a/src/compiler/util/UniqueVars.js
+++ b/src/compiler/util/UniqueVars.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-var safeVarName = require('./safeVarName');
+var safeVarName = require("./safeVarName");
 
 class UniqueVars {
     constructor() {
@@ -8,7 +8,7 @@ class UniqueVars {
     }
 
     addVar(name, value) {
-        if (typeof value !== 'string') {
+        if (typeof value !== "string") {
             // Convert the non-string value into a string for easy comparison
             value = JSON.stringify(value);
         }
@@ -20,7 +20,7 @@ class UniqueVars {
             var vars = entry.vars;
 
             // See if there is already a variable with the requested value
-            for (var i=0; i<vars.length; i++) {
+            for (var i = 0; i < vars.length; i++) {
                 var curVar = vars[i];
                 if (curVar.value === value) {
                     return curVar.name;
@@ -28,7 +28,7 @@ class UniqueVars {
             }
 
             let newEntry = {
-                name: name + (++entry.counter),
+                name: name + ++entry.counter,
                 value: value
             };
 
@@ -52,4 +52,4 @@ class UniqueVars {
     }
 }
 
-module.exports = UniqueVars;
\ No newline at end of file
+module.exports = UniqueVars;
diff --git a/src/compiler/util/adjustIndent.js b/src/compiler/util/adjustIndent.js
index a90ddf28f..f81d98f17 100644
--- a/src/compiler/util/adjustIndent.js
+++ b/src/compiler/util/adjustIndent.js
@@ -4,8 +4,8 @@ var initialIndentationRegExp = /^\s+/;
 function removeInitialEmptyLines(lines) {
     var i;
 
-    for (i=0; i<lines.length; i++) {
-        if (lines[i].trim() !== '') {
+    for (i = 0; i < lines.length; i++) {
+        if (lines[i].trim() !== "") {
             break;
         }
     }
@@ -19,16 +19,16 @@ function removeInitialEmptyLines(lines) {
 
 function removeTrailingEmptyLines(lines) {
     var i;
-    var last = lines.length-1;
+    var last = lines.length - 1;
 
-    for (i=last; i>=0; i--) {
-        if (lines[i].trim() !== '') {
+    for (i = last; i >= 0; i--) {
+        if (lines[i].trim() !== "") {
             break;
         }
     }
 
     if (i !== last) {
-        lines = lines.slice(0, i+1);
+        lines = lines.slice(0, i + 1);
     }
 
     return lines;
@@ -44,12 +44,14 @@ function adjustIndent(str, newIndentation) {
     lines = removeTrailingEmptyLines(lines);
 
     if (lines.length === 0) {
-        return '';
+        return "";
     }
 
     var initialIndentationMatches = initialIndentationRegExp.exec(lines[0]);
 
-    var indentation = initialIndentationMatches ? initialIndentationMatches[0] : '';
+    var indentation = initialIndentationMatches
+        ? initialIndentationMatches[0]
+        : "";
     if (!indentation && !newIndentation) {
         return str;
     }
@@ -62,9 +64,9 @@ function adjustIndent(str, newIndentation) {
         lines[i] = line;
     });
 
-    return newIndentation ?
-        lines.join('\n' + newIndentation) :
-        lines.join('\n');
+    return newIndentation
+        ? lines.join("\n" + newIndentation)
+        : lines.join("\n");
 }
 
-module.exports = adjustIndent;
\ No newline at end of file
+module.exports = adjustIndent;
diff --git a/src/compiler/util/deresolve.js b/src/compiler/util/deresolve.js
index 97dda3281..bb542a9eb 100644
--- a/src/compiler/util/deresolve.js
+++ b/src/compiler/util/deresolve.js
@@ -1 +1 @@
-module.exports = require('deresolve');
\ No newline at end of file
+module.exports = require("deresolve");
diff --git a/src/compiler/util/finger-print.js b/src/compiler/util/finger-print.js
index 71b8fe4ff..88dc4feaf 100644
--- a/src/compiler/util/finger-print.js
+++ b/src/compiler/util/finger-print.js
@@ -1,5 +1,5 @@
-var sha1 = require('simple-sha1');
+var sha1 = require("simple-sha1");
 
 module.exports = function(str) {
     return sha1.sync(str);
-};
\ No newline at end of file
+};
diff --git a/src/compiler/util/html-elements.js b/src/compiler/util/html-elements.js
index e5ddef8c4..a20d17c8e 100644
--- a/src/compiler/util/html-elements.js
+++ b/src/compiler/util/html-elements.js
@@ -1,11 +1,10 @@
-
-var lassoPackageRoot = require('lasso-package-root');
-var path = require('path');
-var lassoCachingFS = require('lasso-caching-fs');
-var fs = require('fs');
-var stripJsonComments = require('strip-json-comments');
-var fsReadOptions = { encoding: 'utf8' };
-var modules = require('../modules');
+var lassoPackageRoot = require("lasso-package-root");
+var path = require("path");
+var lassoCachingFS = require("lasso-caching-fs");
+var fs = require("fs");
+var stripJsonComments = require("strip-json-comments");
+var fsReadOptions = { encoding: "utf8" };
+var modules = require("../modules");
 
 function parseJSONFile(path) {
     var json = fs.readFileSync(path, fsReadOptions);
@@ -13,24 +12,27 @@ function parseJSONFile(path) {
     try {
         var taglibProps = JSON.parse(stripJsonComments(json));
         return taglibProps;
-    } catch(e) {
-        throw new Error('Unable to parse JSON file at path "' + path + '". Error: ' + e);
+    } catch (e) {
+        throw new Error(
+            'Unable to parse JSON file at path "' + path + '". Error: ' + e
+        );
     }
 }
 
-
 function loadTags(file) {
-
     var raw = parseJSONFile(file);
     var tags = {};
 
     for (var k in raw) {
         if (raw.hasOwnProperty(k)) {
-            if (k.charAt(0) === '<' && k.charAt(k.length - 1) === '>') {
+            if (k.charAt(0) === "<" && k.charAt(k.length - 1) === ">") {
                 var tagName = k.substring(1, k.length - 1);
-                var tag = tags[tagName] = raw[k];
-                if (tag.import && tag.import[0] === '.') {
-                    tag.import = modules.resolveFrom(path.dirname(file), tag.import);
+                var tag = (tags[tagName] = raw[k]);
+                if (tag.import && tag.import[0] === ".") {
+                    tag.import = modules.resolveFrom(
+                        path.dirname(file),
+                        tag.import
+                    );
                 }
             }
         }
@@ -39,13 +41,12 @@ function loadTags(file) {
     return tags;
 }
 
-
 var cache = {};
 
 function getPackageRootDir(dirname) {
     try {
         return lassoPackageRoot.getRootDir(dirname);
-    } catch(e) {
+    } catch (e) {
         return undefined;
     }
 }
@@ -55,8 +56,9 @@ function getRegisteredElement(tagName, dir) {
 
     var currentDir = dir;
 
+    // eslint-disable-next-line no-constant-condition
     while (true) {
-        var filePath = path.join(currentDir, 'html-elements.json');
+        var filePath = path.join(currentDir, "html-elements.json");
         if (lassoCachingFS.existsSync(filePath)) {
             var tags = cache[filePath];
             if (!tags) {
@@ -69,11 +71,15 @@ function getRegisteredElement(tagName, dir) {
         }
 
         var parentDir = path.dirname(currentDir);
-        if (!parentDir || parentDir === currentDir || parentDir === packageRootDir) {
+        if (
+            !parentDir ||
+            parentDir === currentDir ||
+            parentDir === packageRootDir
+        ) {
             break;
         }
         currentDir = parentDir;
     }
 }
 
-exports.getRegisteredElement = getRegisteredElement;
\ No newline at end of file
+exports.getRegisteredElement = getRegisteredElement;
diff --git a/src/compiler/util/isCompoundExpression.js b/src/compiler/util/isCompoundExpression.js
index fcfa02c79..d7927d3af 100644
--- a/src/compiler/util/isCompoundExpression.js
+++ b/src/compiler/util/isCompoundExpression.js
@@ -1,5 +1,5 @@
 function isCompoundExpression(expression) {
-    if (typeof expression === 'string') {
+    if (typeof expression === "string") {
         // TBD: Should we use Esprima to parse the expression string to see if it is a compount expression?
         return true;
     }
@@ -7,4 +7,4 @@ function isCompoundExpression(expression) {
     return expression.isCompoundExpression();
 }
 
-module.exports = isCompoundExpression;
\ No newline at end of file
+module.exports = isCompoundExpression;
diff --git a/src/compiler/util/isJavaScriptReservedWord.js b/src/compiler/util/isJavaScriptReservedWord.js
index e90945334..0f60de26c 100644
--- a/src/compiler/util/isJavaScriptReservedWord.js
+++ b/src/compiler/util/isJavaScriptReservedWord.js
@@ -1,4 +1,4 @@
-var reservedWords = require('./javaScriptReservedWords');
+var reservedWords = require("./javaScriptReservedWords");
 
 module.exports = function isJavaScriptReservedWord(varName) {
     return reservedWords[varName] === true;
diff --git a/src/compiler/util/isValidJavaScriptVarName.js b/src/compiler/util/isValidJavaScriptVarName.js
index ab2ab35f6..5005efb9e 100644
--- a/src/compiler/util/isValidJavaScriptVarName.js
+++ b/src/compiler/util/isValidJavaScriptVarName.js
@@ -1,4 +1,4 @@
-var reservedWords = require('./javaScriptReservedWords');
+var reservedWords = require("./javaScriptReservedWords");
 var varNameRegExp = /^[$A-Z_][0-9A-Z_$]*$/i;
 
 module.exports = function isValidJavaScriptVarName(varName) {
diff --git a/src/compiler/util/javaScriptReservedWords.js b/src/compiler/util/javaScriptReservedWords.js
index 43c170edd..b4909eeba 100644
--- a/src/compiler/util/javaScriptReservedWords.js
+++ b/src/compiler/util/javaScriptReservedWords.js
@@ -1,66 +1,66 @@
 module.exports = {
-    'abstract': true,
-    'arguments': true,
-    'await': true, // Not really a reserved word but we add it here anyway
-    'boolean': true,
-    'break': true,
-    'byte': true,
-    'case': true,
-    'catch': true,
-    'char': true,
-    'class': true,
-    'const': true,
-    'continue': true,
-    'debugger': true,
-    'default': true,
-    'delete': true,
-    'do': true,
-    'double': true,
-    'else': true,
-    'enum*': true,
-    'eval': true,
-    'export': true,
-    'extends': true,
-    'false': true,
-    'final': true,
-    'finally': true,
-    'float': true,
-    'for': true,
-    'function': true,
-    'goto': true,
-    'if': true,
-    'implements': true,
-    'import': true,
-    'in': true,
-    'instanceof': true,
-    'int': true,
-    'interface': true,
-    'let': true,
-    'long': true,
-    'native': true,
-    'new': true,
-    'null': true,
-    'package': true,
-    'private': true,
-    'protected': true,
-    'public': true,
-    'return': true,
-    'short': true,
-    'static': true,
-    'super': true,
-    'switch': true,
-    'synchronized': true,
-    'this': true,
-    'throw': true,
-    'throws': true,
-    'transient': true,
-    'true': true,
-    'try': true,
-    'typeof': true,
-    'var': true,
-    'void': true,
-    'volatile': true,
-    'while': true,
-    'with': true,
-    'yield': true
-};
\ No newline at end of file
+    abstract: true,
+    arguments: true,
+    await: true, // Not really a reserved word but we add it here anyway
+    boolean: true,
+    break: true,
+    byte: true,
+    case: true,
+    catch: true,
+    char: true,
+    class: true,
+    const: true,
+    continue: true,
+    debugger: true,
+    default: true,
+    delete: true,
+    do: true,
+    double: true,
+    else: true,
+    "enum*": true,
+    eval: true,
+    export: true,
+    extends: true,
+    false: true,
+    final: true,
+    finally: true,
+    float: true,
+    for: true,
+    function: true,
+    goto: true,
+    if: true,
+    implements: true,
+    import: true,
+    in: true,
+    instanceof: true,
+    int: true,
+    interface: true,
+    let: true,
+    long: true,
+    native: true,
+    new: true,
+    null: true,
+    package: true,
+    private: true,
+    protected: true,
+    public: true,
+    return: true,
+    short: true,
+    static: true,
+    super: true,
+    switch: true,
+    synchronized: true,
+    this: true,
+    throw: true,
+    throws: true,
+    transient: true,
+    true: true,
+    try: true,
+    typeof: true,
+    var: true,
+    void: true,
+    volatile: true,
+    while: true,
+    with: true,
+    yield: true
+};
diff --git a/src/compiler/util/macros.js b/src/compiler/util/macros.js
index d489b3a78..010364245 100644
--- a/src/compiler/util/macros.js
+++ b/src/compiler/util/macros.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-var safeVarName = require('./safeVarName');
-var ok = require('assert').ok;
+var safeVarName = require("./safeVarName");
+var ok = require("assert").ok;
 
 class MacrosContext {
     constructor() {
@@ -13,7 +13,7 @@ class MacrosContext {
             return false;
         }
 
-        if (name.type === 'Literal') {
+        if (name.type === "Literal") {
             name = name.value;
         }
 
@@ -26,45 +26,43 @@ class MacrosContext {
 
     registerMacro(name, params) {
         ok(name, '"name" is required');
-        ok(typeof name === 'string', '"name" should be a string');
+        ok(typeof name === "string", '"name" should be a string');
         if (params == null) {
             params = [];
-
         } else {
             ok(Array.isArray(params), '"params" should be an array');
         }
 
-
         var hasOut = false;
         var hasRenderBody = false;
-        params.forEach((param) => {
-            if (param === 'out') {
+        params.forEach(param => {
+            if (param === "out") {
                 hasOut = true;
-            } else if (param === 'renderBody') {
+            } else if (param === "renderBody") {
                 hasRenderBody = true;
             }
         });
 
         if (!hasOut) {
-            params.push('out');
+            params.push("out");
         }
 
         if (!hasRenderBody) {
-            params.push('renderBody');
+            params.push("renderBody");
         }
 
         var paramIndexes = {};
         params.forEach((param, i) => {
             paramIndexes[param] = i;
 
-            if (param === 'out') {
+            if (param === "out") {
                 hasOut = true;
-            } else if (param === 'renderBody') {
+            } else if (param === "renderBody") {
                 hasRenderBody = true;
             }
         });
 
-        var functionName = 'macro_' + safeVarName(name);
+        var functionName = "macro_" + safeVarName(name);
 
         var macroDef = {
             name: name,
@@ -85,4 +83,4 @@ function createMacrosContext() {
     return new MacrosContext();
 }
 
-exports.createMacrosContext = createMacrosContext;
\ No newline at end of file
+exports.createMacrosContext = createMacrosContext;
diff --git a/src/compiler/util/parseExpression.js b/src/compiler/util/parseExpression.js
index accf3f8ee..70880f452 100644
--- a/src/compiler/util/parseExpression.js
+++ b/src/compiler/util/parseExpression.js
@@ -1,5 +1,5 @@
-var parseJavaScript = require('./parseJavaScript');
+var parseJavaScript = require("./parseJavaScript");
 
 module.exports = function(src, builder) {
-    return parseJavaScript(src, builder, true /* isExpression */ );
-};
\ No newline at end of file
+    return parseJavaScript(src, builder, true /* isExpression */);
+};
diff --git a/src/compiler/util/parseJavaScript.js b/src/compiler/util/parseJavaScript.js
index df143a447..11806dd13 100644
--- a/src/compiler/util/parseJavaScript.js
+++ b/src/compiler/util/parseJavaScript.js
@@ -1,16 +1,16 @@
-'use strict';
-var ok = require('assert').ok;
+"use strict";
+var ok = require("assert").ok;
 
-const esprima = require('esprima');
+const esprima = require("esprima");
 
 function parseExpression(src, builder, isExpression) {
-    ok(typeof src === 'string', '"src" should be a string expression');
+    ok(typeof src === "string", '"src" should be a string expression');
     ok(builder, '"builder" is required');
 
     function convert(node) {
         if (Array.isArray(node)) {
             let nodes = node;
-            for (let i=0; i<nodes.length; i++) {
+            for (let i = 0; i < nodes.length; i++) {
                 var converted = convert(nodes[i]);
                 if (converted == null) {
                     return null;
@@ -20,15 +20,15 @@ function parseExpression(src, builder, isExpression) {
             return nodes;
         }
 
-        switch(node.type) {
-            case 'ArrayExpression': {
+        switch (node.type) {
+            case "ArrayExpression": {
                 let elements = convert(node.elements);
                 if (!elements) {
                     return null;
                 }
                 return builder.arrayExpression(elements);
             }
-            case 'AssignmentExpression': {
+            case "AssignmentExpression": {
                 let left = convert(node.left);
                 if (!left) {
                     return null;
@@ -41,7 +41,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.assignment(left, right, node.operator);
             }
-            case 'BinaryExpression': {
+            case "BinaryExpression": {
                 let left = convert(node.left);
                 if (!left) {
                     return null;
@@ -54,7 +54,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.binaryExpression(left, node.operator, right);
             }
-            case 'BlockStatement': {
+            case "BlockStatement": {
                 let body = convert(node.body);
                 if (!body) {
                     return null;
@@ -62,7 +62,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return body;
             }
-            case 'CallExpression': {
+            case "CallExpression": {
                 let callee = convert(node.callee);
 
                 if (!callee) {
@@ -76,7 +76,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.functionCall(callee, args);
             }
-            case 'ConditionalExpression': {
+            case "ConditionalExpression": {
                 let test = convert(node.test);
 
                 if (!test) {
@@ -95,13 +95,17 @@ function parseExpression(src, builder, isExpression) {
                     return null;
                 }
 
-                return builder.conditionalExpression(test, consequent, alternate);
+                return builder.conditionalExpression(
+                    test,
+                    consequent,
+                    alternate
+                );
             }
-            case 'ExpressionStatement': {
+            case "ExpressionStatement": {
                 return convert(node.expression);
             }
-            case 'FunctionDeclaration':
-            case 'FunctionExpression': {
+            case "FunctionDeclaration":
+            case "FunctionExpression": {
                 let name = null;
 
                 if (node.id) {
@@ -123,21 +127,24 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.functionDeclaration(name, params, body);
             }
-            case 'Identifier': {
+            case "Identifier": {
                 return builder.identifier(node.name);
             }
-            case 'Literal': {
+            case "Literal": {
                 let literalValue;
 
                 if (node.regex) {
-                    literalValue = new RegExp(node.regex.pattern, node.regex.flags);
+                    literalValue = new RegExp(
+                        node.regex.pattern,
+                        node.regex.flags
+                    );
                 } else {
                     literalValue = node.value;
                 }
 
                 return builder.literal(literalValue);
             }
-            case 'LogicalExpression': {
+            case "LogicalExpression": {
                 let left = convert(node.left);
                 if (!left) {
                     return null;
@@ -150,7 +157,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.logicalExpression(left, node.operator, right);
             }
-            case 'MemberExpression': {
+            case "MemberExpression": {
                 let object = convert(node.object);
                 if (!object) {
                     return null;
@@ -161,9 +168,13 @@ function parseExpression(src, builder, isExpression) {
                     return null;
                 }
 
-                return builder.memberExpression(object, property, node.computed);
+                return builder.memberExpression(
+                    object,
+                    property,
+                    node.computed
+                );
             }
-            case 'NewExpression': {
+            case "NewExpression": {
                 let callee = convert(node.callee);
 
                 if (!callee) {
@@ -177,20 +188,20 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.newExpression(callee, args);
             }
-            case 'Program': {
+            case "Program": {
                 if (node.body && node.body.length === 1) {
                     return convert(node.body[0]);
                 }
                 return null;
             }
-            case 'ObjectExpression': {
+            case "ObjectExpression": {
                 let properties = convert(node.properties);
                 if (!properties) {
                     return null;
                 }
                 return builder.objectExpression(properties);
             }
-            case 'Property': {
+            case "Property": {
                 let computed = node.computed === true;
 
                 let key = convert(node.key);
@@ -198,7 +209,7 @@ function parseExpression(src, builder, isExpression) {
                     return null;
                 }
 
-                if (!computed && key.type === 'Identifier') {
+                if (!computed && key.type === "Identifier") {
                     // Favor using a Literal AST node to represent
                     // the key instead of an Identifier
                     key = builder.literal(key.name);
@@ -211,7 +222,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.property(key, value, computed);
             }
-            case 'ReturnStatement': {
+            case "ReturnStatement": {
                 var argument = node.argument;
 
                 if (argument != null) {
@@ -223,26 +234,34 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.returnStatement(argument);
             }
-            case 'ThisExpression': {
+            case "ThisExpression": {
                 return builder.thisExpression();
             }
-            case 'UnaryExpression': {
+            case "UnaryExpression": {
                 let argument = convert(node.argument);
                 if (!argument) {
                     return null;
                 }
 
-                return builder.unaryExpression(argument, node.operator, node.prefix);
+                return builder.unaryExpression(
+                    argument,
+                    node.operator,
+                    node.prefix
+                );
             }
-            case 'UpdateExpression': {
+            case "UpdateExpression": {
                 let argument = convert(node.argument);
                 if (!argument) {
                     return null;
                 }
 
-                return builder.updateExpression(argument, node.operator, node.prefix);
+                return builder.updateExpression(
+                    argument,
+                    node.operator,
+                    node.prefix
+                );
             }
-            case 'VariableDeclarator': {
+            case "VariableDeclarator": {
                 var id = convert(node.id);
                 if (!id) {
                     return null;
@@ -259,7 +278,7 @@ function parseExpression(src, builder, isExpression) {
 
                 return builder.variableDeclarator(id, init);
             }
-            case 'VariableDeclaration': {
+            case "VariableDeclaration": {
                 var kind = node.kind;
 
                 var declarations = convert(node.declarations);
@@ -277,27 +296,31 @@ function parseExpression(src, builder, isExpression) {
     let jsAST;
     try {
         if (isExpression) {
-            src = '(' + src + ')';
+            src = "(" + src + ")";
         }
         jsAST = esprima.parseScript(src);
-    } catch(e) {
+    } catch (e) {
         if (e.index == null) {
             // Doesn't look like an Esprima parse error... just rethrow the exception
             throw e;
         }
         var errorIndex = e.index;
-        var errorMessage = '\n' + e.description;
+        var errorMessage = "\n" + e.description;
         if (errorIndex != null && errorIndex >= 0) {
             if (isExpression) {
                 errorIndex--; // Account for extra paren added to start
             }
-            errorMessage += ': ';
-            errorMessage += src + '\n'+ new Array(errorMessage.length + errorIndex + 1).join(" ") + '^';
+            errorMessage += ": ";
+            errorMessage +=
+                src +
+                "\n" +
+                new Array(errorMessage.length + errorIndex + 1).join(" ") +
+                "^";
         }
         var wrappedError = new Error(errorMessage);
         wrappedError.index = errorIndex;
         wrappedError.src = src;
-        wrappedError.code = 'ERR_INVALID_JAVASCRIPT_EXPRESSION';
+        wrappedError.code = "ERR_INVALID_JAVASCRIPT_EXPRESSION";
         throw wrappedError;
     }
 
diff --git a/src/compiler/util/parseJavaScriptArgs.js b/src/compiler/util/parseJavaScriptArgs.js
index c095c0314..12ff7e986 100644
--- a/src/compiler/util/parseJavaScriptArgs.js
+++ b/src/compiler/util/parseJavaScriptArgs.js
@@ -1,13 +1,13 @@
-'use strict';
+"use strict";
 
-var ok = require('assert').ok;
+var ok = require("assert").ok;
 
 function parseJavaScriptArgs(args, builder) {
-    ok(typeof args === 'string', '"args" should be a string');
+    ok(typeof args === "string", '"args" should be a string');
     ok(builder, '"builder" is required');
 
-    var parsed = builder.parseExpression('[' + args + ']');
+    var parsed = builder.parseExpression("[" + args + "]");
     return parsed.elements;
 }
 
-module.exports = parseJavaScriptArgs;
\ No newline at end of file
+module.exports = parseJavaScriptArgs;
diff --git a/src/compiler/util/parseStatement.js b/src/compiler/util/parseStatement.js
index 6d5453b5d..4873ecdae 100644
--- a/src/compiler/util/parseStatement.js
+++ b/src/compiler/util/parseStatement.js
@@ -1,5 +1,5 @@
-var parseJavaScript = require('./parseJavaScript');
+var parseJavaScript = require("./parseJavaScript");
 
 module.exports = function(src, builder) {
-    return parseJavaScript(src, builder, false /* isExpression */ );
-};
\ No newline at end of file
+    return parseJavaScript(src, builder, false /* isExpression */);
+};
diff --git a/src/compiler/util/removeComments.js b/src/compiler/util/removeComments.js
index 7a711fc7f..4ac37d28c 100644
--- a/src/compiler/util/removeComments.js
+++ b/src/compiler/util/removeComments.js
@@ -1,19 +1,19 @@
-'use strict';
-var tokenizer = require('./tokenizer').create([
+"use strict";
+var tokenizer = require("./tokenizer").create([
     {
-        name: 'stringDouble',
-        pattern: /"(?:[^"]|\\")*"/,
+        name: "stringDouble",
+        pattern: /"(?:[^"]|\\")*"/
     },
     {
-        name: 'stringSingle',
+        name: "stringSingle",
         pattern: /'(?:[^']|\\')*'/
     },
     {
-        name: 'singleLineComment',
+        name: "singleLineComment",
         pattern: /\/\/.*/
     },
     {
-        name: 'multiLineComment',
+        name: "multiLineComment",
         pattern: /\/\*(?:[\s\S]*?)\*\//
     }
 ]);
@@ -28,13 +28,12 @@ var tokenizer = require('./tokenizer').create([
  * <init>; <test>; <update>
  */
 module.exports = function removeComments(str) {
-
     var comments = [];
 
-    tokenizer.forEachToken(str, (token) => {
-        switch(token.name) {
-            case 'singleLineComment':
-            case 'multiLineComment':
+    tokenizer.forEachToken(str, token => {
+        switch (token.name) {
+            case "singleLineComment":
+            case "multiLineComment":
                 comments.push(token);
                 break;
         }
@@ -43,11 +42,11 @@ module.exports = function removeComments(str) {
     var len = comments.length;
 
     if (len) {
-        for (var i=len-1; i>=0; i--) {
+        for (var i = len - 1; i >= 0; i--) {
             var comment = comments[i];
             str = str.substring(0, comment.start) + str.substring(comment.end);
         }
     }
 
     return str;
-};
\ No newline at end of file
+};
diff --git a/src/compiler/util/removeDashes.js b/src/compiler/util/removeDashes.js
index d64bc7522..442379800 100644
--- a/src/compiler/util/removeDashes.js
+++ b/src/compiler/util/removeDashes.js
@@ -1,5 +1,5 @@
 module.exports = function removeDashes(str) {
-    return str.replace(/-([a-z])/g, function (match, lower) {
+    return str.replace(/-([a-z])/g, function(match, lower) {
         return lower.toUpperCase();
     });
-};
\ No newline at end of file
+};
diff --git a/src/compiler/util/replacePlaceholderEscapeFuncs.js b/src/compiler/util/replacePlaceholderEscapeFuncs.js
index d6ff8bc0c..3aca513b7 100644
--- a/src/compiler/util/replacePlaceholderEscapeFuncs.js
+++ b/src/compiler/util/replacePlaceholderEscapeFuncs.js
@@ -1,19 +1,26 @@
-var AttributePlaceholder = require('../ast/AttributePlaceholder');
+var AttributePlaceholder = require("../ast/AttributePlaceholder");
 
 module.exports = function replacePlaceholderEscapeFuncs(node, context) {
     var walker = context.createWalker({
-        exit: function(node, parent) {
-            if (node.type === 'FunctionCall' &&
-                node.callee.type === 'Identifier') {
-
-                if (node.callee.name === '$noEscapeXml') {
-                    return new AttributePlaceholder({escape: false, value: node.args[0]});
-                } else if (node.callee.name === '$escapeXml') {
-                    return new AttributePlaceholder({escape: true, value: node.args[0]});
+        exit: function(node) {
+            if (
+                node.type === "FunctionCall" &&
+                node.callee.type === "Identifier"
+            ) {
+                if (node.callee.name === "$noEscapeXml") {
+                    return new AttributePlaceholder({
+                        escape: false,
+                        value: node.args[0]
+                    });
+                } else if (node.callee.name === "$escapeXml") {
+                    return new AttributePlaceholder({
+                        escape: true,
+                        value: node.args[0]
+                    });
                 }
             }
         }
     });
 
     return walker.walk(node);
-};
\ No newline at end of file
+};
diff --git a/src/compiler/util/safeVarName.js b/src/compiler/util/safeVarName.js
index d11bee91e..cef5c9bfe 100644
--- a/src/compiler/util/safeVarName.js
+++ b/src/compiler/util/safeVarName.js
@@ -3,16 +3,18 @@ function safeVarName(varName) {
     if (parts.length >= 2) {
         // The varname looks like it was based on a path.
         // Let's just use the last two parts
-        varName = parts.slice(-2).join('_');
+        varName = parts.slice(-2).join("_");
     }
 
-    return varName.replace(/[^A-Za-z0-9_]/g, '_').replace(/^[0-9]+/, function(match) {
-        var str = '';
-        for (var i=0; i<match.length; i++) {
-            str += '_';
-        }
-        return str;
-    });
+    return varName
+        .replace(/[^A-Za-z0-9_]/g, "_")
+        .replace(/^[0-9]+/, function(match) {
+            var str = "";
+            for (var i = 0; i < match.length; i++) {
+                str += "_";
+            }
+            return str;
+        });
 }
 
-module.exports = safeVarName;
\ No newline at end of file
+module.exports = safeVarName;
diff --git a/src/compiler/util/tokenizer.js b/src/compiler/util/tokenizer.js
index 4b72cd208..eaaf13435 100644
--- a/src/compiler/util/tokenizer.js
+++ b/src/compiler/util/tokenizer.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
 function create(tokens) {
     function getToken(matches) {
-        for (var i=0; i<tokens.length; i++) {
+        for (var i = 0; i < tokens.length; i++) {
             let tokenValue = matches[i + 1];
             if (tokenValue != null) {
                 var tokenDef = tokens[i];
@@ -16,22 +16,25 @@ function create(tokens) {
         }
     }
 
-    var tokensRegExp = new RegExp(tokens
-        .map((token) => {
-            return '(' + token.pattern.source + ')';
-        })
-        .join('|'), 'g');
+    var tokensRegExp = new RegExp(
+        tokens
+            .map(token => {
+                return "(" + token.pattern.source + ")";
+            })
+            .join("|"),
+        "g"
+    );
 
     return {
-        forEachToken: function(value, callback, thisObj) {
+        forEachToken: function(value, callback) {
             tokensRegExp.lastIndex = 0; // Start searching from the beginning again
             var matches;
             while ((matches = tokensRegExp.exec(value))) {
                 let token = getToken(matches);
-                callback.call(this, token);
+                callback(token);
             }
         }
     };
 }
 
-exports.create = create;
\ No newline at end of file
+exports.create = create;
diff --git a/src/compiler/util/vdom/VDOMOptimizer.js b/src/compiler/util/vdom/VDOMOptimizer.js
index e07da4e3d..5127787ae 100644
--- a/src/compiler/util/vdom/VDOMOptimizer.js
+++ b/src/compiler/util/vdom/VDOMOptimizer.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /*
 Algorithm:
@@ -21,12 +21,14 @@ c) Else, generate one of the following:
 
 */
 
-
-const Node = require('../../ast/Node');
+const Node = require("../../ast/Node");
 const OPTIMIZER_CONTEXT_KEY = Symbol();
 
-const OPTIONS_DEFAULT =             { optimizeTextNodes: true, optimizeStaticNodes: true };
-const OPTIONS_OPTIMIZE_TEXT_NODES = { optimizeTextNodes: true, optimizeStaticNodes: false };
+const OPTIONS_DEFAULT = { optimizeTextNodes: true, optimizeStaticNodes: true };
+const OPTIONS_OPTIMIZE_TEXT_NODES = {
+    optimizeTextNodes: true,
+    optimizeStaticNodes: false
+};
 
 class OptimizerContext {
     constructor(context) {
@@ -42,11 +44,12 @@ class OptimizerContext {
         if (!nextConstIdFunc) {
             let context = this.context;
             let builder = context.builder;
-            let constId = this.context.helper('const');
+            let constId = this.context.helper("const");
             let fingerprintLiteral = builder.literal(context.getFingerprint(6));
             nextConstIdFunc = this._nextConstIdFunc = context.addStaticVar(
-                'marko_const_nextId',
-                builder.functionCall(constId, [ fingerprintLiteral ]));
+                "marko_const_nextId",
+                builder.functionCall(constId, [fingerprintLiteral])
+            );
         }
         return nextConstIdFunc;
     }
@@ -54,27 +57,28 @@ class OptimizerContext {
 
 class NodeVDOM extends Node {
     constructor(variableIdentifier, isComponent) {
-        super('NodeVDOM');
+        super("NodeVDOM");
         this.variableIdentifier = variableIdentifier;
         this.isComponent = isComponent;
     }
 
     writeCode(writer) {
         var builder = writer.builder;
-        var funcCallArgs = [ this.variableIdentifier ];
+        var funcCallArgs = [this.variableIdentifier];
 
         if (this.isComponent) {
-            funcCallArgs.push(builder.identifier('component'));
+            funcCallArgs.push(builder.identifier("component"));
         }
 
         let funcCall = builder.functionCall(
-            builder.identifier('n'),
-            funcCallArgs);
+            builder.identifier("n"),
+            funcCallArgs
+        );
 
         if (this.isChild) {
-            writer.write('.');
+            writer.write(".");
         } else {
-            writer.write('out.');
+            writer.write("out.");
         }
 
         writer.write(funcCall);
@@ -84,23 +88,28 @@ class NodeVDOM extends Node {
 function generateNodesForArray(nodes, context, options) {
     let builder = context.builder;
 
-    var optimizerContext = context[OPTIMIZER_CONTEXT_KEY] ||
+    var optimizerContext =
+        context[OPTIMIZER_CONTEXT_KEY] ||
         (context[OPTIMIZER_CONTEXT_KEY] = new OptimizerContext(context));
 
-
     var optimizeStaticNodes = options.optimizeStaticNodes !== false;
 
     function generateStaticNode(node) {
-        if (node.type === 'HtmlElementVDOM') {
-            node.createElementId = context.helper('createElement');
+        if (node.type === "HtmlElementVDOM") {
+            node.createElementId = context.helper("createElement");
 
-            node.setConstId(builder.functionCall(optimizerContext.nextConstIdFunc, []));
-        }/* else {
+            node.setConstId(
+                builder.functionCall(optimizerContext.nextConstIdFunc, [])
+            );
+        } /* else {
             node.createTextId = context.importModule('marko_createText', 'marko/vdom/createText');
         }*/
 
         node.isStaticRoot = true;
-        let staticNodeId = context.addStaticVar('marko_node' + (optimizerContext.nextNodeId++), node);
+        let staticNodeId = context.addStaticVar(
+            "marko_node" + optimizerContext.nextNodeId++,
+            node
+        );
 
         return new NodeVDOM(staticNodeId, context.isComponent);
     }
@@ -109,7 +118,10 @@ function generateNodesForArray(nodes, context, options) {
         var attributesArg = node.attributesArg;
         if (attributesArg) {
             node.isStaticRoot = true;
-            let staticAttrsId = context.addStaticVar('marko_attrs' + (optimizerContext.nextAttrsId++), attributesArg);
+            let staticAttrsId = context.addStaticVar(
+                "marko_attrs" + optimizerContext.nextAttrsId++,
+                attributesArg
+            );
             node.attributesArg = staticAttrsId;
         }
     }
@@ -117,9 +129,9 @@ function generateNodesForArray(nodes, context, options) {
     let finalNodes = [];
     let i = 0;
 
-    while (i<nodes.length) {
+    while (i < nodes.length) {
         let node = nodes[i];
-        if (node.type === 'HtmlElementVDOM') {
+        if (node.type === "HtmlElementVDOM") {
             if (optimizeStaticNodes) {
                 if (node.isStatic) {
                     finalNodes.push(generateStaticNode(node));
diff --git a/src/compiler/util/vdom/index.js b/src/compiler/util/vdom/index.js
index dbb9dbdbc..198e16349 100644
--- a/src/compiler/util/vdom/index.js
+++ b/src/compiler/util/vdom/index.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-const VDOMOptimizer = require('./VDOMOptimizer');
-const isStaticValue = require('./isStaticValue');
+const VDOMOptimizer = require("./VDOMOptimizer");
+const isStaticValue = require("./isStaticValue");
 
 const OPTIMIZER_ADDED_KEY = Symbol();
 
@@ -16,4 +16,4 @@ function registerOptimizer(context) {
 
 exports.registerOptimizer = registerOptimizer;
 exports.isStaticValue = isStaticValue;
-exports.registerOptimizer = registerOptimizer;
\ No newline at end of file
+exports.registerOptimizer = registerOptimizer;
diff --git a/src/compiler/util/vdom/isStaticValue.js b/src/compiler/util/vdom/isStaticValue.js
index d97be4df6..363f46242 100644
--- a/src/compiler/util/vdom/isStaticValue.js
+++ b/src/compiler/util/vdom/isStaticValue.js
@@ -1,9 +1,9 @@
-'use strict';
-var Literal = require('../../ast/Literal');
-var Node = require('../../ast/Node');
+"use strict";
+var Literal = require("../../ast/Literal");
+var Node = require("../../ast/Node");
 
 function isStaticArray(array) {
-    for (let i=0; i<array.length; i++) {
+    for (let i = 0; i < array.length; i++) {
         if (!isStaticValue(array[i])) {
             return false;
         }
@@ -29,13 +29,13 @@ function isStaticValue(value) {
     }
 
     if (value instanceof Node) {
-         if (value instanceof Literal) {
-             return isStaticValue(value.value);
-         } else {
-             return false;
-         }
+        if (value instanceof Literal) {
+            return isStaticValue(value.value);
+        } else {
+            return false;
+        }
     } else {
-        if (typeof value === 'object') {
+        if (typeof value === "object") {
             if (Array.isArray(value)) {
                 return isStaticArray(value);
             } else {
@@ -47,4 +47,4 @@ function isStaticValue(value) {
     }
 }
 
-module.exports = isStaticValue;
\ No newline at end of file
+module.exports = isStaticValue;
diff --git a/src/components/.jshintrc b/src/components/.jshintrc
deleted file mode 100644
index d03b0755f..000000000
--- a/src/components/.jshintrc
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "node": true,
-    "browser": true,
-    "esnext": true,
-    "boss": false,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "eqeqeq": true,
-    "evil": true,
-    "forin": false,
-    "immed": true,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": false,
-    "white": false,
-    "eqeqeq": false,
-    "latedef": "func",
-    "unused": "vars",
-    "strict": false,
-    "eqnull": true
-}
diff --git a/src/components/Component.js b/src/components/Component.js
index fadab2dec..493eebde4 100644
--- a/src/components/Component.js
+++ b/src/components/Component.js
@@ -1,22 +1,23 @@
-'use strict';
+"use strict";
 /* jshint newcap:false */
 
-var complain = 'MARKO_DEBUG' && require('complain');
+var complain = "MARKO_DEBUG" && require("complain");
 
-var domInsert = require('../runtime/dom-insert');
-var defaultCreateOut = require('../runtime/createOut');
-var getComponentsContext = require('./ComponentsContext').___getComponentsContext;
-var componentsUtil = require('./util');
+var domInsert = require("../runtime/dom-insert");
+var defaultCreateOut = require("../runtime/createOut");
+var getComponentsContext = require("./ComponentsContext")
+    .___getComponentsContext;
+var componentsUtil = require("./util");
 var componentLookup = componentsUtil.___componentLookup;
 var emitLifecycleEvent = componentsUtil.___emitLifecycleEvent;
 var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
-var EventEmitter = require('events-light');
-var RenderResult = require('../runtime/RenderResult');
-var SubscriptionTracker = require('listener-tracker');
-var inherit = require('raptor-util/inherit');
-var updateManager = require('./update-manager');
-var morphdom = require('../morphdom');
-var eventDelegation = require('./event-delegation');
+var EventEmitter = require("events-light");
+var RenderResult = require("../runtime/RenderResult");
+var SubscriptionTracker = require("listener-tracker");
+var inherit = require("raptor-util/inherit");
+var updateManager = require("./update-manager");
+var morphdom = require("../morphdom");
+var eventDelegation = require("./event-delegation");
 
 var slice = Array.prototype.slice;
 
@@ -32,7 +33,12 @@ function removeListener(removeEventListenerHandle) {
     removeEventListenerHandle();
 }
 
-function handleCustomEventWithMethodListener(component, targetMethodName, args, extraArgs) {
+function handleCustomEventWithMethodListener(
+    component,
+    targetMethodName,
+    args,
+    extraArgs
+) {
     // Remove the "eventType" argument
     args.push(component);
 
@@ -40,22 +46,21 @@ function handleCustomEventWithMethodListener(component, targetMethodName, args,
         args = extraArgs.concat(args);
     }
 
-
     var targetComponent = componentLookup[component.___scope];
     var targetMethod = targetComponent[targetMethodName];
     if (!targetMethod) {
-        throw Error('Method not found: ' + targetMethodName);
+        throw Error("Method not found: " + targetMethodName);
     }
 
     targetMethod.apply(targetComponent, args);
 }
 
 function resolveKeyHelper(key, index) {
-    return index ? key + '_' + index : key;
+    return index ? key + "_" + index : key;
 }
 
 function resolveComponentIdHelper(component, key, index) {
-    return component.id + '-' + resolveKeyHelper(key, index);
+    return component.id + "-" + resolveKeyHelper(key, index);
 }
 
 /**
@@ -71,11 +76,11 @@ function processUpdateHandlers(component, stateChanges, oldState) {
 
     for (var propName in stateChanges) {
         if (stateChanges.hasOwnProperty(propName)) {
-            var handlerMethodName = 'update_' + propName;
+            var handlerMethodName = "update_" + propName;
 
             handlerMethod = component[handlerMethodName];
             if (handlerMethod) {
-                (handlers || (handlers=[])).push([propName, handlerMethod]);
+                (handlers || (handlers = [])).push([propName, handlerMethod]);
             } else {
                 // This state change does not have a state handler so return false
                 // to force a rerender
@@ -91,7 +96,7 @@ function processUpdateHandlers(component, stateChanges, oldState) {
         // Otherwise, there are handlers for all of the changed properties
         // so apply the updates using those handlers
 
-        handlers.forEach(function(handler, i) {
+        handlers.forEach(function(handler) {
             var propertyName = handler[0];
             handlerMethod = handler[1];
 
@@ -100,7 +105,7 @@ function processUpdateHandlers(component, stateChanges, oldState) {
             handlerMethod.call(component, newValue, oldValue);
         });
 
-        emitLifecycleEvent(component, 'update');
+        emitLifecycleEvent(component, "update");
 
         component.___reset();
     }
@@ -121,7 +126,7 @@ function checkInputChanged(existingComponent, oldInput, newInput) {
             return true;
         }
 
-        for (var i=0; i<len; i++) {
+        for (var i = 0; i < len; i++) {
             var key = oldKeys[i];
             if (oldInput[key] !== newInput[key]) {
                 return true;
@@ -180,11 +185,13 @@ Component.prototype = componentProto = {
             throw TypeError();
         }
 
-        var subscriptions = this.___subscriptions || (this.___subscriptions = new SubscriptionTracker());
+        var subscriptions =
+            this.___subscriptions ||
+            (this.___subscriptions = new SubscriptionTracker());
 
-        var subscribeToOptions = target.___isComponent ?
-            COMPONENT_SUBSCRIBE_TO_OPTIONS :
-            NON_COMPONENT_SUBSCRIBE_TO_OPTIONS;
+        var subscribeToOptions = target.___isComponent
+            ? COMPONENT_SUBSCRIBE_TO_OPTIONS
+            : NON_COMPONENT_SUBSCRIBE_TO_OPTIONS;
 
         return subscriptions.subscribeTo(target, subscribeToOptions);
     },
@@ -199,7 +206,12 @@ Component.prototype = componentProto = {
             var extraArgs = target[2];
             var args = slice.call(arguments, 1);
 
-            handleCustomEventWithMethodListener(this, targetMethodName, args, extraArgs);
+            handleCustomEventWithMethodListener(
+                this,
+                targetMethodName,
+                args,
+                extraArgs
+            );
 
             if (isOnce) {
                 delete customEvents[eventType];
@@ -210,10 +222,10 @@ Component.prototype = componentProto = {
             return emit.apply(this, arguments);
         }
     },
-    getElId: function (key, index) {
+    getElId: function(key, index) {
         return resolveComponentIdHelper(this, key, index);
     },
-    getEl: function (key, index) {
+    getEl: function(key, index) {
         if (key) {
             return this.___keyedElements[resolveKeyHelper(key, index)];
         } else {
@@ -221,12 +233,12 @@ Component.prototype = componentProto = {
         }
     },
     getEls: function(key) {
-        key = key + '[]';
+        key = key + "[]";
 
         var els = [];
         var i = 0;
         var el;
-        while((el = this.getEl(key, i))) {
+        while ((el = this.getEl(key, i))) {
             els.push(el);
             i++;
         }
@@ -236,12 +248,15 @@ Component.prototype = componentProto = {
         return componentLookup[resolveComponentIdHelper(this, key, index)];
     },
     getComponents: function(key) {
-        key = key + '[]';
+        key = key + "[]";
 
         var components = [];
         var i = 0;
         var component;
-        while((component = componentLookup[resolveComponentIdHelper(this, key, i)])) {
+        while (
+            (component =
+                componentLookup[resolveComponentIdHelper(this, key, i)])
+        ) {
             components.push(component);
             i++;
         }
@@ -260,7 +275,7 @@ Component.prototype = componentProto = {
             destroyNodeRecursive(node);
 
             if (eventDelegation.___handleNodeDetach(node) !== false) {
-                 node.parentNode.removeChild(node);
+                node.parentNode.removeChild(node);
             }
         });
 
@@ -272,7 +287,7 @@ Component.prototype = componentProto = {
             return;
         }
 
-        emitLifecycleEvent(this, 'destroy');
+        emitLifecycleEvent(this, "destroy");
         this.___destroyed = true;
 
         this.___startNode.___markoComponent = undefined;
@@ -318,7 +333,7 @@ Component.prototype = componentProto = {
     setState: function(name, value) {
         var state = this.___state;
 
-        if (typeof name == 'object') {
+        if (typeof name == "object") {
             // Merge in the new state with the old state
             var newState = name;
             for (var k in newState) {
@@ -338,7 +353,12 @@ Component.prototype = componentProto = {
             value = state[name];
         }
 
-        state.___set(name, value, true /* ensure:true */, true /* forceDirty:true */);
+        state.___set(
+            name,
+            value,
+            true /* ensure:true */,
+            true /* forceDirty:true */
+        );
     },
 
     replaceState: function(newState) {
@@ -407,8 +427,19 @@ Component.prototype = componentProto = {
         var input = this.___input;
         var state = this.___state;
 
-        if (this.___dirty === false && state !== null && state.___dirty === true) {
-            if (processUpdateHandlers(this, state.___changes, state.___old, state)) {
+        if (
+            this.___dirty === false &&
+            state !== null &&
+            state.___dirty === true
+        ) {
+            if (
+                processUpdateHandlers(
+                    this,
+                    state.___changes,
+                    state.___old,
+                    state
+                )
+            ) {
                 state.___dirty = false;
             }
         }
@@ -425,9 +456,11 @@ Component.prototype = componentProto = {
         this.___reset();
     },
 
-
     get ___isDirty() {
-        return this.___dirty === true || (this.___state !== null && this.___state.___dirty === true);
+        return (
+            this.___dirty === true ||
+            (this.___state !== null && this.___state.___dirty === true)
+        );
     },
 
     ___reset: function() {
@@ -440,7 +473,7 @@ Component.prototype = componentProto = {
         }
     },
 
-    shouldUpdate: function(newState, newProps) {
+    shouldUpdate: function() {
         return true;
     },
 
@@ -486,7 +519,8 @@ Component.prototype = componentProto = {
                 endNodeNextSibling,
                 targetNode,
                 doc,
-                componentsContext);
+                componentsContext
+            );
 
             result.afterInsert(doc);
         });
@@ -504,7 +538,7 @@ Component.prototype = componentProto = {
         var currentNode = this.___startNode;
         var endNode = this.___endNode;
 
-        for(;;) {
+        for (;;) {
             var nextSibling = currentNode.nextSibling;
             callback(currentNode);
             if (currentNode == endNode) {
@@ -528,7 +562,7 @@ Component.prototype = componentProto = {
     },
 
     ___setCustomEvents: function(customEvents, scope) {
-        var finalCustomEvents = this.___customEvents = {};
+        var finalCustomEvents = (this.___customEvents = {});
         this.___scope = scope;
 
         customEvents.forEach(function(customEvent) {
@@ -537,13 +571,20 @@ Component.prototype = componentProto = {
             var isOnce = customEvent[2];
             var extraArgs = customEvent[3];
 
-            finalCustomEvents[eventType] = [targetMethodName, isOnce, extraArgs];
+            finalCustomEvents[eventType] = [
+                targetMethodName,
+                isOnce,
+                extraArgs
+            ];
         });
     },
 
     get el() {
-        if ('MARKO_DEBUG') {
-            complain('The "this.el" attribute is deprecated. Please use "this.getEl(key)" instead.');
+        // eslint-disable-next-line no-constant-condition
+        if ("MARKO_DEBUG") {
+            complain(
+                'The "this.el" attribute is deprecated. Please use "this.getEl(key)" instead.'
+            );
         }
         var el = this.___startNode;
         while (el) {
@@ -554,11 +595,14 @@ Component.prototype = componentProto = {
     },
 
     get els() {
-        if ('MARKO_DEBUG') {
-            complain('The "this.els" attribute is deprecated. Please use "this.getEls(key)" instead.');
+        // eslint-disable-next-line no-constant-condition
+        if ("MARKO_DEBUG") {
+            complain(
+                'The "this.els" attribute is deprecated. Please use "this.getEls(key)" instead.'
+            );
         }
-        return getNodes(this).filter(function(el) { 
-            return el.nodeType === ELEMENT_NODE; 
+        return getNodes(this).filter(function(el) {
+            return el.nodeType === ELEMENT_NODE;
         });
     }
 };
@@ -581,7 +625,8 @@ domInsert(
     },
     function afterInsert(component) {
         return component;
-    });
+    }
+);
 
 inherit(Component, EventEmitter);
 
diff --git a/src/components/ComponentDef.js b/src/components/ComponentDef.js
index f0881b6c3..49387ed3d 100644
--- a/src/components/ComponentDef.js
+++ b/src/components/ComponentDef.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 var repeatedRegExp = /\[\]$/;
-var componentUtil = require('./util');
+var componentUtil = require("./util");
 var attachBubblingEvent = componentUtil.___attachBubblingEvent;
-var extend = require('raptor-util/extend');
-var KeySequence = require('./KeySequence');
+var extend = require("raptor-util/extend");
+var KeySequence = require("./KeySequence");
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 /*
@@ -21,7 +21,7 @@ function ComponentDef(component, componentId, globalComponentsContext) {
     this.___component = component;
     this.id = componentId;
 
-    this.___domEvents = undefined;         // An array of DOM events that need to be added (in sets of three)
+    this.___domEvents = undefined; // An array of DOM events that need to be added (in sets of three)
 
     this.___isExisting = false;
 
@@ -36,14 +36,15 @@ function ComponentDef(component, componentId, globalComponentsContext) {
 }
 
 ComponentDef.prototype = {
-
     ___nextKey: function(key) {
-        var keySequence = this.___keySequence || (this.___keySequence = new KeySequence());
+        var keySequence =
+            this.___keySequence || (this.___keySequence = new KeySequence());
         return keySequence.___nextKey(key);
     },
 
     ___preserveDOMNode: function(key, bodyOnly) {
-        var lookup = this.___preservedDOMNodes || (this.___preservedDOMNodes = {});
+        var lookup =
+            this.___preservedDOMNodes || (this.___preservedDOMNodes = {});
         lookup[key] = bodyOnly ? 2 : 1;
     },
 
@@ -55,15 +56,18 @@ ComponentDef.prototype = {
      * an ID with the current index for the current nestedId.
      * (e.g. "myParentId-foo[0]", "myParentId-foo[1]", etc.)
      */
-    elId: function (nestedId) {
+    elId: function(nestedId) {
         var id = this.id;
         if (nestedId == null) {
             return id;
         } else {
-            if (typeof nestedId == 'string' && repeatedRegExp.test(nestedId)) {
-                return this.___globalComponentsContext.___nextRepeatedId(id, nestedId);
+            if (typeof nestedId == "string" && repeatedRegExp.test(nestedId)) {
+                return this.___globalComponentsContext.___nextRepeatedId(
+                    id,
+                    nestedId
+                );
             } else {
-                return id + '-' + nestedId;
+                return id + "-" + nestedId;
             }
         }
     },
@@ -75,7 +79,7 @@ ComponentDef.prototype = {
      * @param  {String} targetMethod The name of the method to invoke on the scoped component
      * @param  {String} elId The DOM element ID of the DOM element that the event listener needs to be added too
      */
-     e: function(type, targetMethod, elId, isOnce, extraArgs) {
+    e: function(type, targetMethod, elId, isOnce, extraArgs) {
         if (targetMethod) {
             // The event handler method is allowed to be conditional. At render time if the target
             // method is null then we do not attach any direct event listeners.
@@ -84,14 +88,15 @@ ComponentDef.prototype = {
                 targetMethod,
                 elId,
                 isOnce,
-                extraArgs]);
+                extraArgs
+            ]);
         }
     },
     /**
      * Returns the next auto generated unique ID for a nested DOM element or nested DOM component
      */
     ___nextComponentId: function() {
-        return this.id + '-c' + (this.___nextIdIndex++);
+        return this.id + "-c" + this.___nextIdIndex++;
     },
 
     d: function(handlerMethodName, isOnce, extraArgs) {
@@ -104,17 +109,19 @@ ComponentDef.prototype = {
 };
 
 ComponentDef.___deserialize = function(o, types, global, registry) {
-    var id        = o[0];
-    var typeName  = types[o[1]];
-    var input     = o[2];
-    var extra     = o[3];
+    var id = o[0];
+    var typeName = types[o[1]];
+    var input = o[2];
+    var extra = o[3];
 
     var isLegacy = extra.l;
     var state = extra.s;
     var componentProps = extra.w;
     var flags = extra.f;
 
-    var component = typeName /* legacy */ && registry.___createComponent(typeName, id, isLegacy);
+    var component =
+        typeName /* legacy */ &&
+        registry.___createComponent(typeName, id, isLegacy);
 
     // Prevent newly created component from being queued for update since we area
     // just building it from the server info
diff --git a/src/components/ComponentsContext.js b/src/components/ComponentsContext.js
index 29b3d5c94..00bbcd9f9 100644
--- a/src/components/ComponentsContext.js
+++ b/src/components/ComponentsContext.js
@@ -1,5 +1,5 @@
-'use strict';
-var GlobalComponentsContext = require('./GlobalComponentsContext');
+"use strict";
+var GlobalComponentsContext = require("./GlobalComponentsContext");
 
 function ComponentsContext(out, parentComponentsContext) {
     var globalComponentsContext;
@@ -10,7 +10,10 @@ function ComponentsContext(out, parentComponentsContext) {
         componentDef = parentComponentsContext.___componentDef;
 
         var nestedContextsForParent;
-        if (!(nestedContextsForParent = parentComponentsContext.___nestedContexts)) {
+        if (
+            !(nestedContextsForParent =
+                parentComponentsContext.___nestedContexts)
+        ) {
             nestedContextsForParent = parentComponentsContext.___nestedContexts = [];
         }
 
@@ -18,7 +21,9 @@ function ComponentsContext(out, parentComponentsContext) {
     } else {
         globalComponentsContext = out.global.___components;
         if (globalComponentsContext === undefined) {
-            out.global.___components = globalComponentsContext = new GlobalComponentsContext(out);
+            out.global.___components = globalComponentsContext = new GlobalComponentsContext(
+                out
+            );
         }
     }
 
@@ -35,18 +40,20 @@ ComponentsContext.prototype = {
 
         ComponentsContext.___initClientRendered(componentDefs, doc);
 
-        this.___out.emit('___componentsInitialized');
+        this.___out.emit("___componentsInitialized");
 
         // Reset things stored in global since global is retained for
         // future renders
         this.___out.global.___components = undefined;
 
         return componentDefs;
-    },
+    }
 };
 
 function getComponentsContext(out) {
-    return out.___components || (out.___components = new ComponentsContext(out));
+    return (
+        out.___components || (out.___components = new ComponentsContext(out))
+    );
 }
 
 module.exports = exports = ComponentsContext;
diff --git a/src/components/GlobalComponentsContext.js b/src/components/GlobalComponentsContext.js
index 1e2188372..156611bc9 100644
--- a/src/components/GlobalComponentsContext.js
+++ b/src/components/GlobalComponentsContext.js
@@ -1,5 +1,5 @@
-var nextComponentIdProvider = require('./util').___nextComponentIdProvider;
-var KeySequence = require('./KeySequence');
+var nextComponentIdProvider = require("./util").___nextComponentIdProvider;
+var KeySequence = require("./KeySequence");
 
 function GlobalComponentsContext(out) {
     this.___preservedEls = {};
diff --git a/src/components/KeySequence.js b/src/components/KeySequence.js
index ed73040da..b44546eaf 100644
--- a/src/components/KeySequence.js
+++ b/src/components/KeySequence.js
@@ -1,4 +1,4 @@
- function KeySequence() {
+function KeySequence() {
     this.___lookup = {};
 }
 
@@ -17,10 +17,8 @@ KeySequence.prototype = {
             currentIndex = 0;
             return key;
         } else {
-            return key + '_' + currentIndex;
+            return key + "_" + currentIndex;
         }
-
-
     }
 };
 
diff --git a/src/components/ServerComponent.js b/src/components/ServerComponent.js
index c53849d47..a5c245e38 100644
--- a/src/components/ServerComponent.js
+++ b/src/components/ServerComponent.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 class ServerComponent {
     constructor(id, input, out, typeName, customEvents, scope) {
diff --git a/src/components/State.js b/src/components/State.js
index 99122126e..6589088b1 100644
--- a/src/components/State.js
+++ b/src/components/State.js
@@ -1,4 +1,4 @@
-var extend = require('raptor-util/extend');
+var extend = require("raptor-util/extend");
 
 function ensure(state, propertyName) {
     var proto = state.constructor.prototype;
@@ -44,12 +44,22 @@ State.prototype = {
 
         for (key in rawState) {
             if (!(key in newState)) {
-                state.___set(key, undefined, false /* ensure:false */, false /* forceDirty:false */);
+                state.___set(
+                    key,
+                    undefined,
+                    false /* ensure:false */,
+                    false /* forceDirty:false */
+                );
             }
         }
 
         for (key in newState) {
-            state.___set(key, newState[key], true /* ensure:true */, false /* forceDirty:false */);
+            state.___set(
+                key,
+                newState[key],
+                true /* ensure:true */,
+                false /* forceDirty:false */
+            );
         }
     },
     ___set: function(name, value, shouldEnsure, forceDirty) {
diff --git a/src/components/attach-detach.js b/src/components/attach-detach.js
index b8b6deff7..eb1bb49f5 100644
--- a/src/components/attach-detach.js
+++ b/src/components/attach-detach.js
@@ -1,4 +1,4 @@
-var eventDelegation = require('./event-delegation');
+var eventDelegation = require("./event-delegation");
 var delegateEvent = eventDelegation.___delegateEvent;
 var getEventFromEl = eventDelegation.___getEventFromEl;
 
@@ -8,7 +8,7 @@ var getEventFromEl = eventDelegation.___getEventFromEl;
 
 function handleNodeAttach(node, componentsContext) {
     if (node.nodeType === 1) {
-        var eventName = 'onattach';
+        var eventName = "onattach";
         var target = getEventFromEl(node, eventName);
         if (target) {
             var out = componentsContext.___out;
@@ -17,10 +17,10 @@ function handleNodeAttach(node, componentsContext) {
             var attachTargets = data.___attachTargets;
             if (!attachTargets) {
                 attachTargets = data.___attachTargets = [];
-                out.on('___componentsInitialized', function() {
-                    for (var i=0; i<attachTargets.length; i+=2) {
+                out.on("___componentsInitialized", function() {
+                    for (var i = 0; i < attachTargets.length; i += 2) {
                         var node = attachTargets[i];
-                        var target = attachTargets[i+1];
+                        var target = attachTargets[i + 1];
                         delegateEvent(node, eventName, target, {});
                     }
                 });
@@ -34,7 +34,7 @@ function handleNodeAttach(node, componentsContext) {
 
 function handleNodeDetach(node) {
     if (node.nodeType === 1) {
-        var eventName = 'ondetach';
+        var eventName = "ondetach";
         var target = getEventFromEl(node, eventName);
         if (target) {
             var allowDetach;
diff --git a/src/components/beginComponent-browser.js b/src/components/beginComponent-browser.js
index b4e61922f..3a29ff03f 100644
--- a/src/components/beginComponent-browser.js
+++ b/src/components/beginComponent-browser.js
@@ -1,10 +1,14 @@
-var ComponentDef = require('./ComponentDef');
+var ComponentDef = require("./ComponentDef");
 
-module.exports = function beginComponent(componentsContext, component, isSplitComponen, parentComponentDeft) {
+module.exports = function beginComponent(componentsContext, component) {
     var componentId = component.id;
 
     var globalContext = componentsContext.___globalContext;
-    var componentDef = componentsContext.___componentDef = new ComponentDef(component, componentId, globalContext);
+    var componentDef = (componentsContext.___componentDef = new ComponentDef(
+        component,
+        componentId,
+        globalContext
+    ));
     globalContext.___renderedComponentsById[componentId] = true;
     componentsContext.___components.push(componentDef);
 
diff --git a/src/components/beginComponent.js b/src/components/beginComponent.js
index 5ca96b68f..e42012817 100644
--- a/src/components/beginComponent.js
+++ b/src/components/beginComponent.js
@@ -1,20 +1,33 @@
-'use strict';
+"use strict";
 
-const ComponentDef = require('./ComponentDef');
+const ComponentDef = require("./ComponentDef");
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_BODY_EL = 2;
 // var FLAG_HAS_HEAD_EL = 4;
 
-module.exports = function beginComponent(componentsContext, component, isSplitComponent, parentComponentDef, isImplicitComponent) {
+module.exports = function beginComponent(
+    componentsContext,
+    component,
+    isSplitComponent,
+    parentComponentDef,
+    isImplicitComponent
+) {
     var globalContext = componentsContext.___globalContext;
 
     var componentId = component.id;
 
-    var componentDef = componentsContext.___componentDef = new ComponentDef(component, componentId, globalContext);
+    var componentDef = (componentsContext.___componentDef = new ComponentDef(
+        component,
+        componentId,
+        globalContext
+    ));
 
     // On the server
-    if (parentComponentDef && (parentComponentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER)) {
+    if (
+        parentComponentDef &&
+        parentComponentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER
+    ) {
         componentDef.___flags |= FLAG_WILL_RERENDER_IN_BROWSER;
         return componentDef;
     }
@@ -34,9 +47,9 @@ module.exports = function beginComponent(componentsContext, component, isSplitCo
 
     if (isSplitComponent === false && out.global.noBrowserRerender !== true) {
         componentDef.___flags |= FLAG_WILL_RERENDER_IN_BROWSER;
-        out.w('<!--M#' + componentId + '-->');
+        out.w("<!--M#" + componentId + "-->");
     } else {
-        out.w('<!--M^' + componentId + '-->');
+        out.w("<!--M^" + componentId + "-->");
     }
 
     return componentDef;
diff --git a/src/components/boot.js b/src/components/boot.js
index a7ef53349..9b0833124 100644
--- a/src/components/boot.js
+++ b/src/components/boot.js
@@ -1 +1 @@
-if (window.$initComponents) window.$initComponents();
\ No newline at end of file
+if (window.$initComponents) window.$initComponents();
diff --git a/src/components/bubble.js b/src/components/bubble.js
index fb0ebd87b..07c1f9cbb 100644
--- a/src/components/bubble.js
+++ b/src/components/bubble.js
@@ -1,37 +1,37 @@
 module.exports = [
     /* Mouse Events */
-    'click',
-    'dblclick',
-    'mousedown',
-    'mouseup',
+    "click",
+    "dblclick",
+    "mousedown",
+    "mouseup",
     // 'mouseover',
     // 'mousemove',
     // 'mouseout',
-    'dragstart',
-    'drag',
+    "dragstart",
+    "drag",
     // 'dragenter',
     // 'dragleave',
     // 'dragover',
-    'drop',
-    'dragend',
+    "drop",
+    "dragend",
 
     /* Keyboard Events */
-    'keydown',
-    'keypress',
-    'keyup',
+    "keydown",
+    "keypress",
+    "keyup",
 
     /* Form Events */
-    'select',
-    'change',
-    'submit',
-    'reset',
-    'input',
+    "select",
+    "change",
+    "submit",
+    "reset",
+    "input",
 
-    'attach', // Pseudo event supported by Marko
-    'detach'  // Pseudo event supported by Marko
+    "attach", // Pseudo event supported by Marko
+    "detach" // Pseudo event supported by Marko
 
     // 'focus', <-- Does not bubble
     // 'blur', <-- Does not bubble
     // 'focusin', <-- Not supported in all browsers
     // 'focusout' <-- Not supported in all browsers
-];
\ No newline at end of file
+];
diff --git a/src/components/compiler.browser.json b/src/components/compiler.browser.json
index d666ca6eb..ee77a1771 100644
--- a/src/components/compiler.browser.json
+++ b/src/components/compiler.browser.json
@@ -4,4 +4,4 @@
         "require: ./taglib/TransformHelper/*.js",
         "require: ./attach-detach.js"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/components/defineComponent.js b/src/components/defineComponent.js
index 6ebdbd317..ec9e0b80f 100644
--- a/src/components/defineComponent.js
+++ b/src/components/defineComponent.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 /* jshint newcap:false */
 
-var BaseState = require('./State');
-var BaseComponent = require('./Component');
-var inherit = require('raptor-util/inherit');
+var BaseState = require("./State");
+var BaseComponent = require("./Component");
+var inherit = require("raptor-util/inherit");
 
 module.exports = function defineComponent(def, renderer) {
     if (def.___isComponent) {
@@ -15,9 +15,9 @@ module.exports = function defineComponent(def, renderer) {
 
     var type = typeof def;
 
-    if (type == 'function') {
+    if (type == "function") {
         proto = def.prototype;
-    } else if (type == 'object') {
+    } else if (type == "object") {
         proto = def;
     } else {
         throw TypeError();
@@ -50,7 +50,9 @@ module.exports = function defineComponent(def, renderer) {
     // a component so that we can short-circuit this work later
     Component.___isComponent = true;
 
-    function State(component) { BaseState.call(this, component); }
+    function State(component) {
+        BaseState.call(this, component);
+    }
     inherit(State, BaseState);
     proto.___State = State;
     proto.___renderer = renderer;
diff --git a/src/components/endComponent-browser.js b/src/components/endComponent-browser.js
index eae21057a..cdcbb8296 100644
--- a/src/components/endComponent-browser.js
+++ b/src/components/endComponent-browser.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 module.exports = function endComponent(out) {
     out.ee(); // endElement() (also works for VComponent nodes pushed on to the stack)
diff --git a/src/components/endComponent.js b/src/components/endComponent.js
index 69d45c181..f77e86970 100644
--- a/src/components/endComponent.js
+++ b/src/components/endComponent.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
 module.exports = function endComponent(out, componentDef) {
     if (componentDef.___renderBoundary) {
-        out.w('<!--M/' + componentDef.id + '-->');
+        out.w("<!--M/" + componentDef.id + "-->");
     }
 };
diff --git a/src/components/event-delegation.js b/src/components/event-delegation.js
index 994b259bc..a1008c02c 100644
--- a/src/components/event-delegation.js
+++ b/src/components/event-delegation.js
@@ -1,20 +1,20 @@
-var componentsUtil = require('./util');
+var componentsUtil = require("./util");
 var runtimeId = componentsUtil.___runtimeId;
 var componentLookup = componentsUtil.___componentLookup;
 var getMarkoPropsFromEl = componentsUtil.___getMarkoPropsFromEl;
 
 // We make our best effort to allow multiple marko runtimes to be loaded in the
 // same window. Each marko runtime will get its own unique runtime ID.
-var listenersAttachedKey = '$MED' + runtimeId;
+var listenersAttachedKey = "$MED" + runtimeId;
 
 function getEventFromEl(el, eventName) {
     var virtualProps = getMarkoPropsFromEl(el);
     var eventInfo = virtualProps[eventName];
 
-    if (typeof eventInfo === 'string') {
-        eventInfo = eventInfo.split(' ');
+    if (typeof eventInfo === "string") {
+        eventInfo = eventInfo.split(" ");
         if (eventInfo[2]) {
-            eventInfo[2] = eventInfo[2] === 'true';
+            eventInfo[2] = eventInfo[2] === "true";
         }
         if (eventInfo.length == 4) {
             eventInfo[3] = parseInt(eventInfo[3], 10);
@@ -43,11 +43,11 @@ function delegateEvent(node, eventName, target, event) {
 
     var targetFunc = targetComponent[targetMethod];
     if (!targetFunc) {
-        throw Error('Method not found: ' + targetMethod);
+        throw Error("Method not found: " + targetMethod);
     }
 
     if (extraArgs != null) {
-        if (typeof extraArgs === 'number') {
+        if (typeof extraArgs === "number") {
             extraArgs = targetComponent.___bubblingDomEvents[extraArgs];
         }
     }
@@ -69,7 +69,7 @@ function attachBubbleEventListeners(doc) {
     // we again walk up the tree starting at the target associated
     // with the event to find any mappings for event. Each mapping
     // is from a DOM event type to a method of a component.
-    require('./bubble').forEach(function addBubbleHandler(eventType) {
+    require("./bubble").forEach(function addBubbleHandler(eventType) {
         body.addEventListener(eventType, function(event) {
             var propagationStopped = false;
 
@@ -93,7 +93,7 @@ function attachBubbleEventListeners(doc) {
 
             // Search up the tree looking DOM events mapped to target
             // component methods
-            var propName = 'on' + eventType;
+            var propName = "on" + eventType;
             var target;
 
             // Attributes will have the following form:
@@ -107,7 +107,7 @@ function attachBubbleEventListeners(doc) {
                         break;
                     }
                 }
-            } while((curNode = curNode.parentNode) && curNode.getAttribute);
+            } while ((curNode = curNode.parentNode) && curNode.getAttribute);
         });
     });
 }
diff --git a/src/components/helpers-browser.js b/src/components/helpers-browser.js
index 8a33027e9..13cbc3ee8 100644
--- a/src/components/helpers-browser.js
+++ b/src/components/helpers-browser.js
@@ -1,5 +1,5 @@
-require('./');
+require("./");
 
-exports.c = require('./defineComponent'); // Referenced by compiled templates
-exports.r = require('./renderer'); // Referenced by compiled templates
-exports.rc = require('./registry').___register;  // Referenced by compiled templates
+exports.c = require("./defineComponent"); // Referenced by compiled templates
+exports.r = require("./renderer"); // Referenced by compiled templates
+exports.rc = require("./registry").___register; // Referenced by compiled templates
diff --git a/src/components/helpers.js b/src/components/helpers.js
index ae92a1813..6c9f077cf 100644
--- a/src/components/helpers.js
+++ b/src/components/helpers.js
@@ -1,9 +1,13 @@
-require('./');
+require("./");
 
-exports.r = require('./renderer');
+exports.r = require("./renderer");
 
-exports.c = function() { /* no op for defining a component on teh server */ };
+exports.c = function() {
+    /* no op for defining a component on teh server */
+};
 
 // registerComponent is a no-op on the server.
 // Fixes https://github.com/marko-js/marko-components/issues/111
-exports.rc = function(typeName) { return typeName; };
+exports.rc = function(typeName) {
+    return typeName;
+};
diff --git a/src/components/index-browser.js b/src/components/index-browser.js
index d6a0071bf..a76ae1fc2 100644
--- a/src/components/index-browser.js
+++ b/src/components/index-browser.js
@@ -1,12 +1,15 @@
-var componentsUtil = require('./util');
-var initComponents = require('./init-components');
-var registry = require('./registry');
+var componentsUtil = require("./util");
+var initComponents = require("./init-components");
+var registry = require("./registry");
 
-require('./ComponentsContext').___initClientRendered = initComponents.___initClientRendered;
+require("./ComponentsContext").___initClientRendered =
+    initComponents.___initClientRendered;
 
 exports.getComponentForEl = componentsUtil.___getComponentForEl;
 exports.init = window.$initComponents = initComponents.___initServerRendered;
 
 exports.register = function(id, component) {
-    registry.___register(id, function() { return component; });
-};
\ No newline at end of file
+    registry.___register(id, function() {
+        return component;
+    });
+};
diff --git a/src/components/index.js b/src/components/index.js
index 6b3d6dc3a..46a03b70a 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,14 +1,13 @@
-'use strict';
+"use strict";
 
-var warp10 = require('warp10');
+var warp10 = require("warp10");
 var safeJSONRegExp = /<\/|\u2028|\u2029/g;
 
-
 function safeJSONReplacer(match) {
-    if (match === '<\/') {
-        return '\\u003C/';
+    if (match === "</") {
+        return "\\u003C/";
     } else {
-        return '\\u' + match.charCodeAt(0).toString(16);
+        return "\\u" + match.charCodeAt(0).toString(16);
     }
 }
 
@@ -16,13 +15,23 @@ function safeJSON(json) {
     return json.replace(safeJSONRegExp, safeJSONReplacer);
 }
 
-function addComponentsFromContext(componentsContext, componentsFinal, typesLookup, typesArray) {
+function addComponentsFromContext(
+    componentsContext,
+    componentsFinal,
+    typesLookup,
+    typesArray
+) {
     var nestedContexts = componentsContext.___nestedContexts;
     if (nestedContexts !== undefined) {
         // We want to initialize any UI components nested inside an async
         // fragment first so we will add components from nested contexts first
         nestedContexts.forEach(function(nestedContext) {
-            addComponentsFromContext(nestedContext, componentsFinal, typesLookup, typesArray);
+            addComponentsFromContext(
+                nestedContext,
+                componentsFinal,
+                typesLookup,
+                typesArray
+            );
         });
     }
 
@@ -72,7 +81,7 @@ function addComponentsFromContext(componentsContext, componentsFinal, typesLooku
         var hasProps = false;
 
         let componentKeys = Object.keys(component);
-        for (let i=0, len=componentKeys.length; i<len; i++) {
+        for (let i = 0, len = componentKeys.length; i < len; i++) {
             let key = componentKeys[i];
 
             if (component[key] !== undefined) {
@@ -89,7 +98,7 @@ function addComponentsFromContext(componentsContext, componentsFinal, typesLooku
             // This ensures that we add the proper getter/setter for the state property.
 
             let stateKeys = Object.keys(state);
-            for (let i=0, len=stateKeys.length; i<len; i++) {
+            for (let i = 0, len = stateKeys.length; i < len; i++) {
                 let key = stateKeys[i];
 
                 if (state[key] === undefined) {
@@ -116,10 +125,10 @@ function addComponentsFromContext(componentsContext, componentsFinal, typesLooku
         };
 
         componentsFinal.push([
-            id,                  // 0 = id
-            typeIndex,           // 1 = type
-            input,               // 2 = input
-            extra                // 3
+            id, // 0 = id
+            typeIndex, // 1 = type
+            input, // 2 = input
+            extra // 3
         ]);
     }
 
@@ -136,10 +145,15 @@ function getRenderedComponents(out) {
     var typesLookup = {};
     var typesArray = [];
 
-    addComponentsFromContext(componentsContext, componentsFinal, typesLookup, typesArray);
+    addComponentsFromContext(
+        componentsContext,
+        componentsFinal,
+        typesLookup,
+        typesArray
+    );
 
     if (componentsFinal.length !== 0) {
-        return {w: componentsFinal, t: typesArray};
+        return { w: componentsFinal, t: typesArray };
     }
 }
 
@@ -150,12 +164,16 @@ function writeInitComponentsCode(fromOut, targetOut, shouldIncludeAll) {
     }
 
     var cspNonce = targetOut.global.cspNonce;
-    var nonceAttr = cspNonce ? ' nonce='+JSON.stringify(cspNonce) : '';
+    var nonceAttr = cspNonce ? " nonce=" + JSON.stringify(cspNonce) : "";
 
-    targetOut.write('<script' + nonceAttr + '>' +
-        '(function(){var w=window;w.$components=(w.$components||[]).concat(' +
-        safeJSON(warp10.stringify(renderedComponents)) +
-        ')||w.$components})()</script>');
+    targetOut.write(
+        "<script" +
+            nonceAttr +
+            ">" +
+            "(function(){var w=window;w.$components=(w.$components||[]).concat(" +
+            safeJSON(warp10.stringify(renderedComponents)) +
+            ")||w.$components})()</script>"
+    );
 }
 
 exports.writeInitComponentsCode = writeInitComponentsCode;
diff --git a/src/components/init-components-browser.js b/src/components/init-components-browser.js
index 12427490c..382a562eb 100644
--- a/src/components/init-components-browser.js
+++ b/src/components/init-components-browser.js
@@ -1,12 +1,12 @@
-'use strict';
-var warp10Finalize = require('warp10/finalize');
-var eventDelegation = require('./event-delegation');
+"use strict";
+var warp10Finalize = require("warp10/finalize");
+var eventDelegation = require("./event-delegation");
 var win = window;
 var defaultDocument = document;
-var componentsUtil = require('./util');
+var componentsUtil = require("./util");
 var componentLookup = componentsUtil.___componentLookup;
-var ComponentDef = require('./ComponentDef');
-var registry = require('./registry');
+var ComponentDef = require("./ComponentDef");
+var registry = require("./registry");
 var serverRenderedGlobals = {};
 var serverComponentStartNodes = {};
 var serverComponentEndNodes = {};
@@ -20,27 +20,31 @@ function indexServerComponentBoundaries(node) {
     var componentId;
 
     node = node.firstChild;
-    while(node) {
-        if (node.nodeType === 8) { // Comment node
+    while (node) {
+        if (node.nodeType === 8) {
+            // Comment node
             var commentValue = node.nodeValue;
-            if (commentValue[0] === 'M') {
+            if (commentValue[0] === "M") {
                 componentId = commentValue.substring(2);
 
                 var firstChar = commentValue[1];
 
-                if (firstChar === '/') {
+                if (firstChar === "/") {
                     serverComponentEndNodes[componentId] = node;
-                } else if (firstChar === '^' || firstChar === '#'){
+                } else if (firstChar === "^" || firstChar === "#") {
                     serverComponentStartNodes[componentId] = node;
                 }
             }
-        } else if (node.nodeType === 1) { // HTML element node
-            var markoKey = node.getAttribute('data-marko-key');
+        } else if (node.nodeType === 1) {
+            // HTML element node
+            var markoKey = node.getAttribute("data-marko-key");
             if (markoKey) {
-                var separatorIndex = markoKey.indexOf(' ');
-                componentId = markoKey.substring(separatorIndex+1);
+                var separatorIndex = markoKey.indexOf(" ");
+                componentId = markoKey.substring(separatorIndex + 1);
                 markoKey = markoKey.substring(0, separatorIndex);
-                var keyedElements = keyedElementsByComponentId[componentId] || (keyedElementsByComponentId[componentId] = {});
+                var keyedElements =
+                    keyedElementsByComponentId[componentId] ||
+                    (keyedElementsByComponentId[componentId] = {});
                 keyedElements[markoKey] = node;
             }
             indexServerComponentBoundaries(node);
@@ -48,13 +52,12 @@ function indexServerComponentBoundaries(node) {
 
         node = node.nextSibling;
     }
-
 }
 
 function invokeComponentEventHandler(component, targetMethodName, args) {
     var method = component[targetMethodName];
     if (!method) {
-        throw Error('Method not found: ' + targetMethodName);
+        throw Error("Method not found: " + targetMethodName);
     }
 
     method.apply(component, args);
@@ -76,8 +79,18 @@ function addEventListenerHelper(el, eventType, isOnce, listener) {
     };
 }
 
-function addDOMEventListeners(component, el, eventType, targetMethodName, isOnce, extraArgs, handles) {
-    var removeListener = addEventListenerHelper(el, eventType, isOnce, function(event) {
+function addDOMEventListeners(
+    component,
+    el,
+    eventType,
+    targetMethodName,
+    isOnce,
+    extraArgs,
+    handles
+) {
+    var removeListener = addEventListenerHelper(el, eventType, isOnce, function(
+        event
+    ) {
         var args = [event, el];
         if (extraArgs) {
             args = extraArgs.concat(args);
@@ -125,7 +138,15 @@ function initComponent(componentDef, doc) {
             var isOnce = domEventArgs[3];
             var extraArgs = domEventArgs[4];
 
-            addDOMEventListeners(component, eventEl, eventType, targetMethodName, isOnce, extraArgs, eventListenerHandles);
+            addDOMEventListeners(
+                component,
+                eventEl,
+                eventType,
+                targetMethodName,
+                isOnce,
+                extraArgs,
+                eventListenerHandles
+            );
         });
 
         if (eventListenerHandles.length) {
@@ -134,10 +155,10 @@ function initComponent(componentDef, doc) {
     }
 
     if (component.___mounted) {
-        component.___emitLifecycleEvent('update');
+        component.___emitLifecycleEvent("update");
     } else {
         component.___mounted = true;
-        component.___emitLifecycleEvent('mount');
+        component.___emitLifecycleEvent("mount");
     }
 }
 
@@ -155,11 +176,9 @@ function initClientRendered(componentDefs, doc) {
     eventDelegation.___init(doc);
 
     doc = doc || defaultDocument;
-    for (var i=componentDefs.length-1; i>=0; i--) {
+    for (var i = componentDefs.length - 1; i >= 0; i--) {
         var componentDef = componentDefs[i];
-        initComponent(
-            componentDef,
-            doc);
+        initComponent(componentDef, doc);
     }
 }
 
@@ -201,7 +220,12 @@ function initServerRendered(renderedComponents, doc) {
     }
 
     componentDefs.forEach(function(componentDef) {
-        componentDef = ComponentDef.___deserialize(componentDef, typesArray, serverRenderedGlobals, registry);
+        componentDef = ComponentDef.___deserialize(
+            componentDef,
+            typesArray,
+            serverRenderedGlobals,
+            registry
+        );
         var componentId = componentDef.id;
         var component = componentDef.___component;
 
@@ -246,7 +270,8 @@ function initServerRendered(renderedComponents, doc) {
             }
         }
 
-        component.___keyedElements = keyedElementsByComponentId[componentId] || {};
+        component.___keyedElements =
+            keyedElementsByComponentId[componentId] || {};
         component.___startNode = startNode;
         component.___endNode = endNode;
 
diff --git a/src/components/init-components.js b/src/components/init-components.js
index e5f2f6929..e7d54fac1 100644
--- a/src/components/init-components.js
+++ b/src/components/init-components.js
@@ -1 +1 @@
-// The server-side implementation of this module is intentionally empty
\ No newline at end of file
+// The server-side implementation of this module is intentionally empty
diff --git a/src/components/jquery.js b/src/components/jquery.js
index 56f3fe22a..dc00f74aa 100644
--- a/src/components/jquery.js
+++ b/src/components/jquery.js
@@ -1,29 +1,29 @@
-var ready = require('./ready');
+var ready = require("./ready");
 
-var idRegExp = /^\#(\S+)( .*)?/;
+var idRegExp = /^#(\S+)( .*)?/;
 
 exports.patchComponent = function(jQuery, proto, delayThrow) {
     /* globals window */
 
     if (!(jQuery || (jQuery = window.$)) && !delayThrow) {
-        throw new Error('jQuery not found');
+        throw new Error("jQuery not found");
     }
 
-    (proto || require('./Component').prototype).$ = function jqueryProxy(arg) {
+    (proto || require("./Component").prototype).$ = function jqueryProxy(arg) {
         var args = arguments;
         var self = this;
 
         if (!jQuery) {
-            throw new Error('jQuery not found');
+            throw new Error("jQuery not found");
         }
 
         if (args.length === 1) {
             //Handle an "ondomready" callback function
-            if (typeof arg === 'function') {
+            if (typeof arg === "function") {
                 return ready(function() {
                     arg.call(self);
                 });
-            } else if (typeof arg === 'string') {
+            } else if (typeof arg === "string") {
                 var match = idRegExp.exec(arg);
                 //Reset the search to 0 so the next call to exec will start from the beginning for the new string
                 if (match != null) {
@@ -36,14 +36,16 @@ exports.patchComponent = function(jQuery, proto, delayThrow) {
                 } else {
                     var rootEl = self.getEl();
                     if (!rootEl) {
-                        throw new Error('Root element is not defined for component');
+                        throw new Error(
+                            "Root element is not defined for component"
+                        );
                     }
                     if (rootEl) {
                         return jQuery(arg, rootEl);
                     }
                 }
             }
-        } else if (args.length === 2 && typeof args[1] === 'string') {
+        } else if (args.length === 2 && typeof args[1] === "string") {
             return jQuery(arg, self.getEl(args[1]));
         } else if (args.length === 0) {
             return jQuery(self.el);
diff --git a/src/components/legacy/State-legacy.js b/src/components/legacy/State-legacy.js
index 5a0a5d036..ee3d6bb18 100644
--- a/src/components/legacy/State-legacy.js
+++ b/src/components/legacy/State-legacy.js
@@ -1,4 +1,4 @@
-var extend = require('raptor-util/extend');
+var extend = require("raptor-util/extend");
 
 function ensure(state, propertyName) {
     var proto = state.constructor.prototype;
@@ -48,12 +48,22 @@ State.prototype = {
 
         for (key in rawState) {
             if (!(key in newState)) {
-                state.___set(key, undefined, false /* ensure:false */, false /* forceDirty:false */);
+                state.___set(
+                    key,
+                    undefined,
+                    false /* ensure:false */,
+                    false /* forceDirty:false */
+                );
             }
         }
 
         for (key in newState) {
-            state.___set(key, newState[key], true /* ensure:true */, false /* forceDirty:false */);
+            state.___set(
+                key,
+                newState[key],
+                true /* ensure:true */,
+                false /* forceDirty:false */
+            );
         }
     },
     ___set: function(name, value, shouldEnsure, forceDirty) {
diff --git a/src/components/legacy/defineComponent-legacy.js b/src/components/legacy/defineComponent-legacy.js
index 9e728d79a..a1a25b4fa 100644
--- a/src/components/legacy/defineComponent-legacy.js
+++ b/src/components/legacy/defineComponent-legacy.js
@@ -23,6 +23,5 @@ module.exports = function defineComponent(def) {
     return defineWidget(def, renderer);
 };
 
-defineRenderer = require('./defineRenderer-legacy');
-defineWidget = require('./defineWidget-legacy');
-
+defineRenderer = require("./defineRenderer-legacy");
+defineWidget = require("./defineWidget-legacy");
diff --git a/src/components/legacy/defineRenderer-legacy.js b/src/components/legacy/defineRenderer-legacy.js
index 3356d3e04..7bb65d581 100644
--- a/src/components/legacy/defineRenderer-legacy.js
+++ b/src/components/legacy/defineRenderer-legacy.js
@@ -1,5 +1,5 @@
-var marko = require('../../');
-var makeRenderable = require('../../runtime/renderable');
+var marko = require("../../");
+var makeRenderable = require("../../runtime/renderable");
 
 module.exports = function defineRenderer(renderingLogic) {
     var renderer = renderingLogic.renderer;
@@ -10,7 +10,7 @@ module.exports = function defineRenderer(renderingLogic) {
 
     var template = renderingLogic.template;
 
-    if (typeof template === 'string') {
+    if (typeof template === "string") {
         template = marko.load(template);
     }
 
@@ -26,11 +26,12 @@ module.exports = function defineRenderer(renderingLogic) {
     }
 
     renderer.___isRenderer = true;
-    renderer.createOut = template ? template.createOut : renderingLogic.createOut;
+    renderer.createOut = template
+        ? template.createOut
+        : renderingLogic.createOut;
     renderer.template = template;
 
     makeRenderable(renderer, renderer);
 
     return renderer;
 };
-
diff --git a/src/components/legacy/defineWidget-legacy-browser.js b/src/components/legacy/defineWidget-legacy-browser.js
index 65463d4bd..3ea67942a 100644
--- a/src/components/legacy/defineWidget-legacy-browser.js
+++ b/src/components/legacy/defineWidget-legacy-browser.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 /* jshint newcap:false */
 
- var BaseState;
- var BaseComponent;
- var inherit;
- var jQuery = require('../jquery');
- var ready = require('../ready');
+var BaseState;
+var BaseComponent;
+var inherit;
+var jQuery = require("../jquery");
+var ready = require("../ready");
 
 module.exports = function defineWidget(def, renderer) {
     def = def.Widget || def;
@@ -17,10 +17,10 @@ module.exports = function defineWidget(def, renderer) {
     var ComponentClass = function() {};
     var proto;
 
-    if (typeof def === 'function') {
+    if (typeof def === "function") {
         proto = def.prototype;
         proto.init = def;
-    } else if (typeof def === 'object') {
+    } else if (typeof def === "object") {
         proto = def;
     } else {
         throw TypeError();
@@ -75,8 +75,8 @@ module.exports = function defineWidget(def, renderer) {
         var config = this.$c;
         if (init) init.call(this, config);
         if (onRender) {
-            onRender.call(this, { firstRender:true });
-            this.on('___legacyRender', function() {
+            onRender.call(this, { firstRender: true });
+            this.on("___legacyRender", function() {
                 self.___didUpdate = true;
             });
         }
@@ -104,13 +104,15 @@ module.exports = function defineWidget(def, renderer) {
     // a component so that we can short-circuit this work later
     Component.___isComponent = true;
 
-    function State() { BaseState.apply(this, arguments); }
+    function State() {
+        BaseState.apply(this, arguments);
+    }
     inherit(State, BaseState);
     proto.___State = State;
 
     jQuery.patchComponent(
-        window.$, 
-        proto, 
+        window.$,
+        proto,
         true /* don't throw error until used if `$` is missing*/
     );
 
@@ -121,10 +123,11 @@ module.exports = function defineWidget(def, renderer) {
         if (renderer) {
             // Legacy support
             var createOut = renderer.createOut;
-            if (typeof renderer !== 'function') {
+            if (typeof renderer !== "function") {
                 var rendererObject = renderer;
                 renderer = function(input, out) {
-                    var rendererFunc = rendererObject.renderer || rendererObject.render;
+                    var rendererFunc =
+                        rendererObject.renderer || rendererObject.render;
                     rendererFunc(input, out);
                 };
                 renderer.createOut = createOut;
@@ -138,7 +141,6 @@ module.exports = function defineWidget(def, renderer) {
         }
     }
 
-
     if (renderer) {
         // Add the rendering related methods as statics on the
         // new component constructor function
@@ -150,6 +152,6 @@ module.exports = function defineWidget(def, renderer) {
     return Component;
 };
 
-BaseState = require('./State-legacy');
-BaseComponent = require('../Component');
-inherit = require('raptor-util/inherit');
+BaseState = require("./State-legacy");
+BaseComponent = require("../Component");
+inherit = require("raptor-util/inherit");
diff --git a/src/components/legacy/defineWidget-legacy.js b/src/components/legacy/defineWidget-legacy.js
index a5dd5b863..d144cc98d 100644
--- a/src/components/legacy/defineWidget-legacy.js
+++ b/src/components/legacy/defineWidget-legacy.js
@@ -12,6 +12,6 @@ module.exports = function defineWidget(def, renderer) {
             template: renderer.template
         };
     } else {
-        return {___isComponent: true};
+        return { ___isComponent: true };
     }
 };
diff --git a/src/components/legacy/dependencies/html.js b/src/components/legacy/dependencies/html.js
index cc1c06086..539ce94c8 100644
--- a/src/components/legacy/dependencies/html.js
+++ b/src/components/legacy/dependencies/html.js
@@ -1,3 +1,3 @@
-var patch = require('./').patch;
-var Template = require('../../../runtime/html/Template');
+var patch = require("./").patch;
+var Template = require("../../../runtime/html/Template");
 patch(Template);
diff --git a/src/components/legacy/dependencies/index.js b/src/components/legacy/dependencies/index.js
index a6426fe99..f2ef43bf2 100644
--- a/src/components/legacy/dependencies/index.js
+++ b/src/components/legacy/dependencies/index.js
@@ -1,7 +1,7 @@
-var path = require('path');
-var defaultResolveFrom = require('resolve-from');
+var path = require("path");
+var defaultResolveFrom = require("resolve-from");
 var env = process.env.NODE_ENV;
-var production = !env || env !== 'development';
+var production = !env || env !== "development";
 
 function getRootDeps(template, context) {
     if (production && template.___depsArray) {
@@ -10,14 +10,16 @@ function getRootDeps(template, context) {
 
     attachDepsAndComponentsToTemplate(template, context);
 
-    var deps = template.___depsArray = Object.keys(template.___deps).map(key => template.___deps[key]);
+    var deps = (template.___depsArray = Object.keys(template.___deps).map(
+        key => template.___deps[key]
+    ));
     var initModule = getInitModule(template.path, template.___components);
 
     if (initModule) deps.push(initModule);
 
     deps.push({
-        type: 'require',
-        path: require.resolve('../../boot'),
+        type: "require",
+        path: require.resolve("../../boot"),
         run: true
     });
 
@@ -41,14 +43,15 @@ function attachDepsAndComponentsToTemplate(target, context) {
         template = target;
     }
 
-    if (typeof template.createOut !== 'function') return;
+    if (typeof template.createOut !== "function") return;
     if (production && target.___deps) return;
 
-    var deps = target.___deps = {};
-    var components = target.___components = {};
+    var deps = (target.___deps = {});
+    var components = (target.___components = {});
 
     if (!template.meta) {
-        console.error('Metadata not set for template at ', template.path);
+        // eslint-disable-next-line no-console
+        console.warn("Metadata not set for template at ", template.path);
         return;
     }
 
@@ -63,7 +66,8 @@ function attachDepsAndComponentsToTemplate(target, context) {
     }
 
     if (meta.id && meta.component) {
-        var resolveFrom = (context && context.resolveFrom) || defaultResolveFrom;
+        var resolveFrom =
+            (context && context.resolveFrom) || defaultResolveFrom;
         components[meta.id] = {
             id: meta.id,
             path: resolveFrom(root, meta.component)
@@ -78,8 +82,10 @@ function attachDepsAndComponentsToTemplate(target, context) {
             var req = context.require || require;
 
             try {
-                tag = req.resolve(tag.slice(0, 0 - ext.length) + '.js');
-            } catch(e) {}
+                tag = req.resolve(tag.slice(0, 0 - ext.length) + ".js");
+            } catch (e) {
+                /* ignore error */
+            }
 
             tag = req(tag);
 
@@ -98,17 +104,20 @@ function getInitModule(path, components) {
         components = Object.keys(components).map(key => components[key]);
 
         if (components.length) {
-            var virtualPath = path + '.init.js';
-            var registrations = components.map(component =>
-                `components.register('${component.id}', require('${component.path}'));`
+            var virtualPath = path + ".init.js";
+            var registrations = components.map(
+                component =>
+                    `components.register('${component.id}', require('${
+                        component.path
+                    }'));`
             );
             var code = `
                 var components = require('marko/components');
-                ${registrations.join('\n')}
+                ${registrations.join("\n")}
             `;
 
             module = {
-                type: 'require',
+                type: "require",
                 run: true,
                 virtualModule: {
                     path: virtualPath,
@@ -129,16 +138,17 @@ function getInitModule(path, components) {
 }
 
 function resolveDep(dep, root, context) {
-    if (typeof dep === 'string') {
+    if (typeof dep === "string") {
         dep = parseDependencyString(dep);
     }
 
     if (dep.path) {
-        var resolveFrom = (context && context.resolveFrom) || defaultResolveFrom;
+        var resolveFrom =
+            (context && context.resolveFrom) || defaultResolveFrom;
         dep.path = resolveFrom(root, dep.path);
 
-        if(dep.path && !dep.type) {
-            dep.type = dep.path.slice(dep.path.lastIndexOf('.')+1);
+        if (dep.path && !dep.type) {
+            dep.type = dep.path.slice(dep.path.lastIndexOf(".") + 1);
         }
     }
 
@@ -146,8 +156,8 @@ function resolveDep(dep, root, context) {
         dep.virtualPath = path.resolve(root, dep.virtualPath);
     }
 
-    if (dep.type === 'js') {
-        dep.type = 'require';
+    if (dep.type === "js") {
+        dep.type = "require";
         dep.run = true;
     }
 
@@ -155,7 +165,7 @@ function resolveDep(dep, root, context) {
 }
 
 function parseDependencyString(string) {
-    var match = /^(?:([\w-]+)(?:\:\s*|\s+))?(.*?(?:\.(\w+))?)$/.exec(string);
+    var match = /^(?:([\w-]+)(?::\s*|\s+))?(.*?(?:\.(\w+))?)$/.exec(string);
     return {
         type: match[1] || match[3],
         path: match[2]
@@ -172,4 +182,4 @@ function patch(Template) {
 
 exports.getDeps = getRootDeps;
 exports.resolveDep = resolveDep;
-exports.patch = patch;
\ No newline at end of file
+exports.patch = patch;
diff --git a/src/components/legacy/dependencies/vdom.js b/src/components/legacy/dependencies/vdom.js
index 1c8ae47a7..22d18963e 100644
--- a/src/components/legacy/dependencies/vdom.js
+++ b/src/components/legacy/dependencies/vdom.js
@@ -1,3 +1,3 @@
-var patch = require('./').patch;
-var Template = require('../../../runtime/vdom').Template;
+var patch = require("./").patch;
+var Template = require("../../../runtime/vdom").Template;
 patch(Template);
diff --git a/src/components/legacy/helpers-browser.js b/src/components/legacy/helpers-browser.js
index 6bea6b6c6..c3fb404a1 100644
--- a/src/components/legacy/helpers-browser.js
+++ b/src/components/legacy/helpers-browser.js
@@ -1,5 +1,5 @@
-require('./');
+require("./");
 
-exports.w = require('./defineWidget-legacy');
-exports.c = require('./defineComponent-legacy'); // Referenced by compiled templates
-exports.r = require('./renderer-legacy'); // Referenced by compiled templates
+exports.w = require("./defineWidget-legacy");
+exports.c = require("./defineComponent-legacy"); // Referenced by compiled templates
+exports.r = require("./renderer-legacy"); // Referenced by compiled templates
diff --git a/src/components/legacy/helpers.js b/src/components/legacy/helpers.js
index 16fb8680c..73ed2ac37 100644
--- a/src/components/legacy/helpers.js
+++ b/src/components/legacy/helpers.js
@@ -1,9 +1,13 @@
-require('./');
+require("./");
 
-exports.r = require('./renderer-legacy');
+exports.r = require("./renderer-legacy");
 
-exports.c = function() { /* no op for defining a component on teh server */ };
+exports.c = function() {
+    /* no op for defining a component on teh server */
+};
 
 // registerComponent is a no-op on the server.
 // Fixes https://github.com/marko-js/marko-components/issues/111
-exports.rc = function(typeName) { return typeName; };
+exports.rc = function(typeName) {
+    return typeName;
+};
diff --git a/src/components/legacy/index-browser.js b/src/components/legacy/index-browser.js
index 0257e850c..9547fd794 100644
--- a/src/components/legacy/index-browser.js
+++ b/src/components/legacy/index-browser.js
@@ -1,5 +1,5 @@
-var modernMarko = require('../');
-var Component = require('../Component');
+var modernMarko = require("../");
+var Component = require("../Component");
 
 // expose legacy
 window.$markoLegacy = exports;
@@ -8,13 +8,13 @@ exports.load = function(typeName) {
 };
 
 // legacy api
-exports.defineComponent = require('./defineComponent-legacy');
-exports.defineWidget = require('./defineWidget-legacy');
-exports.defineRenderer = require('./defineRenderer-legacy');
-exports.makeRenderable = exports.renderable = require('../../runtime/renderable');
+exports.defineComponent = require("./defineComponent-legacy");
+exports.defineWidget = require("./defineWidget-legacy");
+exports.defineRenderer = require("./defineRenderer-legacy");
+exports.makeRenderable = exports.renderable = require("../../runtime/renderable");
 
 // browser only
-var Widget = exports.Widget = Component;
+var Widget = (exports.Widget = Component);
 exports.onInitWidget = modernMarko.onInitComponent;
 exports.getWidgetForEl = modernMarko.getComponentForEl;
 exports.initWidgets = modernMarko.init;
@@ -33,7 +33,7 @@ if (Widget) {
     };
 }
 
-var RenderResult = require('../../runtime/RenderResult');
+var RenderResult = require("../../runtime/RenderResult");
 
 RenderResult.prototype.getWidget = RenderResult.prototype.getComponent;
 RenderResult.prototype.getWidgets = RenderResult.prototype.getComponents;
diff --git a/src/components/legacy/index.js b/src/components/legacy/index.js
index 0f6dbee33..7b8f9fe64 100644
--- a/src/components/legacy/index.js
+++ b/src/components/legacy/index.js
@@ -1,10 +1,10 @@
-var modernMarko = require('../');
+var modernMarko = require("../");
 
 // legacy api
-exports.defineComponent = require('./defineComponent-legacy');
-exports.defineWidget = require('./defineWidget-legacy');
-exports.defineRenderer = require('./defineRenderer-legacy');
-exports.makeRenderable = exports.renderable = require('../../runtime/renderable');
+exports.defineComponent = require("./defineComponent-legacy");
+exports.defineWidget = require("./defineWidget-legacy");
+exports.defineRenderer = require("./defineRenderer-legacy");
+exports.makeRenderable = exports.renderable = require("../../runtime/renderable");
 
 // server only
 exports.writeInitWidgetsCode = modernMarko.writeInitComponentsCode;
diff --git a/src/components/legacy/renderer-legacy.js b/src/components/legacy/renderer-legacy.js
index 76385b037..a13f3363d 100644
--- a/src/components/legacy/renderer-legacy.js
+++ b/src/components/legacy/renderer-legacy.js
@@ -1,15 +1,15 @@
-var getComponentsContext = require('../ComponentsContext').___getComponentsContext;
-var componentsUtil = require('../util');
+var getComponentsContext = require("../ComponentsContext")
+    .___getComponentsContext;
+var componentsUtil = require("../util");
 var componentLookup = componentsUtil.___componentLookup;
-var registry = require('../registry');
-var modernRenderer = require('../renderer');
+var registry = require("../registry");
+var modernRenderer = require("../renderer");
 var resolveComponentKey = modernRenderer.___resolveComponentKey;
 var handleBeginAsync = modernRenderer.___handleBeginAsync;
-var beginComponent = require('../beginComponent');
-var endComponent = require('../endComponent');
-var registry = require('../registry');
+var beginComponent = require("../beginComponent");
+var endComponent = require("../endComponent");
 
-var WIDGETS_BEGIN_ASYNC_ADDED_KEY = '$wa';
+var WIDGETS_BEGIN_ASYNC_ADDED_KEY = "$wa";
 
 function createRendererFunc(templateRenderFunc, componentProps) {
     var typeName = componentProps.___type;
@@ -21,7 +21,7 @@ function createRendererFunc(templateRenderFunc, componentProps) {
 
         if (!outGlobal[WIDGETS_BEGIN_ASYNC_ADDED_KEY]) {
             outGlobal[WIDGETS_BEGIN_ASYNC_ADDED_KEY] = true;
-            out.on('beginAsync', handleBeginAsync);
+            out.on("beginAsync", handleBeginAsync);
         }
 
         var getInitialProps;
@@ -72,7 +72,13 @@ function createRendererFunc(templateRenderFunc, componentProps) {
                 if (key != null) {
                     key = key.toString();
                 }
-                id = id || resolveComponentKey(globalComponentsContext, key, componentDefFromArgs);
+                id =
+                    id ||
+                    resolveComponentKey(
+                        globalComponentsContext,
+                        key,
+                        componentDefFromArgs
+                    );
             } else if (parentComponentDef) {
                 id = parentComponentDef.___nextComponentId();
             } else {
@@ -82,7 +88,15 @@ function createRendererFunc(templateRenderFunc, componentProps) {
 
         if (registry.___isServer && typeName) {
             if (renderingLogic) delete renderingLogic.onRender;
-            component = registry.___createComponent(renderingLogic || {}, id, input, out, typeName, customEvents, scope);
+            component = registry.___createComponent(
+                renderingLogic || {},
+                id,
+                input,
+                out,
+                typeName,
+                customEvents,
+                scope
+            );
         } else {
             if (!component) {
                 if (isRerender) {
@@ -154,7 +168,10 @@ function createRendererFunc(templateRenderFunc, componentProps) {
         }
 
         if (isExisting === true && !isHydrate && !componentBody) {
-            if (!component.___isDirty || !component.shouldUpdate(input, component.___state)) {
+            if (
+                !component.___isDirty ||
+                !component.shouldUpdate(input, component.___state)
+            ) {
                 if (customEvents) {
                     component.___setCustomEvents(customEvents, scope);
                 }
@@ -181,11 +198,16 @@ function createRendererFunc(templateRenderFunc, componentProps) {
             componentState = component.___rawState || componentState;
         }
 
-        var templateInput = getTemplateData ?
-            getTemplateData(componentState, input, out) :
-            componentState || input || {};
+        var templateInput = getTemplateData
+            ? getTemplateData(componentState, input, out)
+            : componentState || input || {};
 
-        var componentDef = beginComponent(componentsContext, component, isSplit, parentComponentDef);
+        var componentDef = beginComponent(
+            componentsContext,
+            component,
+            isSplit,
+            parentComponentDef
+        );
 
         // This is a hack, but we have to swap out the component instance stored with this node
         var vComponentNode = out.___parent;
@@ -193,31 +215,44 @@ function createRendererFunc(templateRenderFunc, componentProps) {
         componentDef.___component = isFakeComponent ? null : component;
         componentDef.___isExisting = isExisting;
         componentDef.___isLegacy = true;
-        componentDef.b = component.___legacyBody = componentBody || component.___legacyBody || '%FN';
+        componentDef.b = component.___legacyBody =
+            componentBody || component.___legacyBody || "%FN";
         componentDef.c = function(widgetConfig) {
             component.$c = widgetConfig;
         };
 
         componentDef.t = function(typeName) {
             if (typeName) {
-                vComponentNode.___component = this.___component = component = registry.___createComponent(typeName, component.id);
+                vComponentNode.___component = this.___component = component = registry.___createComponent(
+                    typeName,
+                    component.id
+                );
             }
         };
 
         if (component && isExisting) {
-            component.___emitLifecycleEvent('___legacyRender');
+            component.___emitLifecycleEvent("___legacyRender");
         }
 
         // Render the template associated with the component using the final template
         // data that we constructed
-        templateRenderFunc(templateInput, out, componentDef, componentDef, component);
+        templateRenderFunc(
+            templateInput,
+            out,
+            componentDef,
+            componentDef,
+            component
+        );
 
         if (customEvents && componentDef.___component) {
             if (registry.___isServer) {
                 componentDef.___customEvents = customEvents;
                 componentDef.___scope = scope;
             } else {
-                componentDef.___component.___setCustomEvents(customEvents, scope);
+                componentDef.___component.___setCustomEvents(
+                    customEvents,
+                    scope
+                );
             }
         }
 
diff --git a/src/components/package.json b/src/components/package.json
index 180abc321..0a71d1a12 100644
--- a/src/components/package.json
+++ b/src/components/package.json
@@ -5,7 +5,8 @@
         "./helpers.js": "./helpers-browser.js",
         "./index.js": "./index-browser.js",
         "./init-components.js": "./init-components-browser.js",
-        "./legacy/defineWidget-legacy.js": "./legacy/defineWidget-legacy-browser.js",
+        "./legacy/defineWidget-legacy.js":
+            "./legacy/defineWidget-legacy-browser.js",
         "./registry.js": "./registry-browser.js",
         "./util.js": "./util-browser.js"
     }
diff --git a/src/components/ready.js b/src/components/ready.js
index aeeb57c42..767f7eda7 100644
--- a/src/components/ready.js
+++ b/src/components/ready.js
@@ -24,8 +24,8 @@
 var isReady = false;
 var readyBound = false;
 
-var defaultWindow = typeof window != 'undefined' && window;
-var defaultDocument = typeof document != 'undefined' && document;
+var defaultWindow = typeof window != "undefined" && window;
+var defaultDocument = typeof document != "undefined" && document;
 
 var listeners = [];
 
@@ -60,7 +60,11 @@ function bindReady(doc) {
     // The ready event handler
     function domContentLoaded() {
         if (doc.addEventListener) {
-            doc.removeEventListener("DOMContentLoaded", domContentLoaded, false);
+            doc.removeEventListener(
+                "DOMContentLoaded",
+                domContentLoaded,
+                false
+            );
             doc.removeEventListener("load", domContentLoaded, false);
         } else {
             // we're here because readyState !== "loading" in oldIE
@@ -92,11 +96,16 @@ function bindReady(doc) {
     // Catch cases where $ is called after the
     // browser event has already occurred. IE <= 10 has a bug that results in 'interactive' being assigned
     // to the readyState before the DOM is really ready
-    if (document.attachEvent ? document.readyState === "complete" : document.readyState !== "loading") {
+    if (
+        document.attachEvent
+            ? document.readyState === "complete"
+            : document.readyState !== "loading"
+    ) {
         // We will get here if the browser is IE and the readyState === 'complete' or the browser
         // is not IE and the readyState === 'interactive' || 'complete'
         domReady(doc);
-    } else if (doc.addEventListener) { // Standards-based browsers support DOMContentLoaded
+    } else if (doc.addEventListener) {
+        // Standards-based browsers support DOMContentLoaded
         // Use the handy event callback
         doc.addEventListener("DOMContentLoaded", domContentLoaded, false);
         // A fallback to win.onload, that will always work
@@ -112,7 +121,9 @@ function bindReady(doc) {
         // continually check to see if the document is ready
         try {
             toplevel = win.frameElement == null;
-        } catch (e) {}
+        } catch (e) {
+            /* ignore error */
+        }
         if (doc.documentElement.doScroll && toplevel) {
             doScrollCheck();
         }
@@ -135,7 +146,7 @@ function ready(callback, thisObj, doc) {
 module.exports = ready;
 
 module.exports.patchComponent = function(proto) {
-    (proto || require('./Component').prototype).ready = function (callback) {
+    (proto || require("./Component").prototype).ready = function(callback) {
         var document = this.el.ownerDocument;
         ready(callback, this, document);
     };
diff --git a/src/components/registry-browser.js b/src/components/registry-browser.js
index fc066b30d..c9735081f 100644
--- a/src/components/registry-browser.js
+++ b/src/components/registry-browser.js
@@ -1,4 +1,4 @@
-var defineComponent = require('./defineComponent');
+var defineComponent = require("./defineComponent");
 
 var registered = {};
 var loaded = {};
@@ -23,12 +23,12 @@ function load(typeName, isLegacy) {
 
         if (target) {
             target = target();
-        } else if(isLegacy) {
+        } else if (isLegacy) {
             target = window.$markoLegacy.load(typeName);
         }
 
         if (!target) {
-            throw Error('Component not found: ' + typeName);
+            throw Error("Component not found: " + typeName);
         }
 
         loaded[typeName] = target;
@@ -49,7 +49,10 @@ function getComponentClass(typeName, isLegacy) {
     ComponentClass = ComponentClass.Component || ComponentClass;
 
     if (!ComponentClass.___isComponent) {
-        ComponentClass = defineComponent(ComponentClass, ComponentClass.renderer);
+        ComponentClass = defineComponent(
+            ComponentClass,
+            ComponentClass.renderer
+        );
     }
 
     // Make the component "type" accessible on each component instance
diff --git a/src/components/registry.js b/src/components/registry.js
index 1c34c3a29..0bcb8a4e1 100644
--- a/src/components/registry.js
+++ b/src/components/registry.js
@@ -1,27 +1,44 @@
-'use strict';
-const copyProps = require('raptor-util/copyProps');
+"use strict";
+const copyProps = require("raptor-util/copyProps");
 const SERVER_WIDGET_KEY = Symbol();
-const BaseServerComponent = require('./ServerComponent');
+const BaseServerComponent = require("./ServerComponent");
 
 function createServerComponentClass(renderingLogic) {
-    var renderingLogicProps = typeof renderingLogic === 'function' ?
-        renderingLogic.prototype :
-        renderingLogic;
+    var renderingLogicProps =
+        typeof renderingLogic === "function"
+            ? renderingLogic.prototype
+            : renderingLogic;
 
-    class ServerComponent extends BaseServerComponent {
-    }
+    class ServerComponent extends BaseServerComponent {}
 
     copyProps(renderingLogicProps, ServerComponent.prototype);
 
     return ServerComponent;
 }
-function createComponent(renderingLogic, id, input, out, typeName, customEvents, scope) {
+function createComponent(
+    renderingLogic,
+    id,
+    input,
+    out,
+    typeName,
+    customEvents,
+    scope
+) {
     var ServerComponent = renderingLogic[SERVER_WIDGET_KEY];
     if (!ServerComponent) {
-        ServerComponent = renderingLogic[SERVER_WIDGET_KEY] = createServerComponentClass(renderingLogic);
+        ServerComponent = renderingLogic[
+            SERVER_WIDGET_KEY
+        ] = createServerComponentClass(renderingLogic);
     }
 
-    var component = new ServerComponent(id, input, out, typeName, customEvents, scope);
+    var component = new ServerComponent(
+        id,
+        input,
+        out,
+        typeName,
+        customEvents,
+        scope
+    );
     return component;
 }
 
diff --git a/src/components/renderer.js b/src/components/renderer.js
index 79361a179..7b1aeb6e4 100644
--- a/src/components/renderer.js
+++ b/src/components/renderer.js
@@ -1,22 +1,22 @@
-var componentsUtil = require('./util');
+var componentsUtil = require("./util");
 var componentLookup = componentsUtil.___componentLookup;
 var emitLifecycleEvent = componentsUtil.___emitLifecycleEvent;
 
-var ComponentsContext = require('./ComponentsContext');
+var ComponentsContext = require("./ComponentsContext");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
-var registry = require('./registry');
-var copyProps = require('raptor-util/copyProps');
+var registry = require("./registry");
+var copyProps = require("raptor-util/copyProps");
 var isServer = componentsUtil.___isServer === true;
-var beginComponent = require('./beginComponent');
-var endComponent = require('./endComponent');
+var beginComponent = require("./beginComponent");
+var endComponent = require("./endComponent");
 
-var COMPONENT_BEGIN_ASYNC_ADDED_KEY = '$wa';
+var COMPONENT_BEGIN_ASYNC_ADDED_KEY = "$wa";
 
 function resolveComponentKey(globalComponentsContext, key, parentComponentDef) {
-    if (key[0] === '#') {
+    if (key[0] === "#") {
         return key.substring(1);
     } else {
-        return parentComponentDef.id + '-' + parentComponentDef.___nextKey(key);
+        return parentComponentDef.id + "-" + parentComponentDef.___nextKey(key);
     }
 }
 
@@ -27,16 +27,24 @@ function handleBeginAsync(event) {
 
     if (componentsContext !== undefined) {
         // We are going to start a nested ComponentsContext
-        asyncOut.___components = new ComponentsContext(asyncOut, componentsContext);
+        asyncOut.___components = new ComponentsContext(
+            asyncOut,
+            componentsContext
+        );
     }
     // Carry along the component arguments
     asyncOut.c(
         parentOut.___assignedComponentDef,
         parentOut.___assignedKey,
-        parentOut.___assignedCustomEvents);
+        parentOut.___assignedCustomEvents
+    );
 }
 
-function createRendererFunc(templateRenderFunc, componentProps, renderingLogic) {
+function createRendererFunc(
+    templateRenderFunc,
+    componentProps,
+    renderingLogic
+) {
     renderingLogic = renderingLogic || {};
     var onInput = renderingLogic.onInput;
     var typeName = componentProps.___type;
@@ -51,7 +59,7 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
         if (out.isSync() === false) {
             if (!outGlobal[COMPONENT_BEGIN_ASYNC_ADDED_KEY]) {
                 outGlobal[COMPONENT_BEGIN_ASYNC_ADDED_KEY] = true;
-                out.on('beginAsync', handleBeginAsync);
+                out.on("beginAsync", handleBeginAsync);
             }
         }
 
@@ -88,7 +96,11 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
                 var key = out.___assignedKey;
 
                 if (key != null) {
-                    id = resolveComponentKey(globalComponentsContext, key.toString(), componentDefFromArgs);
+                    id = resolveComponentKey(
+                        globalComponentsContext,
+                        key.toString(),
+                        componentDefFromArgs
+                    );
                 } else {
                     id = componentDefFromArgs.___nextComponentId();
                 }
@@ -109,7 +121,8 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
                 out,
                 typeName,
                 customEvents,
-                scope);
+                scope
+            );
 
             // This is the final input after running the lifecycle methods.
             // We will be passing the input to the template for the `input` param
@@ -118,7 +131,11 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
             component.___updatedInput = undefined; // We don't want ___updatedInput to be serialized to the browser
         } else {
             if (!component) {
-                if (isRerender && (component = componentLookup[id]) && component.___type !== typeName) {
+                if (
+                    isRerender &&
+                    (component = componentLookup[id]) &&
+                    component.___type !== typeName
+                ) {
                     // Destroy the existing component since
                     component.destroy();
                     component = undefined;
@@ -134,11 +151,15 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
                     if (shouldApplySplitMixins === true) {
                         shouldApplySplitMixins = false;
 
-                        var renderingLogicProps = typeof renderingLogic == 'function' ?
-                            renderingLogic.prototype :
-                            renderingLogic;
+                        var renderingLogicProps =
+                            typeof renderingLogic == "function"
+                                ? renderingLogic.prototype
+                                : renderingLogic;
 
-                        copyProps(renderingLogicProps, component.constructor.prototype);
+                        copyProps(
+                            renderingLogicProps,
+                            component.constructor.prototype
+                        );
                     }
                 }
 
@@ -152,18 +173,24 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
                 }
 
                 if (isExisting === false) {
-                    emitLifecycleEvent(component, 'create', input, out);
+                    emitLifecycleEvent(component, "create", input, out);
                 }
 
                 input = component.___setInput(input, onInput, out);
 
                 if (isExisting === true) {
-                    if (component.___isDirty === false || component.shouldUpdate(input, component.___state) === false) {
+                    if (
+                        component.___isDirty === false ||
+                        component.shouldUpdate(input, component.___state) ===
+                            false
+                    ) {
                         // We put a placeholder element in the output stream to ensure that the existing
                         // DOM node is matched up correctly when using morphdom. We flag the VElement
                         // node to track that it is a preserve marker
                         out.___preserveComponent(component);
-                        globalComponentsContext.___renderedComponentsById[id] = true;
+                        globalComponentsContext.___renderedComponentsById[
+                            id
+                        ] = true;
                         component.___reset(); // The component is no longer dirty so reset internal flags
                         return;
                     }
@@ -172,17 +199,28 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
 
             component.___global = outGlobal;
 
-            emitLifecycleEvent(component, 'render', out);
+            emitLifecycleEvent(component, "render", out);
         }
 
-        var componentDef =
-          beginComponent(componentsContext, component, isSplit, componentDefFromArgs, isImplicitComponent);
+        var componentDef = beginComponent(
+            componentsContext,
+            component,
+            isSplit,
+            componentDefFromArgs,
+            isImplicitComponent
+        );
 
         componentDef.___isExisting = isExisting;
 
         // Render the template associated with the component using the final template
         // data that we constructed
-        templateRenderFunc(input, out, componentDef, component, component.___rawState);
+        templateRenderFunc(
+            input,
+            out,
+            componentDef,
+            component,
+            component.___rawState
+        );
 
         endComponent(out, componentDef);
         componentsContext.___componentDef = parentComponentDef;
diff --git a/src/components/taglib/TransformHelper/ComponentArgsCompiler.js b/src/components/taglib/TransformHelper/ComponentArgsCompiler.js
index 92893f9fd..9c92b82d7 100644
--- a/src/components/taglib/TransformHelper/ComponentArgsCompiler.js
+++ b/src/components/taglib/TransformHelper/ComponentArgsCompiler.js
@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
 function finalizeArgs(args, builder) {
     var lastArgIndex = 0;
 
-    for (var i=0; i<args.length; i++) {
-
+    for (var i = 0; i < args.length; i++) {
         if (args[i] === undefined) {
             args[i] = builder.literalNull();
         } else {
@@ -18,7 +17,6 @@ function finalizeArgs(args, builder) {
 }
 
 class ComponentArgs {
-
     constructor() {
         this.key = null;
         this.customEvents = null;
@@ -35,7 +33,12 @@ class ComponentArgs {
             this.customEvents = [];
         }
 
-        this.customEvents.push([options.eventType, options.targetMethod, options.isOnce, options.extraArgs]);
+        this.customEvents.push([
+            options.eventType,
+            options.targetMethod,
+            options.isOnce,
+            options.extraArgs
+        ]);
     }
 
     compile(transformHelper) {
@@ -48,7 +51,7 @@ class ComponentArgs {
         var builder = transformHelper.builder;
 
         var args = new Array(4);
-        args[0] = builder.identifier('__component');
+        args[0] = builder.identifier("__component");
         args[1] = this.key;
 
         if (this.customEvents) {
@@ -57,21 +60,27 @@ class ComponentArgs {
 
         args = finalizeArgs(args, builder);
 
-        if (el.type === 'CustomTag') {
+        if (el.type === "CustomTag") {
             el.generateRenderTagCode = function(codegen, tagVar, tagArgs) {
                 tagArgs = tagArgs.concat(args);
                 return codegen.builder.functionCall(tagVar, tagArgs);
             };
         } else {
-            el.onBeforeGenerateCode((event) => {
-                let funcTarget = builder.memberExpression(builder.identifierOut(), builder.identifier('c'));
+            el.onBeforeGenerateCode(event => {
+                let funcTarget = builder.memberExpression(
+                    builder.identifierOut(),
+                    builder.identifier("c")
+                );
                 let funcArgs = [args];
 
                 event.insertCode(builder.functionCall(funcTarget, funcArgs));
             });
 
-            el.onAfterGenerateCode((event) => {
-                let funcTarget = builder.memberExpression(builder.identifierOut(), builder.identifier('c'));
+            el.onAfterGenerateCode(event => {
+                let funcTarget = builder.memberExpression(
+                    builder.identifierOut(),
+                    builder.identifier("c")
+                );
                 let funcArgs = [builder.literalNull()];
 
                 event.insertCode(builder.functionCall(funcTarget, funcArgs));
diff --git a/src/components/taglib/TransformHelper/assignComponentId.js b/src/components/taglib/TransformHelper/assignComponentId.js
index f10513c6e..7a61de874 100644
--- a/src/components/taglib/TransformHelper/assignComponentId.js
+++ b/src/components/taglib/TransformHelper/assignComponentId.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 module.exports = function assignComponentId(isRepeated) {
     // First check if we have already assigned an ID to thie element
@@ -19,7 +19,7 @@ module.exports = function assignComponentId(isRepeated) {
     let assignedKey;
     var nestedIdExpression;
     var idExpression;
-    
+
     // In order to attach a DOM event listener directly we need to make sure
     // the target HTML element has an ID that we can use to get a reference
     // to the element during initialization. We generate this unique ID
@@ -32,11 +32,11 @@ module.exports = function assignComponentId(isRepeated) {
     // 3) The HTML does not have an "id" or "ref" attribute. We must add
     //    an "id" attribute with a unique ID.
 
-    var isHtmlElement = el.type === 'HtmlElement';
-    var isCustomTag = el.type === 'CustomTag';
+    var isHtmlElement = el.type === "HtmlElement";
+    var isCustomTag = el.type === "CustomTag";
 
     // LEGACY -- Remove in Marko 5.0
-    if (!isCustomTag && el.tagName === 'invoke') {
+    if (!isCustomTag && el.tagName === "invoke") {
         isCustomTag = true;
     }
 
@@ -44,29 +44,37 @@ module.exports = function assignComponentId(isRepeated) {
         return;
     }
 
-    if (el.hasAttribute('w-id')) {
-        context.deprecate('The "w-id" attribute is deprecated. Please use "key" instead.');
+    if (el.hasAttribute("w-id")) {
+        context.deprecate(
+            'The "w-id" attribute is deprecated. Please use "key" instead.'
+        );
 
-        if (el.hasAttribute('key')) {
-            this.addError('The "w-id" attribute cannot be used in conjunction with the "key" attributes.');
+        if (el.hasAttribute("key")) {
+            this.addError(
+                'The "w-id" attribute cannot be used in conjunction with the "key" attributes.'
+            );
             return;
         }
 
-        if (el.hasAttribute('ref')) {
-            this.addError('The "w-id" attribute cannot be used in conjunction with the "ref" attributes.');
+        if (el.hasAttribute("ref")) {
+            this.addError(
+                'The "w-id" attribute cannot be used in conjunction with the "ref" attributes.'
+            );
             return;
         }
 
-        assignedKey = el.getAttributeValue('w-id');
+        assignedKey = el.getAttributeValue("w-id");
 
-        el.removeAttribute('w-id');
-    } else if (el.hasAttribute('key')) {
-        assignedKey = el.getAttributeValue('key');
-        el.removeAttribute('key');
-    } else if (el.hasAttribute('ref')) {
-        context.deprecate('The "ref" attribute is deprecated. Please use "key" instead.');
-        assignedKey = el.getAttributeValue('ref');
-        el.removeAttribute('ref');
+        el.removeAttribute("w-id");
+    } else if (el.hasAttribute("key")) {
+        assignedKey = el.getAttributeValue("key");
+        el.removeAttribute("key");
+    } else if (el.hasAttribute("ref")) {
+        context.deprecate(
+            'The "ref" attribute is deprecated. Please use "key" instead.'
+        );
+        assignedKey = el.getAttributeValue("ref");
+        el.removeAttribute("ref");
     }
 
     if (assignedKey) {
@@ -75,12 +83,21 @@ module.exports = function assignComponentId(isRepeated) {
         if (isCustomTag) {
             idExpression = this.buildComponentElIdFunctionCall(assignedKey);
             // The element is a custom tag
-            this.getComponentArgs().setKey(nestedIdExpression, true /* user assigned key */);
+            this.getComponentArgs().setKey(
+                nestedIdExpression,
+                true /* user assigned key */
+            );
         } else {
             idExpression = assignedKey;
             if (el.data.userAssignedKey !== false) {
-                if (context.data.hasLegacyForKey || context.data.hasImperativeComponentIds) {
-                    el.setAttributeValue('id', this.buildComponentElIdFunctionCall(assignedKey));
+                if (
+                    context.data.hasLegacyForKey ||
+                    context.data.hasImperativeComponentIds
+                ) {
+                    el.setAttributeValue(
+                        "id",
+                        this.buildComponentElIdFunctionCall(assignedKey)
+                    );
                 }
             }
 
@@ -91,7 +108,9 @@ module.exports = function assignComponentId(isRepeated) {
         // Case 3 - We need to add a unique auto key
         let uniqueKey = this.nextUniqueId();
 
-        nestedIdExpression = isRepeated ? builder.literal(uniqueKey + '[]') : builder.literal(uniqueKey.toString());
+        nestedIdExpression = isRepeated
+            ? builder.literal(uniqueKey + "[]")
+            : builder.literal(uniqueKey.toString());
 
         idExpression = builder.literal(uniqueKey.toString());
 
@@ -114,7 +133,7 @@ module.exports = function assignComponentId(isRepeated) {
             }
 
             let uniqueElId = transformHelper.nextUniqueId();
-            let idVarName = '__key' + uniqueElId;
+            let idVarName = "__key" + uniqueElId;
             let idVar = builder.identifier(idVarName);
 
             this.idVarNode = builder.vars([
@@ -122,17 +141,20 @@ module.exports = function assignComponentId(isRepeated) {
                     id: idVarName,
                     init: builder.functionCall(
                         builder.memberExpression(
-                            builder.identifier('__component'),
-                            builder.identifier('___nextKey')),
-                        [ idExpression ])
+                            builder.identifier("__component"),
+                            builder.identifier("___nextKey")
+                        ),
+                        [idExpression]
+                    )
                 }
             ]);
 
             this.idExpression = idExpression = idVar;
 
             this.nestedIdExpression = nestedIdExpression = builder.concat(
-                builder.literal('#'),
-                idVar);
+                builder.literal("#"),
+                idVar
+            );
 
             if (isCustomTag) {
                 transformHelper.getComponentArgs().setKey(nestedIdExpression);
diff --git a/src/components/taglib/TransformHelper/convertToComponent.js b/src/components/taglib/TransformHelper/convertToComponent.js
index 8ee1aa8fb..1888779db 100644
--- a/src/components/taglib/TransformHelper/convertToComponent.js
+++ b/src/components/taglib/TransformHelper/convertToComponent.js
@@ -1,5 +1,5 @@
-'use strict';
-const generateRegisterComponentCode = require('../util/generateRegisterComponentCode');
+"use strict";
+const generateRegisterComponentCode = require("../util/generateRegisterComponentCode");
 
 // var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 var FLAG_HAS_BODY_EL = 2;
@@ -8,14 +8,15 @@ var FLAG_HAS_HEAD_EL = 4;
 module.exports = function handleComponentBind(options) {
     let context = this.context;
     let builder = this.builder;
-    
+
     if (this.context.firstBind) {
         return;
     }
 
     context.firstBind = true;
 
-    let isLegacyComponent = this.isLegacyComponent = options.isLegacyComponent === true;
+    let isLegacyComponent = (this.isLegacyComponent =
+        options.isLegacyComponent === true);
     let componentModule = options.componentModule;
     let rendererModule = options.rendererModule;
     let componentProps = options.componentProps || {};
@@ -25,8 +26,10 @@ module.exports = function handleComponentBind(options) {
 
     var isSplit = false;
 
-    if ((rendererModule && rendererModule !== componentModule) ||
-        (!rendererModule && componentModule)) {
+    if (
+        (rendererModule && rendererModule !== componentModule) ||
+        (!rendererModule && componentModule)
+    ) {
         componentProps.___split = isSplit = true;
     }
 
@@ -35,37 +38,49 @@ module.exports = function handleComponentBind(options) {
     }
 
     if (componentModule) {
+        let componentType = generateRegisterComponentCode(
+            componentModule,
+            this,
+            isSplit
+        );
 
-        let componentType = generateRegisterComponentCode(componentModule, this, isSplit);
-
-        let componentTypeNode = context.addStaticVar('marko_componentType', componentType.node);
+        let componentTypeNode = context.addStaticVar(
+            "marko_componentType",
+            componentType.node
+        );
 
         componentProps.___type = componentTypeNode;
 
-        context.setMeta('id', componentType.id);
+        context.setMeta("id", componentType.id);
 
-        let dependencyModule = isLegacyComponent || isSplit ? componentModule : this.getTemplateModule();
+        let dependencyModule =
+            isLegacyComponent || isSplit
+                ? componentModule
+                : this.getTemplateModule();
 
         if (!isImplicitComponent) {
             if (dependencyModule.requirePath) {
-                context.setMeta('component', dependencyModule.requirePath);
+                context.setMeta("component", dependencyModule.requirePath);
             }
         }
 
         if (isSplit) {
-            context.addDependency(context.markoModulePrefix + 'components');
+            context.addDependency(context.markoModulePrefix + "components");
         }
     }
 
     if (isLegacyInnerBind) {
         let el = rootNodes[0];
-        el.setAttributeValue('id',
+        el.setAttributeValue(
+            "id",
             builder.memberExpression(
-                builder.identifier('__component'),
-                builder.identifier('id')));
+                builder.identifier("__component"),
+                builder.identifier("id")
+            )
+        );
 
         // TODO Deprecation warning for inner binds
-        let componentNode = context.createNodeForEl('_component', {
+        let componentNode = context.createNodeForEl("_component", {
             props: builder.literal(componentProps)
         });
         el.wrapWith(componentNode);
@@ -74,13 +89,11 @@ module.exports = function handleComponentBind(options) {
 
     var flags = 0;
 
-
-
-    rootNodes.forEach((rootNode) => {
-        if (rootNode.type === 'HtmlElement') {
-            if (rootNode.tagName === 'body') {
+    rootNodes.forEach(rootNode => {
+        if (rootNode.type === "HtmlElement") {
+            if (rootNode.tagName === "body") {
                 flags |= FLAG_HAS_BODY_EL;
-            } else if (rootNode.tagName === 'head') {
+            } else if (rootNode.tagName === "head") {
                 flags |= FLAG_HAS_HEAD_EL;
             }
         }
@@ -90,10 +103,13 @@ module.exports = function handleComponentBind(options) {
         context.root.appendChild(
             builder.assignment(
                 builder.memberExpression(
-                    builder.identifier('__component'),
-                    builder.identifier('___flags')),
+                    builder.identifier("__component"),
+                    builder.identifier("___flags")
+                ),
                 builder.literal(flags),
-                '|='));
+                "|="
+            )
+        );
     }
 
     let markoComponentVar;
@@ -102,7 +118,10 @@ module.exports = function handleComponentBind(options) {
         if (rendererModule.inlineId) {
             markoComponentVar = rendererModule.inlineId;
         } else if (!isImplicitComponent) {
-            markoComponentVar = context.addStaticVar('marko_component', builder.require(builder.literal(rendererModule.requirePath)));
+            markoComponentVar = context.addStaticVar(
+                "marko_component",
+                builder.require(builder.literal(rendererModule.requirePath))
+            );
         }
     }
 
@@ -111,28 +130,34 @@ module.exports = function handleComponentBind(options) {
     this.context.isSplitComponent = isSplit;
     this.context.isStatefulComponent = !isSplit && !isImplicitComponent;
 
-    var rendererHelper = isLegacyComponent ?
-        this.context.helper('rendererLegacy') :
-        this.context.helper('renderer');
+    var rendererHelper = isLegacyComponent
+        ? this.context.helper("rendererLegacy")
+        : this.context.helper("renderer");
 
     var defineComponentHelper;
 
     if (!isSplit && !isLegacyComponent) {
-        defineComponentHelper = this.context.helper('defineComponent');
+        defineComponentHelper = this.context.helper("defineComponent");
     }
 
-    this.context.on('beforeGenerateCode:TemplateRoot', function(eventArgs) {
-        eventArgs.node.addRenderFunctionParam(builder.identifier('__component'));
+    this.context.on("beforeGenerateCode:TemplateRoot", function(eventArgs) {
+        eventArgs.node.addRenderFunctionParam(
+            builder.identifier("__component")
+        );
 
         if (isLegacyComponent) {
-            eventArgs.node.addRenderFunctionParam(builder.identifier('widget'));
-            eventArgs.node.addRenderFunctionParam(builder.identifier('component'));
+            eventArgs.node.addRenderFunctionParam(builder.identifier("widget"));
+            eventArgs.node.addRenderFunctionParam(
+                builder.identifier("component")
+            );
         } else {
-            eventArgs.node.addRenderFunctionParam(builder.identifier('component'));
-            eventArgs.node.addRenderFunctionParam(builder.identifier('state'));
+            eventArgs.node.addRenderFunctionParam(
+                builder.identifier("component")
+            );
+            eventArgs.node.addRenderFunctionParam(builder.identifier("state"));
         }
 
-        eventArgs.node.generateAssignRenderCode = (eventArgs) => {
+        eventArgs.node.generateAssignRenderCode = eventArgs => {
             const nodes = [];
             const templateVar = eventArgs.templateVar;
             const templateRendererMember = eventArgs.templateRendererMember;
@@ -147,21 +172,26 @@ module.exports = function handleComponentBind(options) {
                 createRendererArgs.push(markoComponentVar);
             }
 
-            nodes.push(builder.assignment(
-                templateRendererMember,
-                builder.functionCall(
-                    rendererHelper,
-                    createRendererArgs)));
+            nodes.push(
+                builder.assignment(
+                    templateRendererMember,
+                    builder.functionCall(rendererHelper, createRendererArgs)
+                )
+            );
 
             if (!isSplit && !isLegacyComponent) {
-                nodes.push(builder.assignment(
-                    builder.memberExpression(templateVar, builder.identifier('Component')),
-                    builder.functionCall(
-                        defineComponentHelper,
-                        [
+                nodes.push(
+                    builder.assignment(
+                        builder.memberExpression(
+                            templateVar,
+                            builder.identifier("Component")
+                        ),
+                        builder.functionCall(defineComponentHelper, [
                             markoComponentVar || builder.literal({}),
                             templateRendererMember
-                        ])));
+                        ])
+                    )
+                );
             }
 
             return nodes;
diff --git a/src/components/taglib/TransformHelper/getComponentFiles.js b/src/components/taglib/TransformHelper/getComponentFiles.js
index e734f1ff2..826c879c4 100644
--- a/src/components/taglib/TransformHelper/getComponentFiles.js
+++ b/src/components/taglib/TransformHelper/getComponentFiles.js
@@ -1,23 +1,30 @@
-'use strict';
+"use strict";
 
-const fs = require('fs');
-const path = require('path');
+const fs = require("fs");
+const path = require("path");
 
 function getComponentFiles(filename) {
     let ext = path.extname(filename);
-    if (ext === '.js') {
+    if (ext === ".js") {
         return null;
     }
 
     let nameNoExt = path.basename(filename, ext);
 
-    let isEntry = 'index' === nameNoExt;
+    let isEntry = "index" === nameNoExt;
 
-    let fileMatch = '('+nameNoExt.replace(/\./g, '\\.') + '\\.' + (isEntry ? '|' : '') + ')';
-    let styleMatch = new RegExp('^'+fileMatch+'style\\.\\w+$');
-    let componentMatch = new RegExp('^'+fileMatch+'component\\.\\w+$');
-    let splitComponentMatch = new RegExp('^'+fileMatch+'component-browser\\.\\w+$');
-    let packageMatch = new RegExp('^'+fileMatch+'browser\\.\\json$');
+    let fileMatch =
+        "(" +
+        nameNoExt.replace(/\./g, "\\.") +
+        "\\." +
+        (isEntry ? "|" : "") +
+        ")";
+    let styleMatch = new RegExp("^" + fileMatch + "style\\.\\w+$");
+    let componentMatch = new RegExp("^" + fileMatch + "component\\.\\w+$");
+    let splitComponentMatch = new RegExp(
+        "^" + fileMatch + "component-browser\\.\\w+$"
+    );
+    let packageMatch = new RegExp("^" + fileMatch + "browser\\.\\json$");
 
     let dirname = path.dirname(filename);
 
@@ -31,7 +38,7 @@ function getComponentFiles(filename) {
     let dirFiles = fs.readdirSync(dirname);
     dirFiles.sort();
 
-    for (let i=dirFiles.length - 1; i>=0; i--) {
+    for (let i = dirFiles.length - 1; i >= 0; i--) {
         let file = dirFiles[i];
 
         if (styleMatch.test(file)) {
diff --git a/src/components/taglib/TransformHelper/handleComponentEvents.js b/src/components/taglib/TransformHelper/handleComponentEvents.js
index ac0f5413d..5b4de0f34 100644
--- a/src/components/taglib/TransformHelper/handleComponentEvents.js
+++ b/src/components/taglib/TransformHelper/handleComponentEvents.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var ATTACH_DETACH_KEY = Symbol('attach-detach');
+var ATTACH_DETACH_KEY = Symbol("attach-detach");
 
 var bubbleEventsLookup = {};
 
-require('../../bubble').forEach(function(eventType) {
+require("../../bubble").forEach(function(eventType) {
     bubbleEventsLookup[eventType] = true;
 });
 
@@ -20,19 +20,22 @@ function addBubblingEventListener(transformHelper, options) {
     var el = transformHelper.el;
 
     if (transformHelper.hasBoundComponentForTemplate() === false) {
-        transformHelper.addError('Unable to handle event ' + options.eventType + '. HTML element is not nested within a component.');
+        transformHelper.addError(
+            "Unable to handle event " +
+                options.eventType +
+                ". HTML element is not nested within a component."
+        );
         return;
     }
 
     var builder = transformHelper.builder;
 
     var addBubblingEventMethod = builder.memberExpression(
-        builder.identifier('__component'),
-        builder.identifier('d'));
+        builder.identifier("__component"),
+        builder.identifier("d")
+    );
 
-    var addBubblingEventArgs = [
-            options.targetMethod
-        ];
+    var addBubblingEventArgs = [options.targetMethod];
 
     addBubblingEventArgs.push(options.isOnce);
 
@@ -40,14 +43,26 @@ function addBubblingEventListener(transformHelper, options) {
         addBubblingEventArgs.push(builder.arrayExpression(options.extraArgs));
     }
 
-    var propValue = builder.functionCall(addBubblingEventMethod, addBubblingEventArgs);
-    var propName = 'on' + options.eventType.value;
+    var propValue = builder.functionCall(
+        addBubblingEventMethod,
+        addBubblingEventArgs
+    );
+    var propName = "on" + options.eventType.value;
     el.setPropertyValue(propName, propValue, false);
 
-    if (options.eventType.value === 'attach' || options.eventType.value === 'detach') {
-        if (!transformHelper.context.data[ATTACH_DETACH_KEY] && transformHelper.context.outputType === 'vdom') {
+    if (
+        options.eventType.value === "attach" ||
+        options.eventType.value === "detach"
+    ) {
+        if (
+            !transformHelper.context.data[ATTACH_DETACH_KEY] &&
+            transformHelper.context.outputType === "vdom"
+        ) {
             transformHelper.context.data[ATTACH_DETACH_KEY] = true;
-            transformHelper.context.importModule(null, 'marko/components/attach-detach');
+            transformHelper.context.importModule(
+                null,
+                "marko/components/attach-detach"
+            );
         }
     }
 }
@@ -57,11 +72,16 @@ function addDirectEventListener(transformHelper, options) {
     var el = transformHelper.el;
 
     var addDomEvent = builder.memberExpression(
-        builder.identifier('__component'),
-        builder.identifier('e'));
+        builder.identifier("__component"),
+        builder.identifier("e")
+    );
 
-    let componentIdInfo = transformHelper.assignComponentId(true /* repeated */);
-    let idVarNode = componentIdInfo.idVarNode ? null : componentIdInfo.createIdVarNode();
+    let componentIdInfo = transformHelper.assignComponentId(
+        true /* repeated */
+    );
+    let idVarNode = componentIdInfo.idVarNode
+        ? null
+        : componentIdInfo.createIdVarNode();
 
     var helperArgs = [
         options.eventType,
@@ -76,11 +96,8 @@ function addDirectEventListener(transformHelper, options) {
 
     var addDomEventFunctionCall = builder.functionCall(addDomEvent, helperArgs);
 
-    el.onBeforeGenerateCode((event) => {
-        event.insertCode([
-            idVarNode,
-            addDomEventFunctionCall
-        ]);
+    el.onBeforeGenerateCode(event => {
+        event.insertCode([idVarNode, addDomEventFunctionCall]);
     });
 
     transformHelper.serializeKey();
@@ -103,17 +120,17 @@ module.exports = function handleComponentEvents() {
     var el = this.el;
     var builder = this.builder;
     var context = this.context;
-    var isCustomTag = el.type !== 'HtmlElement';
+    var isCustomTag = el.type !== "HtmlElement";
     // We configured the Marko compiler to attach a flag to nodes that
     // have one or more attributes that match the "w-on*" pattern.
     // We still need to loop over the properties to find and handle
     // the properties corresponding to those attributes.
-    var hasComponentEvents = this.el.isFlagSet('hasComponentEvents') === true;
+    var hasComponentEvents = this.el.isFlagSet("hasComponentEvents") === true;
 
     if (hasComponentEvents) {
         var attrs = el.getAttributes().concat([]);
 
-        attrs.forEach((attr) => {
+        attrs.forEach(attr => {
             var eventType;
             var targetMethod;
             var attrName = attr.name;
@@ -127,8 +144,8 @@ module.exports = function handleComponentEvents() {
             }
 
             // handles on-* and once-*
-            if (attrName.startsWith('on') && argument) {
-                isOnce = attrName.startsWith('once');
+            if (attrName.startsWith("on") && argument) {
+                isOnce = attrName.startsWith("once");
 
                 if (isOnce) {
                     eventType = attrName.substring(4); // Chop off "once"
@@ -138,19 +155,27 @@ module.exports = function handleComponentEvents() {
                 try {
                     parsedArgs = builder.parseJavaScriptArgs(argument);
                 } catch (err) {
-                    this.addError('Invalid Javascript Expression for "' + attrName + '": ' + err);
+                    this.addError(
+                        'Invalid Javascript Expression for "' +
+                            attrName +
+                            '": ' +
+                            err
+                    );
                     return;
                 }
 
-                targetMethod = builder.replacePlaceholderEscapeFuncs(parsedArgs[0], context);
-
-
+                targetMethod = builder.replacePlaceholderEscapeFuncs(
+                    parsedArgs[0],
+                    context
+                );
 
                 if (parsedArgs.length > 1) {
                     extraArgs = parsedArgs.slice(1);
                 }
-            } else if (attrName.startsWith('w-on')) {
-                context.deprecate('"w-on*" attributes are deprecated. Please use "on*()" instead.');
+            } else if (attrName.startsWith("w-on")) {
+                context.deprecate(
+                    '"w-on*" attributes are deprecated. Please use "on*()" instead.'
+                );
                 eventType = attrName.substring(4); // Chop off "w-on"
                 targetMethod = attr.value;
             }
@@ -166,26 +191,30 @@ module.exports = function handleComponentEvents() {
                 this.assignComponentId(true /* repeated */);
 
                 // We are adding an event listener for a custom event (not a DOM event)
-                if (eventType.startsWith('-')) {
+                if (eventType.startsWith("-")) {
                     // Remove the leading dash.
                     // Example: w-on-before-show → before-show
                     eventType = eventType.substring(1);
                 } else if (isUpperCase(eventType.charAt(0))) {
                     // Convert first character to lower case:
                     // Example: w-onBeforeShow → beforeShow
-                    eventType = eventType.charAt(0).toLowerCase() + eventType.substring(1);
+                    eventType =
+                        eventType.charAt(0).toLowerCase() +
+                        eventType.substring(1);
                 }
 
                 eventType = builder.literal(eventType);
 
                 // Node is for a custom tag
-                addCustomEventListener(this, { eventType,
-                                               targetMethod,
-                                               extraArgs,
-                                               isOnce });
+                addCustomEventListener(this, {
+                    eventType,
+                    targetMethod,
+                    extraArgs,
+                    isOnce
+                });
             } else {
                 // We are adding an event listener for a DOM event (not a custom event)
-                if (eventType.startsWith('-')) {
+                if (eventType.startsWith("-")) {
                     // Remove the leading dash. Preserve casing.
                     // Example: on-before-show → before-show
                     // Example: on-CAPS-event → CAPS-event
@@ -208,20 +237,23 @@ module.exports = function handleComponentEvents() {
                     // a "data-w-on{eventType}" attribute to the output HTML
                     // for this element that will be used to map the event
                     // to a method on the containing component.
-                    addBubblingEventListener(this, { eventType,
-                                                     targetMethod,
-                                                     extraArgs,
-                                                     isOnce });
+                    addBubblingEventListener(this, {
+                        eventType,
+                        targetMethod,
+                        extraArgs,
+                        isOnce
+                    });
                 } else {
                     // The event does not bubble so we must attach a DOM
                     // event listener directly to the target element.
-                    addDirectEventListener(this, { eventType,
-                                                   targetMethod,
-                                                   extraArgs,
-                                                   isOnce });
+                    addDirectEventListener(this, {
+                        eventType,
+                        targetMethod,
+                        extraArgs,
+                        isOnce
+                    });
                 }
             }
         });
-
     }
 };
diff --git a/src/components/taglib/TransformHelper/handleComponentPreserve.js b/src/components/taglib/TransformHelper/handleComponentPreserve.js
index 6ef5f32d4..e6d90bf76 100644
--- a/src/components/taglib/TransformHelper/handleComponentPreserve.js
+++ b/src/components/taglib/TransformHelper/handleComponentPreserve.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 function addPreserve(transformHelper, bodyOnly, condition) {
     let el = transformHelper.el;
@@ -8,24 +8,25 @@ function addPreserve(transformHelper, bodyOnly, condition) {
     let preserveAttrs = {};
 
     if (bodyOnly) {
-        preserveAttrs['body-only'] = builder.literal(bodyOnly);
+        preserveAttrs["body-only"] = builder.literal(bodyOnly);
     }
 
     if (condition) {
-        preserveAttrs['if'] = condition;
+        preserveAttrs["if"] = condition;
     }
 
     let componentIdInfo = transformHelper.assignComponentId();
-    let idVarNode = componentIdInfo.idVarNode ? null : componentIdInfo.createIdVarNode();
+    let idVarNode = componentIdInfo.idVarNode
+        ? null
+        : componentIdInfo.createIdVarNode();
 
-    if (el.type === 'HtmlElement') {
+    if (el.type === "HtmlElement") {
         preserveAttrs.key = transformHelper.getIdExpression();
     } else {
         preserveAttrs.cid = transformHelper.getIdExpression();
     }
 
-
-    let preserveNode = context.createNodeForEl('_preserve', preserveAttrs);
+    let preserveNode = context.createNodeForEl("_preserve", preserveAttrs);
     let idVarNodeTarget;
 
     if (bodyOnly) {
@@ -38,7 +39,7 @@ function addPreserve(transformHelper, bodyOnly, condition) {
     }
 
     if (idVarNode) {
-        idVarNodeTarget.onBeforeGenerateCode((event) => {
+        idVarNodeTarget.onBeforeGenerateCode(event => {
             event.insertCode(idVarNode);
         });
     }
@@ -46,17 +47,19 @@ function addPreserve(transformHelper, bodyOnly, condition) {
     return preserveNode;
 }
 
-function deprecatedWarning(preserveType, transformHelper, el) {
+function deprecatedWarning(preserveType, transformHelper) {
     let attribute = preserveType.attribute;
     let suffix = preserveType.suffix;
     let context = transformHelper.getCompileContext();
 
-    let newAttributeName = 'no-update';
+    let newAttributeName = "no-update";
     if (suffix) {
         newAttributeName += suffix;
     }
 
-    context.deprecate(`The '${attribute}' attribute is deprecated. Please use '${newAttributeName}' instead.`);
+    context.deprecate(
+        `The '${attribute}' attribute is deprecated. Please use '${newAttributeName}' instead.`
+    );
 }
 
 function preserveHandler(transformHelper, preserveType, el) {
@@ -78,11 +81,17 @@ function preserveIfHandler(transformHelper, preserveType, el) {
     let preserveIfCondition = preserveIfAttr.argument;
 
     if (!preserveIfCondition) {
-        transformHelper.addError(`The '${attribute}' attribute should have an argument. For example: <div ${attribute}(someCondition)>`);
+        transformHelper.addError(
+            `The '${attribute}' attribute should have an argument. For example: <div ${attribute}(someCondition)>`
+        );
         return;
     }
 
-    addPreserve(transformHelper, false, transformHelper.builder.expression(preserveIfCondition));
+    addPreserve(
+        transformHelper,
+        false,
+        transformHelper.builder.expression(preserveIfCondition)
+    );
     el.removeAttribute(attribute);
 }
 
@@ -105,54 +114,59 @@ function preserveBodyIfHandler(transformHelper, preserveType, el) {
     let preserveBodyIfCondition = preserveBodyIfAttr.argument;
 
     if (!preserveBodyIfCondition) {
-        transformHelper.addError(`The '${attribute}' attribute should have an argument. For example: <div ${attribute}(someCondition)>`);
+        transformHelper.addError(
+            `The '${attribute}' attribute should have an argument. For example: <div ${attribute}(someCondition)>`
+        );
         return;
     }
 
-    addPreserve(transformHelper, true, transformHelper.builder.expression(preserveBodyIfCondition));
-
+    addPreserve(
+        transformHelper,
+        true,
+        transformHelper.builder.expression(preserveBodyIfCondition)
+    );
 }
 
 const preserveTypes = [
     // The new preserve types
     {
-        attribute: 'no-update',
+        attribute: "no-update",
         handler: preserveHandler
     },
     {
-        attribute: 'no-update-if',
+        attribute: "no-update-if",
         handler: preserveIfHandler
     },
     {
-        attribute: 'no-update-body',
+        attribute: "no-update-body",
         handler: preserveBodyHandler
     },
     {
-        attribute: 'no-update-body-if',
+        attribute: "no-update-body-if",
         handler: preserveBodyIfHandler
     },
 
     // The deprecated preserve types
     {
-        attribute: 'w-preserve',
+        attribute: "w-preserve",
         handler: preserveHandler,
         deprecated: true
     },
     {
-        attribute: 'w-preserve-if',
-        suffix: '-if',
+        attribute: "w-preserve-if",
+        suffix: "-if",
         handler: preserveIfHandler,
         deprecated: true
     },
     {
-        attribute: 'w-preserve-body',
-        suffix: '-body',
+        attribute: "w-preserve-body",
+        suffix: "-body",
         handler: preserveBodyHandler,
         deprecated: true
     },
     {
-        attribute: 'w-preserve-body-if',
-        suffix: '-body-if',
+        attribute: "w-preserve-body-if",
+        suffix: "-body-if",
         handler: preserveBodyIfHandler,
         deprecated: true
     }
diff --git a/src/components/taglib/TransformHelper/handleComponentPreserveAttrs.js b/src/components/taglib/TransformHelper/handleComponentPreserveAttrs.js
index 152532c15..a820a1c3e 100644
--- a/src/components/taglib/TransformHelper/handleComponentPreserveAttrs.js
+++ b/src/components/taglib/TransformHelper/handleComponentPreserveAttrs.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-const NO_UPDATE_ATTR_SUFFIX = ':no-update';
+const NO_UPDATE_ATTR_SUFFIX = ":no-update";
 
-var PRESERVE_ATTRS_HELPER_ADDED = Symbol('PRESERVE_ATTRS_HELPER_ADDED');
+var PRESERVE_ATTRS_HELPER_ADDED = Symbol("PRESERVE_ATTRS_HELPER_ADDED");
 
 module.exports = function handleComponentPreserveAttrs() {
     var el = this.el;
@@ -25,22 +25,29 @@ module.exports = function handleComponentPreserveAttrs() {
             el.removeAttribute(attrName);
 
             noUpdateAttrs.push(realAttr);
-        } else if (attrName === 'w-preserve-attrs') {
-            context.deprecate(`The 'w-preserve-attrs' attribute is deprecated. Please use the ':no-update' attribute instead.`);
+        } else if (attrName === "w-preserve-attrs") {
+            context.deprecate(
+                `The 'w-preserve-attrs' attribute is deprecated. Please use the ':no-update' attribute instead.`
+            );
 
-            var preserveAttrsExpression = el.getAttributeValue('w-preserve-attrs');
+            var preserveAttrsExpression = el.getAttributeValue(
+                "w-preserve-attrs"
+            );
 
-            noUpdateAttrs.push.apply(noUpdateAttrs, preserveAttrsExpression.value.split(','));
-            el.removeAttribute('w-preserve-attrs');
+            noUpdateAttrs.push.apply(
+                noUpdateAttrs,
+                preserveAttrsExpression.value.split(",")
+            );
+            el.removeAttribute("w-preserve-attrs");
         }
     });
 
     if (noUpdateAttrs.length) {
-        el.setPropertyValue('noupdate', builder.literal(noUpdateAttrs));
+        el.setPropertyValue("noupdate", builder.literal(noUpdateAttrs));
 
         if (!context.isFlagSet(PRESERVE_ATTRS_HELPER_ADDED)) {
             context.setFlag(PRESERVE_ATTRS_HELPER_ADDED);
-            context.importModule(null, 'marko/runtime/vdom/preserve-attrs');
+            context.importModule(null, "marko/runtime/vdom/preserve-attrs");
         }
     }
 };
diff --git a/src/components/taglib/TransformHelper/handleLegacyBind.js b/src/components/taglib/TransformHelper/handleLegacyBind.js
index ef3e22bb5..2a65be290 100644
--- a/src/components/taglib/TransformHelper/handleLegacyBind.js
+++ b/src/components/taglib/TransformHelper/handleLegacyBind.js
@@ -1,26 +1,26 @@
-'use strict';
-const resolveFrom = require('resolve-from');
+"use strict";
+const resolveFrom = require("resolve-from");
 
 function legacyGetDefaultComponentModule(dirname) {
     var filename;
     var legacy = true;
 
-    if ((filename = resolveFrom(dirname, './widget'))) {
+    if ((filename = resolveFrom(dirname, "./widget"))) {
         return {
             filename,
-            requirePath: './widget',
+            requirePath: "./widget",
             legacy
         };
-    } else if ((filename = resolveFrom(dirname, './component'))) {
+    } else if ((filename = resolveFrom(dirname, "./component"))) {
         return {
             filename,
-            requirePath: './component',
+            requirePath: "./component",
             legacy
         };
-    } else if ((filename = resolveFrom(dirname, './'))) {
+    } else if ((filename = resolveFrom(dirname, "./"))) {
         return {
             filename,
-            requirePath: './',
+            requirePath: "./",
             legacy
         };
     } else {
@@ -31,17 +31,11 @@ function legacyGetDefaultComponentModule(dirname) {
 function checkIsInnerBind(el) {
     var curNode = el;
 
-    while (true) {
+    do {
         if (curNode.data.hasBoundComponent) {
             return true;
         }
-
-        curNode = curNode.parentNode;
-
-        if (!curNode) {
-            break;
-        }
-    }
+    } while ((curNode = curNode.parentNode));
 
     return false;
 }
@@ -54,71 +48,92 @@ module.exports = function handleLegacyBind() {
     let componentModule;
     let rendererModule;
 
-    let isLegacyComponent = false;
+    if (el.hasAttribute("w-bind")) {
+        let bindAttr = el.getAttribute("w-bind");
 
-    if (el.hasAttribute('w-bind')) {
-        let bindAttr = el.getAttribute('w-bind');
-
-        context.deprecate('Legacy components using w-bind and defineRenderer/defineComponent or defineComponent are deprecated. See: https://github.com/marko-js/marko/issues/421');
-        this.isLegacyComponent = isLegacyComponent = true;
-        context.setMeta('legacy', true);
+        context.deprecate(
+            "Legacy components using w-bind and defineRenderer/defineComponent or defineComponent are deprecated. See: https://github.com/marko-js/marko/issues/421"
+        );
+        this.isLegacyComponent = true;
+        context.setMeta("legacy", true);
 
         // Remove the w-bind attribute since we don't want it showing up in the output DOM
-        el.removeAttribute('w-bind');
+        el.removeAttribute("w-bind");
 
         // Read the value for the w-bind attribute. This will be an AST node for the parsed JavaScript
         let bindAttrValue = bindAttr.value;
 
-        const hasWidgetTypes = context.isFlagSet('hasWidgetTypes');
+        const hasWidgetTypes = context.isFlagSet("hasWidgetTypes");
 
         if (hasWidgetTypes) {
-            context.deprecate('The <widget-types> tag is deprecated. Please remove it. See: https://github.com/marko-js/marko/issues/514');
+            context.deprecate(
+                "The <widget-types> tag is deprecated. Please remove it. See: https://github.com/marko-js/marko/issues/514"
+            );
         }
 
         if (bindAttrValue == null) {
             componentModule = legacyGetDefaultComponentModule(this.dirname);
             if (!componentModule) {
-                this.addError('No corresponding JavaScript module found in the same directory (either "component.js" or "index.js").');
+                this.addError(
+                    'No corresponding JavaScript module found in the same directory (either "component.js" or "index.js").'
+                );
                 return;
             }
-            if (componentModule.requirePath === './') {
+            if (componentModule.requirePath === "./") {
                 rendererModule = componentModule;
             }
         } else if (bindAttr.isLiteralValue()) {
-             if (typeof bindAttr.literalValue !== 'string') {
-                 this.addError('The value for the "w-bind" attribute should be a string. Actual: ' + componentModule);
-                 return;
-             }
+            if (typeof bindAttr.literalValue !== "string") {
+                this.addError(
+                    'The value for the "w-bind" attribute should be a string. Actual: ' +
+                        componentModule
+                );
+                return;
+            }
 
-             let requirePath = bindAttr.literalValue;
-             let filename = resolveFrom(this.dirname, requirePath);
+            let requirePath = bindAttr.literalValue;
+            let filename = resolveFrom(this.dirname, requirePath);
 
-             if (!filename) {
-                 this.addError('Target file not found: ' + requirePath + ' (from: ' + this.dirname + ')');
-                 return;
-             }
+            if (!filename) {
+                this.addError(
+                    "Target file not found: " +
+                        requirePath +
+                        " (from: " +
+                        this.dirname +
+                        ")"
+                );
+                return;
+            }
 
-             componentModule = {
-                 legacy: true,
-                 filename,
-                 requirePath
-             };
+            componentModule = {
+                legacy: true,
+                filename,
+                requirePath
+            };
         } else {
             // This is a dynamic expression. The <widget-types> should have been found.
             if (!hasWidgetTypes) {
-                this.addError('The <widget-types> tag must be used to declare components when the value of the "w-bind" attribute is a dynamic expression.');
+                this.addError(
+                    'The <widget-types> tag must be used to declare components when the value of the "w-bind" attribute is a dynamic expression.'
+                );
                 return;
             }
 
             el.insertSiblingBefore(
                 builder.functionCall(
-                    builder.memberExpression(builder.identifier('__component'), builder.identifier('t')),
+                    builder.memberExpression(
+                        builder.identifier("__component"),
+                        builder.identifier("t")
+                    ),
                     [
                         builder.memberExpression(
-                            builder.identifier('marko_componentTypes'),
+                            builder.identifier("marko_componentTypes"),
                             bindAttrValue,
-                            true /* computed */)
-                    ]));
+                            true /* computed */
+                        )
+                    ]
+                )
+            );
         }
     } else {
         return;
@@ -130,30 +145,33 @@ module.exports = function handleLegacyBind() {
 
     // A component is bound to the el...
 
-    if (el.hasAttribute('w-config')) {
+    if (el.hasAttribute("w-config")) {
         el.insertSiblingBefore(
             builder.functionCall(
-                builder.memberExpression(builder.identifier('__component'), builder.identifier('c')),
-                [
-                    el.getAttributeValue('w-config')
-                ]));
+                builder.memberExpression(
+                    builder.identifier("__component"),
+                    builder.identifier("c")
+                ),
+                [el.getAttributeValue("w-config")]
+            )
+        );
 
-        el.removeAttribute('w-config');
+        el.removeAttribute("w-config");
     }
 
     let componentProps = {};
 
-    let id = el.getAttributeValue('id');
+    let id = el.getAttributeValue("id");
 
     if (id) {
         componentProps.id = id;
     }
 
     this.convertToComponent({
-      isLegacyInnerBind,
-      componentModule,
-      rendererModule,
-      isLegacyComponent: true,
-      rootNodes: [el]
+        isLegacyInnerBind,
+        componentModule,
+        rendererModule,
+        isLegacyComponent: true,
+        rootNodes: [el]
     });
 };
diff --git a/src/components/taglib/TransformHelper/handleRootNodes.js b/src/components/taglib/TransformHelper/handleRootNodes.js
index 5a6055a5c..89322f65c 100644
--- a/src/components/taglib/TransformHelper/handleRootNodes.js
+++ b/src/components/taglib/TransformHelper/handleRootNodes.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-let path = require('path');
-let getComponentFiles = require('./getComponentFiles');
+let path = require("path");
+let getComponentFiles = require("./getComponentFiles");
 
-const esprima = require('esprima');
-const escodegen = require('escodegen');
-const FLAG_COMPONENT_STYLE = Symbol('COMPONENT_STYLE');
+const esprima = require("esprima");
+const escodegen = require("escodegen");
+const FLAG_COMPONENT_STYLE = Symbol("COMPONENT_STYLE");
 
 function handleStyleElement(styleEl, transformHelper) {
     if (styleEl.bodyText) {
@@ -15,26 +15,33 @@ function handleStyleElement(styleEl, transformHelper) {
     let attrs = styleEl.attributes;
 
     let styleCode;
-    let lang = 'css';
+    let lang = "css";
 
     let hasStyleBlock = false;
 
-    for (let i=attrs.length-1; i>=0; i--) {
+    for (let i = attrs.length - 1; i >= 0; i--) {
         let attr = attrs[i];
         let name = attr.name;
-        if (name.startsWith('{')) {
+        if (name.startsWith("{")) {
             hasStyleBlock = true;
 
             styleCode = name.slice(1, -1).trim();
-        } else if (name === 'class') {
-            if (attr.value.type !== 'Literal' || typeof attr.value.value !== 'string') {
+        } else if (name === "class") {
+            if (
+                attr.value.type !== "Literal" ||
+                typeof attr.value.value !== "string"
+            ) {
                 return;
             }
 
             lang = attr.value.value;
         } else {
             if (hasStyleBlock) {
-                transformHelper.context.addError(styleEl, 'Unsupported attribute on the component style tag: ' + attr.name);
+                transformHelper.context.addError(
+                    styleEl,
+                    "Unsupported attribute on the component style tag: " +
+                        attr.name
+                );
                 return;
             }
         }
@@ -51,8 +58,8 @@ function handleStyleElement(styleEl, transformHelper) {
         context.addDependency({
             type: lang,
             code: styleCode,
-            virtualPath: './'+path.basename(context.filename)+'.'+lang,
-            path: './'+path.basename(context.filename)
+            virtualPath: "./" + path.basename(context.filename) + "." + lang,
+            path: "./" + path.basename(context.filename)
         });
     }
 
@@ -61,11 +68,11 @@ function handleStyleElement(styleEl, transformHelper) {
 
 function methodToProperty(method) {
     return {
-        type: 'Property',
+        type: "Property",
         key: method.key,
         computed: false,
         value: method.value,
-        kind: 'init',
+        kind: "init",
         method: false,
         shorthand: false
     };
@@ -73,18 +80,23 @@ function methodToProperty(method) {
 
 function classToObject(cls, el, transformHelper) {
     return {
-        type: 'ObjectExpression',
-        properties: cls.body.body.map((method) => {
-            if(method.type != 'MethodDefinition') {
-                throw Error('Only methods are allowed on single file component class definitions.');
+        type: "ObjectExpression",
+        properties: cls.body.body.map(method => {
+            if (method.type != "MethodDefinition") {
+                throw Error(
+                    "Only methods are allowed on single file component class definitions."
+                );
             }
 
-            if (method.kind === 'method') {
+            if (method.kind === "method") {
                 return methodToProperty(method);
-            } else if (method.kind === 'constructor') {
-                transformHelper.context.deprecate('The constructor method should not be used for a component, use onCreate instead', el);
+            } else if (method.kind === "constructor") {
+                transformHelper.context.deprecate(
+                    "The constructor method should not be used for a component, use onCreate instead",
+                    el
+                );
                 let converted = methodToProperty(method);
-                converted.key.name = 'onCreate';
+                converted.key.name = "onCreate";
                 return converted;
             } else {
                 return method;
@@ -95,12 +107,12 @@ function classToObject(cls, el, transformHelper) {
 
 function handleClassDeclaration(classEl, transformHelper) {
     let tree;
-    let wrappedSrc = '('+classEl.tagString+'\n)';
+    let wrappedSrc = "(" + classEl.tagString + "\n)";
 
     try {
         tree = esprima.parseScript(wrappedSrc);
-    } catch(err) {
-        let message = 'Unable to parse JavaScript for component class. ' + err;
+    } catch (err) {
+        let message = "Unable to parse JavaScript for component class. " + err;
 
         if (err.index != null) {
             let errorIndex = err.index;
@@ -120,17 +132,23 @@ function handleClassDeclaration(classEl, transformHelper) {
     let expression = tree.body[0].expression;
 
     if (expression.superClass && expression.superClass.name) {
-        transformHelper.context.addError(classEl, 'A component class is not allowed to use `extends`. See: https://github.com/marko-js/marko/wiki/Error:-Component-class-with-extends');
+        transformHelper.context.addError(
+            classEl,
+            "A component class is not allowed to use `extends`. See: https://github.com/marko-js/marko/wiki/Error:-Component-class-with-extends"
+        );
         return;
     }
 
     let object = classToObject(expression, classEl, transformHelper);
-    let componentVar = transformHelper.context.addStaticVar('marko_component', escodegen.generate(object));
+    let componentVar = transformHelper.context.addStaticVar(
+        "marko_component",
+        escodegen.generate(object)
+    );
 
     let moduleInfo = {
         inlineId: componentVar,
         filename: transformHelper.filename,
-        requirePath: './' + path.basename(transformHelper.filename)
+        requirePath: "./" + path.basename(transformHelper.filename)
     };
 
     classEl.detach();
@@ -141,7 +159,7 @@ function handleClassDeclaration(classEl, transformHelper) {
 module.exports = function handleRootNodes() {
     let context = this.context;
 
-    if (context.isFlagSet('hasLegacyWidgetBind')) {
+    if (context.isFlagSet("hasLegacyWidgetBind")) {
         return;
     }
 
@@ -155,11 +173,11 @@ module.exports = function handleRootNodes() {
     let dirname = context.dirname;
 
     if (componentFiles.package) {
-        context.addDependency('package: ./' + componentFiles.package);
+        context.addDependency("package: ./" + componentFiles.package);
     }
 
-    componentFiles.styles.forEach((styleFile) => {
-        context.addDependency('./' + styleFile);
+    componentFiles.styles.forEach(styleFile => {
+        context.addDependency("./" + styleFile);
     });
 
     if (componentFiles.file) {
@@ -167,7 +185,7 @@ module.exports = function handleRootNodes() {
 
         let moduleInfo = {
             filename: path.join(dirname, file),
-            requirePath: './'+file.slice(0, file.lastIndexOf('.'))
+            requirePath: "./" + file.slice(0, file.lastIndexOf("."))
         };
 
         componentModule = rendererModule = moduleInfo;
@@ -178,33 +196,23 @@ module.exports = function handleRootNodes() {
 
         componentModule = {
             filename: path.join(dirname, file),
-            requirePath: './' + file.slice(
-                0, file.lastIndexOf('.'))
+            requirePath: "./" + file.slice(0, file.lastIndexOf("."))
         };
     }
 
     let templateRoot = this.el;
 
     let rootNodes = [];
-    let hasIdCount = 0;
-    let nodeWithAssignedId;
-    let assignedId;
     let transformHelper = this;
 
     let walker = context.createWalker({
         enter(node) {
             let tagName = node.tagName && node.tagName.toLowerCase();
 
-            if (node.type === 'TemplateRoot' || !node.type) {
+            if (node.type === "TemplateRoot" || !node.type) {
                 // Don't worry about the TemplateRoot or an Container node
-            } else if (node.type === 'HtmlElement') {
-                if (node.hasAttribute('id')) {
-                    hasIdCount++;
-                    nodeWithAssignedId = node;
-                    assignedId = node.getAttributeValue('id');
-                }
-
-                if (tagName === 'style') {
+            } else if (node.type === "HtmlElement") {
+                if (tagName === "style") {
                     handleStyleElement(node, transformHelper);
                 }
 
@@ -214,7 +222,7 @@ module.exports = function handleRootNodes() {
                 walker.skip();
 
                 return;
-            } else if (node.type === 'CustomTag') {
+            } else if (node.type === "CustomTag") {
                 let tag = context.taglibLookup.getTag(node.tagName);
 
                 if (!tag.noOutput) {
@@ -223,15 +231,21 @@ module.exports = function handleRootNodes() {
 
                 walker.skip();
                 return;
-            } else if (node.type === 'Scriptlet') {
+            } else if (node.type === "Scriptlet") {
                 walker.skip();
                 return;
             } else {
-                if (tagName === 'class') {
-                    let classComponentModule = handleClassDeclaration(node, transformHelper);
+                if (tagName === "class") {
+                    let classComponentModule = handleClassDeclaration(
+                        node,
+                        transformHelper
+                    );
 
                     if (rendererModule != null) {
-                        transformHelper.context.addError(node, 'The component has both an inline component `class` and a separate `component.js`. This is not allowed. See: https://github.com/marko-js/marko/wiki/Error:-Component-inline-and-external');
+                        transformHelper.context.addError(
+                            node,
+                            "The component has both an inline component `class` and a separate `component.js`. This is not allowed. See: https://github.com/marko-js/marko/wiki/Error:-Component-inline-and-external"
+                        );
                         return;
                     }
 
@@ -256,13 +270,15 @@ module.exports = function handleRootNodes() {
     //     return;
     // }
 
-    if (context.isFlagSet('hasWidgetTypes')) {
-        context.addError('The <widget-types> tag is no longer supported. See: https://github.com/marko-js/marko/issues/514');
+    if (context.isFlagSet("hasWidgetTypes")) {
+        context.addError(
+            "The <widget-types> tag is no longer supported. See: https://github.com/marko-js/marko/issues/514"
+        );
     }
 
     // After normalizing the text nodes to remove whitespace we may have detached
     // some of the root text nodes so remove those from our list
-    rootNodes = rootNodes.filter((rootNode) => {
+    rootNodes = rootNodes.filter(rootNode => {
         return rootNode.isDetached() !== true;
     });
 
@@ -277,7 +293,7 @@ module.exports = function handleRootNodes() {
 
         componentModule = rendererModule = {
             filename: this.filename,
-            requirePath: './' + path.basename(this.filename)
+            requirePath: "./" + path.basename(this.filename)
         };
     }
 
diff --git a/src/components/taglib/TransformHelper/handleScopedAttrs.js b/src/components/taglib/TransformHelper/handleScopedAttrs.js
index 91ba76f8f..06f2423e3 100644
--- a/src/components/taglib/TransformHelper/handleScopedAttrs.js
+++ b/src/components/taglib/TransformHelper/handleScopedAttrs.js
@@ -1,13 +1,13 @@
-'use strict';
+"use strict";
 
-const removeDashes = require('../../../compiler/util/removeDashes');
+const removeDashes = require("../../../compiler/util/removeDashes");
 
-const deprecatedKeySuffix = ':key';
-const scopedSuffix = ':scoped';
+const deprecatedKeySuffix = ":key";
+const scopedSuffix = ":scoped";
 const deprecatedAttrs = {
-    'for-ref': true,
-    'for-key': true,
-    'w-for': true
+    "for-ref": true,
+    "for-key": true,
+    "w-for": true
 };
 
 module.exports = function handleComponentKeyAttrs() {
@@ -28,47 +28,81 @@ module.exports = function handleComponentKeyAttrs() {
 
         // BEGIN support for deprecated for attributes
         if (deprecatedAttrs[attributeName]) {
-            context.deprecate(`The "${attributeName}" attribute is deprecated. Please use "for:key" instead.`);
+            context.deprecate(
+                `The "${attributeName}" attribute is deprecated. Please use "for:key" instead.`
+            );
 
-            let incompatibleAttributes = ['for', 'for:key']
-                .concat(Object.keys(deprecatedAttrs).filter(a => a != attributeName))
+            let incompatibleAttributes = ["for", "for:key"]
+                .concat(
+                    Object.keys(deprecatedAttrs).filter(a => a != attributeName)
+                )
                 .filter(a => el.hasAttribute(a));
 
             if (incompatibleAttributes.length) {
-                this.addError(`The "${attributeName}" attribute cannot be used in conjunction with "${incompatibleAttributes.join('" or "')}". (${filePosition})`);
+                this.addError(
+                    `The "${attributeName}" attribute cannot be used in conjunction with "${incompatibleAttributes.join(
+                        '" or "'
+                    )}". (${filePosition})`
+                );
                 return;
             } else {
-                fixedAttributeName = 'for:scoped';
+                fixedAttributeName = "for:scoped";
             }
-        } else if (attributeName !== deprecatedKeySuffix && attributeName.endsWith(deprecatedKeySuffix)) {
-            context.deprecate(`The "${attributeName}" attribute is deprecated. Please use "for:scoped" instead.`);
-            fixedAttributeName = attributeName.slice(0, 0-deprecatedKeySuffix.length) + ':scoped';
+        } else if (
+            attributeName !== deprecatedKeySuffix &&
+            attributeName.endsWith(deprecatedKeySuffix)
+        ) {
+            context.deprecate(
+                `The "${attributeName}" attribute is deprecated. Please use "for:scoped" instead.`
+            );
+            fixedAttributeName =
+                attributeName.slice(0, 0 - deprecatedKeySuffix.length) +
+                ":scoped";
         }
         // END support for deprecated for attributes
 
-        if (fixedAttributeName !== scopedSuffix && fixedAttributeName.endsWith(scopedSuffix)) {
+        if (
+            fixedAttributeName !== scopedSuffix &&
+            fixedAttributeName.endsWith(scopedSuffix)
+        ) {
             el.removeAttribute(attributeName);
 
-            let finalAttributeName = fixedAttributeName.slice(0, 0-scopedSuffix.length);
+            let finalAttributeName = fixedAttributeName.slice(
+                0,
+                0 - scopedSuffix.length
+            );
 
             if (el.hasAttribute(finalAttributeName)) {
-                this.addError(`The "${attributeName}" attribute cannot be used in conjunction with the "${finalAttributeName}" attribute. (${filePosition})`);
+                this.addError(
+                    `The "${attributeName}" attribute cannot be used in conjunction with the "${finalAttributeName}" attribute. (${filePosition})`
+                );
                 return;
             }
 
             let uniqueElId = this.nextUniqueId();
-            let idVarName = 'marko_' + removeDashes(finalAttributeName) + '_key' + uniqueElId;
+            let idVarName =
+                "marko_" +
+                removeDashes(finalAttributeName) +
+                "_key" +
+                uniqueElId;
 
             let varNode = builder.var(idVarName, attribute.value);
 
             el.insertSiblingBefore(varNode);
             let varIdNode = builder.identifier(idVarName);
 
-            el.setAttributeValue(finalAttributeName, this.buildComponentElIdFunctionCall(varIdNode));
+            el.setAttributeValue(
+                finalAttributeName,
+                this.buildComponentElIdFunctionCall(varIdNode)
+            );
 
-            if (!el.hasAttribute('key') && !el.hasAttribute('w-id') && !el.hasAttribute('ref')) {
+            if (
+                !el.hasAttribute("key") &&
+                !el.hasAttribute("w-id") &&
+                !el.hasAttribute("ref")
+            ) {
                 // The scoped attribute should be suitable for a key
-                el.setAttributeValue('key', varIdNode);
+                el.setAttributeValue("key", varIdNode);
                 el.data.userAssignedKey = false;
             }
         }
diff --git a/src/components/taglib/TransformHelper/index.js b/src/components/taglib/TransformHelper/index.js
index 7915b26fa..68e890cc5 100644
--- a/src/components/taglib/TransformHelper/index.js
+++ b/src/components/taglib/TransformHelper/index.js
@@ -1,10 +1,10 @@
-'use strict';
-var ComponentArgsCompiler = require('./ComponentArgsCompiler');
-var getRequirePath = require('../getRequirePath');
+"use strict";
+var ComponentArgsCompiler = require("./ComponentArgsCompiler");
+var getRequirePath = require("../getRequirePath");
 
-var MARKO_WIDGETS_VAR_KEY = Symbol('MARKO_WIDGETS_VAR');
+var MARKO_WIDGETS_VAR_KEY = Symbol("MARKO_WIDGETS_VAR");
 var WIDGET_PROPS_KEY;
-var HAS_COMPONENT_KEY = Symbol('HAS_WIDGET');
+var HAS_COMPONENT_KEY = Symbol("HAS_WIDGET");
 
 class TransformHelper {
     constructor(el, context) {
@@ -31,14 +31,16 @@ class TransformHelper {
 
     getTemplateModule() {
         return {
-            requirePath:this.context.getRequirePath(this.filename)
+            requirePath: this.context.getRequirePath(this.filename)
         };
     }
 
     hasBoundComponentForTemplate() {
-        return this.context.data.componentModule != null ||
+        return (
+            this.context.data.componentModule != null ||
             this.context.data[HAS_COMPONENT_KEY] ||
-            this.context.data[WIDGET_PROPS_KEY] != null;
+            this.context.data[WIDGET_PROPS_KEY] != null
+        );
     }
 
     addError(message, code) {
@@ -46,7 +48,10 @@ class TransformHelper {
     }
 
     getComponentArgs() {
-        return this.componentArgs || (this.componentArgs = new ComponentArgsCompiler());
+        return (
+            this.componentArgs ||
+            (this.componentArgs = new ComponentArgsCompiler())
+        );
     }
 
     nextUniqueId() {
@@ -55,7 +60,7 @@ class TransformHelper {
             this.context.data.componentNextElId = 0;
         }
 
-        return (this.context.data.componentNextElId++);
+        return this.context.data.componentNextElId++;
     }
 
     serializeKey() {
@@ -63,16 +68,27 @@ class TransformHelper {
         var key = el.key;
         var context = this.context;
         var builder = this.builder;
-        
-        if (!this.__keySerialized && context.isServerTarget() && context.isSplitComponent) {
-            var markoKeyAttrVar = context.importModule('marko_keyAttr',
-                this.getMarkoComponentsRequirePath('marko/components/taglib/helpers/markoKeyAttr'));
 
-            el.setAttributeValue('data-marko-key', builder.functionCall(markoKeyAttrVar, [
-                key,
-                builder.identifier('__component')
-            ]));
-            
+        if (
+            !this.__keySerialized &&
+            context.isServerTarget() &&
+            context.isSplitComponent
+        ) {
+            var markoKeyAttrVar = context.importModule(
+                "marko_keyAttr",
+                this.getMarkoComponentsRequirePath(
+                    "marko/components/taglib/helpers/markoKeyAttr"
+                )
+            );
+
+            el.setAttributeValue(
+                "data-marko-key",
+                builder.functionCall(markoKeyAttrVar, [
+                    key,
+                    builder.identifier("__component")
+                ])
+            );
+
             this.__keySerialized = true;
         }
     }
@@ -108,10 +124,16 @@ class TransformHelper {
 
     get markoComponentsVar() {
         if (!this.context.data[MARKO_WIDGETS_VAR_KEY]) {
-            this.context.data[MARKO_WIDGETS_VAR_KEY] =
-                this.context.importModule(
-                    'marko_components',
-                    this.getMarkoComponentsRequirePath(this.isLegacyComponent ? 'marko/components/legacy' : 'marko/components'));
+            this.context.data[
+                MARKO_WIDGETS_VAR_KEY
+            ] = this.context.importModule(
+                "marko_components",
+                this.getMarkoComponentsRequirePath(
+                    this.isLegacyComponent
+                        ? "marko/components/legacy"
+                        : "marko/components"
+                )
+            );
         }
 
         return this.context.data[MARKO_WIDGETS_VAR_KEY];
@@ -120,18 +142,23 @@ class TransformHelper {
     buildComponentElIdFunctionCall(id) {
         var builder = this.builder;
 
-        if (id.type === 'Literal' && id.value === '') {
+        if (id.type === "Literal" && id.value === "") {
             let componentElId = builder.memberExpression(
-                builder.identifier('__component'),
-                builder.identifier('id'));
+                builder.identifier("__component"),
+                builder.identifier("id")
+            );
 
             return componentElId;
         } else {
             let componentElId = builder.memberExpression(
-                builder.identifier('__component'),
-                builder.identifier('elId'));
+                builder.identifier("__component"),
+                builder.identifier("elId")
+            );
 
-            return builder.functionCall(componentElId, arguments.length === 0 ? [] : [ id ]);
+            return builder.functionCall(
+                componentElId,
+                arguments.length === 0 ? [] : [id]
+            );
         }
     }
 
@@ -140,13 +167,13 @@ class TransformHelper {
     }
 }
 
-TransformHelper.prototype.assignComponentId = require('./assignComponentId');
-TransformHelper.prototype.convertToComponent = require('./convertToComponent');
-TransformHelper.prototype.handleRootNodes = require('./handleRootNodes');
-TransformHelper.prototype.handleComponentEvents = require('./handleComponentEvents');
-TransformHelper.prototype.handleComponentPreserve = require('./handleComponentPreserve');
-TransformHelper.prototype.handleComponentPreserveAttrs = require('./handleComponentPreserveAttrs');
-TransformHelper.prototype.handleScopedAttrs = require('./handleScopedAttrs');
-TransformHelper.prototype.handleLegacyBind = require('./handleLegacyBind');
+TransformHelper.prototype.assignComponentId = require("./assignComponentId");
+TransformHelper.prototype.convertToComponent = require("./convertToComponent");
+TransformHelper.prototype.handleRootNodes = require("./handleRootNodes");
+TransformHelper.prototype.handleComponentEvents = require("./handleComponentEvents");
+TransformHelper.prototype.handleComponentPreserve = require("./handleComponentPreserve");
+TransformHelper.prototype.handleComponentPreserveAttrs = require("./handleComponentPreserveAttrs");
+TransformHelper.prototype.handleScopedAttrs = require("./handleScopedAttrs");
+TransformHelper.prototype.handleLegacyBind = require("./handleLegacyBind");
 
 module.exports = TransformHelper;
diff --git a/src/components/taglib/body-transformer.js b/src/components/taglib/body-transformer.js
index 8651db082..e888e7650 100644
--- a/src/components/taglib/body-transformer.js
+++ b/src/components/taglib/body-transformer.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
 module.exports = function transform(el, context) {
-    let componentGlobalsNode = context.createNodeForEl('component-globals');
+    let componentGlobalsNode = context.createNodeForEl("component-globals");
     el.prependChild(componentGlobalsNode);
 
-    let initComponentsNode = context.createNodeForEl('init-components');
+    let initComponentsNode = context.createNodeForEl("init-components");
     el.appendChild(initComponentsNode);
 
     // Make <await-reorderer> optional. Automatically insert it before the
     // body tag.
-    let awaitReorderer = context.createNodeForEl('await-reorderer');
+    let awaitReorderer = context.createNodeForEl("await-reorderer");
     el.appendChild(awaitReorderer);
 };
diff --git a/src/components/taglib/component-globals-tag.js b/src/components/taglib/component-globals-tag.js
index 92c3d6f8a..17ef21dce 100644
--- a/src/components/taglib/component-globals-tag.js
+++ b/src/components/taglib/component-globals-tag.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
 const escapeEndingScriptTagRegExp = /<\//g;
-const warp10 = require('warp10');
+const warp10 = require("warp10");
 
 function getSerializedGlobals(outGlobal) {
     let serializedGlobalsLookup = outGlobal.serializedGlobals;
     if (serializedGlobalsLookup) {
         let serializedGlobals;
         let keys = Object.keys(serializedGlobalsLookup);
-        for (let i=0, len=keys.length; i<len; i++) {
+        for (let i = 0, len = keys.length; i < len; i++) {
             let key = keys[i];
             if (serializedGlobalsLookup[key] === true) {
                 let value = outGlobal[key];
@@ -33,9 +33,15 @@ module.exports = function render(input, out) {
         return;
     }
     var cspNonce = outGlobal.cspNonce;
-    var nonceAttr = cspNonce ? ' nonce='+JSON.stringify(cspNonce) : '';
+    var nonceAttr = cspNonce ? " nonce=" + JSON.stringify(cspNonce) : "";
 
-    out.write('<script' + nonceAttr + '>$MG=' +
-        warp10.stringify(serializedGlobals).replace(escapeEndingScriptTagRegExp, '\\u003C/') +
-        '</script>');
+    out.write(
+        "<script" +
+            nonceAttr +
+            ">$MG=" +
+            warp10
+                .stringify(serializedGlobals)
+                .replace(escapeEndingScriptTagRegExp, "\\u003C/") +
+            "</script>"
+    );
 };
diff --git a/src/components/taglib/component-tag.js b/src/components/taglib/component-tag.js
index 9845eed17..522ad6c3b 100644
--- a/src/components/taglib/component-tag.js
+++ b/src/components/taglib/component-tag.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var BIND_WIDGET_KEY = Symbol();
 module.exports = function codeGenerator(el, codegen) {
@@ -6,27 +6,26 @@ module.exports = function codeGenerator(el, codegen) {
     var context = codegen.context;
 
     var bodyFunc = builder.renderBodyFunction(el.body, [
-            builder.identifierOut(),
-            builder.identifier('__component'),
-            builder.identifier('state')
-        ]);
+        builder.identifierOut(),
+        builder.identifier("__component"),
+        builder.identifier("state")
+    ]);
 
+    var componentProps = el.getAttributeValue("props");
 
-    var componentProps = el.getAttributeValue('props');
-    
     var bindComponentVar = context.importModule(
-        'marko_bindComponent',
-        'marko/components/taglib/helpers/bindComponent');
+        "marko_bindComponent",
+        "marko/components/taglib/helpers/bindComponent"
+    );
 
     if (context.data[BIND_WIDGET_KEY] == null) {
         context.data[BIND_WIDGET_KEY] = 0;
     }
 
     var varName = context.addStaticVar(
-        'marko_bindComponent' + (context.data[BIND_WIDGET_KEY]++),
-        builder.functionCall(bindComponentVar, [
-                componentProps
-            ]));
+        "marko_bindComponent" + context.data[BIND_WIDGET_KEY]++,
+        builder.functionCall(bindComponentVar, [componentProps])
+    );
 
     return builder.functionCall(varName, [bodyFunc, builder.identifierOut()]);
 };
diff --git a/src/components/taglib/components-transformer.js b/src/components/taglib/components-transformer.js
index 4f352cad8..585e92f51 100644
--- a/src/components/taglib/components-transformer.js
+++ b/src/components/taglib/components-transformer.js
@@ -1,14 +1,13 @@
-'use strict';
-var getTransformHelper = require('./util/getTransformHelper');
+"use strict";
+var getTransformHelper = require("./util/getTransformHelper");
 
-
-function tagDefinitionHasOverridingKeyAttribute(el, context) {
-    if (!el.hasAttribute('key')) {
+function tagDefinitionHasOverridingKeyAttribute(el) {
+    if (!el.hasAttribute("key")) {
         return false;
     }
 
     var tagDef = el.tagDef;
-    if (tagDef && tagDef.hasAttribute('key')) {
+    if (tagDef && tagDef.hasAttribute("key")) {
         return true;
     }
 
@@ -17,55 +16,62 @@ function tagDefinitionHasOverridingKeyAttribute(el, context) {
 module.exports = function transform(el, context) {
     var transformHelper = getTransformHelper(el, context);
 
-    if (el.type === 'TemplateRoot') {
+    if (el.type === "TemplateRoot") {
         transformHelper.handleRootNodes();
         return;
     }
 
-    if (el.hasAttribute('w-body')) {
+    if (el.hasAttribute("w-body")) {
         // This is a legacy code block and should be removed in Marko v5
-        context.deprecate('The "w-body" attribute is deprecated. Please use "<include(...)" instead. See: https://github.com/marko-js/marko/issues/492');
+        context.deprecate(
+            'The "w-body" attribute is deprecated. Please use "<include(...)" instead. See: https://github.com/marko-js/marko/issues/492'
+        );
         let builder = context.builder;
-        let bodyValue = el.getAttributeValue('w-body');
-        el.removeAttribute('w-body');
+        let bodyValue = el.getAttributeValue("w-body");
+        el.removeAttribute("w-body");
 
-        let includeNode = context.createNodeForEl('include');
+        let includeNode = context.createNodeForEl("include");
 
         if (!bodyValue) {
             bodyValue = builder.memberExpression(
-                builder.identifier('__component'),
-                builder.identifier('b'));
+                builder.identifier("__component"),
+                builder.identifier("b")
+            );
 
             includeNode.data.bodySlot = true;
         }
 
-        includeNode.addProp('_target', bodyValue);
+        includeNode.addProp("_target", bodyValue);
         el.appendChild(includeNode);
     }
 
-    if (el.tagName === 'widget-types') {
-        context.setFlag('hasWidgetTypes');
+    if (el.tagName === "widget-types") {
+        context.setFlag("hasWidgetTypes");
     }
 
-    if (el.hasAttribute('w-el-id')) {
-        transformHelper.addError('"w-el-id" attribute is no longer allowed. Use "w-id" instead.');
+    if (el.hasAttribute("w-el-id")) {
+        transformHelper.addError(
+            '"w-el-id" attribute is no longer allowed. Use "w-id" instead.'
+        );
         return;
     }
 
-    if (el.hasAttribute('w-bind')) {
+    if (el.hasAttribute("w-bind")) {
         transformHelper.handleLegacyBind();
     }
 
-    if (/* New preserve attributes */
-        el.hasAttribute('no-update') ||
-        el.hasAttribute('no-update-body') ||
-        el.hasAttribute('no-update-if') ||
-        el.hasAttribute('no-update-body-if') ||
+    if (
+        /* New preserve attributes */
+        el.hasAttribute("no-update") ||
+        el.hasAttribute("no-update-body") ||
+        el.hasAttribute("no-update-if") ||
+        el.hasAttribute("no-update-body-if") ||
         /* Old preserve attributes */
-        el.hasAttribute('w-preserve') ||
-        el.hasAttribute('w-preserve-body') ||
-        el.hasAttribute('w-preserve-if') ||
-        el.hasAttribute('w-preserve-body-if')) {
+        el.hasAttribute("w-preserve") ||
+        el.hasAttribute("w-preserve-body") ||
+        el.hasAttribute("w-preserve-if") ||
+        el.hasAttribute("w-preserve-body-if")
+    ) {
         transformHelper.handleComponentPreserve();
     }
 
@@ -73,16 +79,23 @@ module.exports = function transform(el, context) {
     transformHelper.handleScopedAttrs();
 
     if (!tagDefinitionHasOverridingKeyAttribute(el, context)) {
-        if (el.hasAttribute('w-id') || el.hasAttribute('ref') || el.hasAttribute('key')) {
+        if (
+            el.hasAttribute("w-id") ||
+            el.hasAttribute("ref") ||
+            el.hasAttribute("key")
+        ) {
             transformHelper.assignComponentId();
         }
 
-        if (context.options.autoKeyEnabled !== false && context.inline !== true) {
+        if (
+            context.options.autoKeyEnabled !== false &&
+            context.inline !== true
+        ) {
             transformHelper.assignComponentId();
         }
     }
 
-    if (el.hasAttribute('w-body')) {
+    if (el.hasAttribute("w-body")) {
         transformHelper.handleComponentBody();
     }
 
diff --git a/src/components/taglib/getRequirePath-browser.js b/src/components/taglib/getRequirePath-browser.js
index da7a44859..e20af05a1 100644
--- a/src/components/taglib/getRequirePath-browser.js
+++ b/src/components/taglib/getRequirePath-browser.js
@@ -1,3 +1,3 @@
 module.exports = function getRequirePath(target, template) {
     return template.getRequirePath(target);
-};
\ No newline at end of file
+};
diff --git a/src/components/taglib/getRequirePath.js b/src/components/taglib/getRequirePath.js
index 3e582a55a..c0d049ca1 100644
--- a/src/components/taglib/getRequirePath.js
+++ b/src/components/taglib/getRequirePath.js
@@ -1,13 +1,15 @@
-var resolveFrom = require('resolve-from');
+var resolveFrom = require("resolve-from");
 
 module.exports = function getRequirePath(target, context) {
-    if (target === 'marko' || target.startsWith('marko/')) {
+    if (target === "marko" || target.startsWith("marko/")) {
         return target;
     }
 
     var resolvedTarget = resolveFrom(context.dirname, target);
     if (!resolvedTarget) {
-        throw new Error('Unable to resolve "' + target + '" from "' + context.dirname + '"');
+        throw new Error(
+            'Unable to resolve "' + target + '" from "' + context.dirname + '"'
+        );
     }
     var requirePath = context.getRequirePath(resolvedTarget);
     return requirePath;
diff --git a/src/components/taglib/helpers/bindComponent.js b/src/components/taglib/helpers/bindComponent.js
index bb409f3ce..cefad2feb 100644
--- a/src/components/taglib/helpers/bindComponent.js
+++ b/src/components/taglib/helpers/bindComponent.js
@@ -1,4 +1,4 @@
-var createRendererFunc = require('../../renderer');
+var createRendererFunc = require("../../renderer");
 
 module.exports = function(componentProps) {
     var renderer = createRendererFunc(
@@ -6,11 +6,15 @@ module.exports = function(componentProps) {
             data.$renderBody(out, component, state);
         },
         componentProps,
-        null);
+        null
+    );
 
     return function bindComponent(renderBody, out) {
-        renderer({
-            $renderBody: renderBody
-        }, out);
+        renderer(
+            {
+                $renderBody: renderBody
+            },
+            out
+        );
     };
-};
\ No newline at end of file
+};
diff --git a/src/components/taglib/helpers/markoKeyAttr.js b/src/components/taglib/helpers/markoKeyAttr.js
index a18e14c9a..ba23ae384 100644
--- a/src/components/taglib/helpers/markoKeyAttr.js
+++ b/src/components/taglib/helpers/markoKeyAttr.js
@@ -4,6 +4,6 @@ var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 
 module.exports = function markoKeyAttr(key, componentDef) {
     if ((componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER) === 0) {
-        return key + ' ' + componentDef.id;
+        return key + " " + componentDef.id;
     }
 };
diff --git a/src/components/taglib/helpers/package.json b/src/components/taglib/helpers/package.json
index 39393d4f1..a0d3f81d8 100644
--- a/src/components/taglib/helpers/package.json
+++ b/src/components/taglib/helpers/package.json
@@ -1,5 +1,6 @@
 {
     "browser": {
-        "./getDynamicClientComponentPath.js": "./getDynamicClientComponentPath-browser.js"
+        "./getDynamicClientComponentPath.js":
+            "./getDynamicClientComponentPath-browser.js"
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/taglib/init-components-tag.js b/src/components/taglib/init-components-tag.js
index c2fa98234..e8f73b208 100644
--- a/src/components/taglib/init-components-tag.js
+++ b/src/components/taglib/init-components-tag.js
@@ -1,15 +1,17 @@
-'use strict';
+"use strict";
 
 const INIT_COMPONENTS_KEY = Symbol();
 
-const writeInitComponentsCode = require('../').writeInitComponentsCode;
+const writeInitComponentsCode = require("../").writeInitComponentsCode;
 
-const ComponentsContext = require('../ComponentsContext');
+const ComponentsContext = require("../ComponentsContext");
 
 function handleAwaitBeforeRender(eventArgs) {
     if (eventArgs.clientReorder) {
         const asyncFragmentOut = eventArgs.out;
-        asyncFragmentOut.___components = new ComponentsContext(asyncFragmentOut);
+        asyncFragmentOut.___components = new ComponentsContext(
+            asyncFragmentOut
+        );
     }
 }
 
@@ -23,8 +25,8 @@ module.exports = function render(input, out) {
     if (outGlobal[INIT_COMPONENTS_KEY] === undefined) {
         outGlobal[INIT_COMPONENTS_KEY] = true;
 
-        out.on('await:beforeRender', handleAwaitBeforeRender);
-        out.on('await:finish', handleAwaitFinish);
+        out.on("await:beforeRender", handleAwaitBeforeRender);
+        out.on("await:finish", handleAwaitFinish);
 
         if (out.isSync() === true) {
             // Generate initialization code for any of the UI components that were
diff --git a/src/components/taglib/marko.json b/src/components/taglib/marko.json
index bf5e3f877..9a1143885 100644
--- a/src/components/taglib/marko.json
+++ b/src/components/taglib/marko.json
@@ -29,10 +29,12 @@
                 {
                     "displayText": "key=\"<method>\"",
                     "snippet": "key=\"${1:method}\"",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components"
                 }
             ]
         },
@@ -70,7 +72,8 @@
                 {
                     "displayText": "on<event>(\"<method>\")",
                     "snippet": "on${1:Click}(\"handle${2:Button}${1:Click}\")",
-                    "descriptionMoreURL": "https://markojs.com/docs/components/#attaching-dom-event-listeners"
+                    "descriptionMoreURL":
+                        "https://markojs.com/docs/components/#attaching-dom-event-listeners"
                 }
             ]
         },
@@ -83,7 +86,8 @@
             "autocomplete": {
                 "displayText": "once<event>(\"<method>\")",
                 "snippet": "once${1:Click}(\"handle${2:Button}${1:Click}\")",
-                "descriptionMoreURL": "https://markojs.com/docs/components/#attaching-dom-event-listeners"
+                "descriptionMoreURL":
+                    "https://markojs.com/docs/components/#attaching-dom-event-listeners"
             }
         },
         "@w-on*": {
@@ -126,7 +130,8 @@
             "preserve-name": true,
             "autocomplete": [
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
                 }
             ]
         },
@@ -135,7 +140,8 @@
             "preserve-name": true,
             "autocomplete": [
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
                 }
             ]
         },
@@ -144,7 +150,8 @@
             "autocomplete": [
                 {
                     "snippet": "no-update-if(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
                 }
             ]
         },
@@ -153,7 +160,8 @@
             "autocomplete": [
                 {
                     "snippet": "no-update-body-if(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render"
                 }
             ]
         },
diff --git a/src/components/taglib/preserve-tag-browser.js b/src/components/taglib/preserve-tag-browser.js
index c90d79fce..12ed42341 100644
--- a/src/components/taglib/preserve-tag-browser.js
+++ b/src/components/taglib/preserve-tag-browser.js
@@ -1,4 +1,4 @@
-var componentsUtil = require('../util');
+var componentsUtil = require("../util");
 var componentLookup = componentsUtil.___componentLookup;
 
 module.exports = function render(input, out) {
@@ -9,7 +9,7 @@ module.exports = function render(input, out) {
         // If so, then reuse the existing DOM node instead of re-rendering
         // the children. We have to put a placeholder node that will get
         // replaced out if we find that the DOM node has already been rendered
-        if (!('if' in input) || input['if']) {
+        if (!("if" in input) || input["if"]) {
             var component = componentsContext.___componentDef.___component;
             var globalComponentsContext = componentsContext.___globalContext;
             var key = input.key;
@@ -22,13 +22,22 @@ module.exports = function render(input, out) {
                     // but keep track that the node is being preserved so that we can ignore
                     // it while transforming the old DOM
                     if (bodyOnly) {
-                        globalComponentsContext.___preservedElBodies[key] = true;
+                        globalComponentsContext.___preservedElBodies[
+                            key
+                        ] = true;
                     } else {
                         // If we are preserving the entire DOM node (not just the body)
                         // then that means that we have need to render a placeholder to
                         // mark the target location. We can then replace the placeholder
                         // node with the existing DOM node
-                        out.element('', null, key, null, 0, 8 /* FLAG_PRESERVE */);
+                        out.element(
+                            "",
+                            null,
+                            key,
+                            null,
+                            0,
+                            8 /* FLAG_PRESERVE */
+                        );
                         globalComponentsContext.___preservedEls[key] = true;
                     }
 
@@ -38,7 +47,9 @@ module.exports = function render(input, out) {
                 var existingComponent = componentLookup[componentId];
                 if (existingComponent) {
                     out.___preserveComponent(existingComponent);
-                    globalComponentsContext.___renderedComponentsById[componentId] = true;
+                    globalComponentsContext.___renderedComponentsById[
+                        componentId
+                    ] = true;
                     return;
                 }
             }
diff --git a/src/components/taglib/util/generateRegisterComponentCode.js b/src/components/taglib/util/generateRegisterComponentCode.js
index 8fd361ebd..cf8914229 100644
--- a/src/components/taglib/util/generateRegisterComponentCode.js
+++ b/src/components/taglib/util/generateRegisterComponentCode.js
@@ -1,14 +1,24 @@
-'use strict';
+"use strict";
 
-const lassoModulesClientTransport = require('lasso-modules-client/transport');
-const shorthash = require('shorthash');
-const ok = require('assert').ok;
+const lassoModulesClientTransport = require("lasso-modules-client/transport");
+const shorthash = require("shorthash");
+const ok = require("assert").ok;
 
-function generateRegisterComponentCode(componentModule, transformHelper, isSplit) {
+function generateRegisterComponentCode(
+    componentModule,
+    transformHelper,
+    isSplit
+) {
     ok(componentModule, '"componentModule" is required');
     ok(transformHelper, '"transformHelper" is required');
-    ok(typeof componentModule.filename === 'string', '"componentModule.filename" should be a string');
-    ok(typeof transformHelper.dirname === 'string', '"transformHelper.dirname" should be a string');
+    ok(
+        typeof componentModule.filename === "string",
+        '"componentModule.filename" should be a string'
+    );
+    ok(
+        typeof transformHelper.dirname === "string",
+        '"transformHelper.dirname" should be a string'
+    );
 
     let context = transformHelper.context;
 
@@ -25,34 +35,48 @@ function generateRegisterComponentCode(componentModule, transformHelper, isSplit
     let componentId = getComponentId(fileName);
     let registerNode;
 
-    if (context.outputType === 'vdom') {
+    if (context.outputType === "vdom") {
         let def;
-        let registerComponent = context.helper('registerComponent');
+        let registerComponent = context.helper("registerComponent");
 
         if (componentModule.legacy) {
             // This if condition block should be deleted in Marko v5
-            let returnValue = builder.require(builder.literal(componentModule.requirePath));
+            let returnValue = builder.require(
+                builder.literal(componentModule.requirePath)
+            );
 
-            let defineWidget = context.helper('defineWidget-legacy');
+            let defineWidget = context.helper("defineWidget-legacy");
 
             returnValue = builder.functionCall(defineWidget, [returnValue]);
 
-            def = builder.functionDeclaration(null, [] /* params */, [
-                builder.returnStatement(returnValue)
-            ]);
+            def = builder.functionDeclaration(
+                null,
+                [] /* params */,
+                [builder.returnStatement(returnValue)]
+            );
         } else if (isSplit) {
-            let returnValue = builder.require(builder.literal(componentModule.requirePath));
+            let returnValue = builder.require(
+                builder.literal(componentModule.requirePath)
+            );
 
-            def = builder.functionDeclaration(null, [] /* params */, [
-                builder.returnStatement(returnValue)
-            ]);
+            def = builder.functionDeclaration(
+                null,
+                [] /* params */,
+                [builder.returnStatement(returnValue)]
+            );
         } else {
-            def = builder.functionDeclaration(null, [], [
-                builder.returnStatement(
-                    builder.memberExpression(
-                        builder.identifier('module'),
-                        builder.identifier('exports')))
-            ]);
+            def = builder.functionDeclaration(
+                null,
+                [],
+                [
+                    builder.returnStatement(
+                        builder.memberExpression(
+                            builder.identifier("module"),
+                            builder.identifier("exports")
+                        )
+                    )
+                ]
+            );
         }
 
         registerNode = builder.functionCall(registerComponent, [
@@ -63,12 +87,13 @@ function generateRegisterComponentCode(componentModule, transformHelper, isSplit
         registerNode = builder.literal(componentId);
     }
 
-    return { id:componentId, node:registerNode };
+    return { id: componentId, node: registerNode };
 }
 
 function getComponentId(filename) {
     let componentId = lassoModulesClientTransport.getClientPath(filename);
     // TODO: turn on for production
+    // eslint-disable-next-line no-constant-condition
     if (false) {
         componentId = shorthash.unique(componentId);
     }
diff --git a/src/components/taglib/util/getTransformHelper.js b/src/components/taglib/util/getTransformHelper.js
index 444fc2a13..692962ace 100644
--- a/src/components/taglib/util/getTransformHelper.js
+++ b/src/components/taglib/util/getTransformHelper.js
@@ -1,5 +1,5 @@
-var TransformHelper = require('../TransformHelper');
+var TransformHelper = require("../TransformHelper");
 
 module.exports = function(el, context) {
     return new TransformHelper(el, context);
-};
\ No newline at end of file
+};
diff --git a/src/components/taglib/widget-types-tag.js b/src/components/taglib/widget-types-tag.js
index 59b055eee..2409dcb27 100644
--- a/src/components/taglib/widget-types-tag.js
+++ b/src/components/taglib/widget-types-tag.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-const getTransformHelper = require('./util/getTransformHelper');
-const generateRegisterComponentCode = require('./util/generateRegisterComponentCode');
-const resolveFrom = require('resolve-from');
+const getTransformHelper = require("./util/getTransformHelper");
+const generateRegisterComponentCode = require("./util/generateRegisterComponentCode");
+const resolveFrom = require("resolve-from");
 
 module.exports = function codeGenerator(el, codegen) {
     var context = codegen.context;
@@ -16,9 +16,9 @@ module.exports = function codeGenerator(el, codegen) {
 
     var typesObject = {};
 
-    attrs.forEach((attr) => {
+    attrs.forEach(attr => {
         if (!attr.isLiteralString()) {
-            codegen.addError('Component type should be a string');
+            codegen.addError("Component type should be a string");
             return;
         }
 
@@ -27,7 +27,13 @@ module.exports = function codeGenerator(el, codegen) {
         let filename = resolveFrom(transformHelper.dirname, requirePath);
 
         if (!filename) {
-            transformHelper.addError('Target file not found: ' + requirePath + ' (from: ' + transformHelper.dirname + ')');
+            transformHelper.addError(
+                "Target file not found: " +
+                    requirePath +
+                    " (from: " +
+                    transformHelper.dirname +
+                    ")"
+            );
             return;
         }
 
@@ -37,10 +43,14 @@ module.exports = function codeGenerator(el, codegen) {
             requirePath: requirePath
         };
 
-        typesObject[attr.name] = generateRegisterComponentCode(componentModule, transformHelper, false).node;
+        typesObject[attr.name] = generateRegisterComponentCode(
+            componentModule,
+            transformHelper,
+            false
+        ).node;
     });
 
-    codegen.addStaticVar('marko_componentTypes', builder.literal(typesObject));
+    codegen.addStaticVar("marko_componentTypes", builder.literal(typesObject));
 
     return null;
-};
\ No newline at end of file
+};
diff --git a/src/components/update-manager.js b/src/components/update-manager.js
index a933939dc..9ef6594ff 100644
--- a/src/components/update-manager.js
+++ b/src/components/update-manager.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
 var updatesScheduled = false;
 var batchStack = []; // A stack of batched updates
 var unbatchedQueue = []; // Used for scheduled batched updates
 
-var nextTick = require('../runtime/nextTick');
+var nextTick = require("../runtime/nextTick");
 
 /**
  * This function is called when we schedule the update of "unbatched"
@@ -39,7 +39,7 @@ function updateComponents(queue) {
     // Loop over the components in the queue and update them.
     // NOTE: It is okay if the queue grows during the iteration
     //       since we will still get to them at the end
-    for (var i=0; i<queue.length; i++) {
+    for (var i = 0; i < queue.length; i++) {
         var component = queue[i];
         component.___update(); // Do the actual component update
     }
@@ -84,7 +84,7 @@ function queueComponentUpdate(component) {
         // If the stack has a non-zero length then we know that a batch has
         // been started so we can just queue the component on the top batch. When
         // the batch is ended this component will be updated.
-        var batch = batchStack[batchStackLen-1];
+        var batch = batchStack[batchStackLen - 1];
 
         // We default the batch queue to null to avoid creating an Array instance
         // unnecessarily. If it is null then we create a new Array, otherwise
diff --git a/src/components/util-browser.js b/src/components/util-browser.js
index d80e3eefa..ea4f204ac 100644
--- a/src/components/util-browser.js
+++ b/src/components/util-browser.js
@@ -1,4 +1,3 @@
-
 var markoUID = window.$MUID || (window.$MUID = { i: 0 });
 var runtimeId = markoUID.i++;
 
@@ -9,7 +8,10 @@ var EMPTY_OBJECT = {};
 
 function getComponentForEl(el, doc) {
     if (el) {
-        var node = typeof el == 'string' ? (doc || defaultDocument).getElementById(el) : el;
+        var node =
+            typeof el == "string"
+                ? (doc || defaultDocument).getElementById(el)
+                : el;
         if (node) {
             return node.___markoComponent;
         }
@@ -18,14 +20,9 @@ function getComponentForEl(el, doc) {
 
 var lifecycleEventMethods = {};
 
-[
-    'create',
-    'render',
-    'update',
-    'mount',
-    'destroy'
-].forEach(function(eventName) {
-    lifecycleEventMethods[eventName] = 'on' + eventName[0].toUpperCase() + eventName.substring(1);
+["create", "render", "update", "mount", "destroy"].forEach(function(eventName) {
+    lifecycleEventMethods[eventName] =
+        "on" + eventName[0].toUpperCase() + eventName.substring(1);
 });
 
 /**
@@ -70,7 +67,7 @@ function destroyNodeRecursive(node, component) {
         }
 
         var curChild = node.firstChild;
-        while(curChild) {
+        while (curChild) {
             destroyComponentForNode(curChild);
             destroyNodeRecursive(curChild, component);
             curChild = curChild.nextSibling;
@@ -83,14 +80,19 @@ function nextComponentId() {
     // marko runtimes. This allows multiple instances of marko to be
     // loaded in the same window and they should all place nice
     // together
-    return 'b' + (markoUID.i++);
+    return "b" + markoUID.i++;
 }
 
 function nextComponentIdProvider() {
     return nextComponentId;
 }
 
-function attachBubblingEvent(componentDef, handlerMethodName, isOnce, extraArgs) {
+function attachBubblingEvent(
+    componentDef,
+    handlerMethodName,
+    isOnce,
+    extraArgs
+) {
     if (handlerMethodName) {
         var componentId = componentDef.id;
         if (extraArgs) {
@@ -110,8 +112,10 @@ function getMarkoPropsFromEl(el) {
     } else {
         virtualProps = el.___markoVProps;
         if (!virtualProps) {
-            virtualProps = el.getAttribute('data-marko');
-            el.___markoVProps = virtualProps = virtualProps ? JSON.parse(virtualProps) : EMPTY_OBJECT;
+            virtualProps = el.getAttribute("data-marko");
+            el.___markoVProps = virtualProps = virtualProps
+                ? JSON.parse(virtualProps)
+                : EMPTY_OBJECT;
         }
     }
 
diff --git a/src/components/util.js b/src/components/util.js
index 47457cbff..6b9a2bb4e 100644
--- a/src/components/util.js
+++ b/src/components/util.js
@@ -3,15 +3,20 @@ var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_HEAD_EL = 4;
 
 function nextComponentIdProvider(out) {
-    var prefix = out.global.componentIdPrefix || 's'; // "s" is for server (we use "b" for the browser)
+    var prefix = out.global.componentIdPrefix || "s"; // "s" is for server (we use "b" for the browser)
     var nextId = 0;
 
     return function nextComponentId() {
-        return prefix + (nextId++);
+        return prefix + nextId++;
     };
 }
 
-function attachBubblingEvent(componentDef, handlerMethodName, isOnce, extraArgs) {
+function attachBubblingEvent(
+    componentDef,
+    handlerMethodName,
+    isOnce,
+    extraArgs
+) {
     if (handlerMethodName) {
         if (extraArgs) {
             var component = componentDef.___component;
@@ -33,10 +38,17 @@ function attachBubblingEvent(componentDef, handlerMethodName, isOnce, extraArgs)
                 }
             }
 
-            return handlerMethodName + ' ' + componentDef.id + ' ' + isOnce + ' ' + eventIndex;
-
+            return (
+                handlerMethodName +
+                " " +
+                componentDef.id +
+                " " +
+                isOnce +
+                " " +
+                eventIndex
+            );
         } else {
-            return handlerMethodName + ' ' + componentDef.id + ' ' + isOnce;
+            return handlerMethodName + " " + componentDef.id + " " + isOnce;
         }
     }
 }
diff --git a/src/defineRenderer.js b/src/defineRenderer.js
index 1484343de..86fc6629b 100644
--- a/src/defineRenderer.js
+++ b/src/defineRenderer.js
@@ -1,11 +1,11 @@
-var marko = require('../');
+var marko = require("../");
 
 function defineRenderer(def) {
     var template = def.template;
     var getTemplateData = def.getTemplateData;
     var renderer = def.renderer;
 
-    if (typeof template === 'string') {
+    if (typeof template === "string") {
         template = marko.load(template);
     }
 
@@ -32,9 +32,9 @@ function defineRenderer(def) {
             // Use getTemplateData(state, props, out) to get the template
             // data. If that method is not provided then just use the
             // the state (if provided) or the input data.
-            var templateData = getTemplateData ?
-                getTemplateData(newProps, out) :
-                newProps;
+            var templateData = getTemplateData
+                ? getTemplateData(newProps, out)
+                : newProps;
 
             // Render the template associated with the component using the final template
             // data that we constructed
diff --git a/src/express.js b/src/express.js
index 07351174d..c99129252 100644
--- a/src/express.js
+++ b/src/express.js
@@ -1,8 +1,10 @@
-require('./');
+require("./");
 
-var assign = require('object-assign');
+var assign = require("object-assign");
 
-var express = module.parent ? module.parent.require('express') : require('express');
+var express = module.parent
+    ? module.parent.require("express")
+    : require("express");
 
 patchResponse(express.response);
 delete require.cache[__filename];
@@ -10,7 +12,7 @@ delete require.cache[__filename];
 module.exports = function markoAppMiddleware() {
     var sacrificialApp = express();
 
-    sacrificialApp.once('mount', function onmount(parent) {
+    sacrificialApp.once("mount", function onmount(parent) {
         // Patch the response
         patchResponse(parent.response);
 
@@ -28,30 +30,32 @@ module.exports = function markoAppMiddleware() {
 };
 
 function patchResponse(response) {
-    response.marko = response.marko || function(template, data) {
-        if(typeof template === 'string') {
-            throw new Error(
-                'res.marko does not take a template name or path like res.render.  ' +
-                'Instead you should use `require(\'./path/to/template.marko\')` ' +
-                'and pass the loaded template to this function.'
-            );
-        }
+    response.marko =
+        response.marko ||
+        function(template, data) {
+            if (typeof template === "string") {
+                throw new Error(
+                    "res.marko does not take a template name or path like res.render.  " +
+                        "Instead you should use `require('./path/to/template.marko')` " +
+                        "and pass the loaded template to this function."
+                );
+            }
 
-        var res = this;
-        var req = res.req;
-        var app = res.app;
-        var $global = assign({ app, req, res }, app.locals, res.locals);
+            var res = this;
+            var req = res.req;
+            var app = res.app;
+            var $global = assign({ app, req, res }, app.locals, res.locals);
 
-        if (data) {
-            data = assign(data, {
-                $global: assign($global, data.$global)
-            });
-        } else {
-            data = { $global };
-        }
+            if (data) {
+                data = assign(data, {
+                    $global: assign($global, data.$global)
+                });
+            } else {
+                data = { $global };
+            }
 
-        res.set({ 'content-type': 'text/html; charset=utf-8' });
+            res.set({ "content-type": "text/html; charset=utf-8" });
 
-        return template.render(data, res);
-    };
+            return template.render(data, res);
+        };
 }
diff --git a/src/hot-reload.js b/src/hot-reload.js
index 692402dc0..960be4344 100644
--- a/src/hot-reload.js
+++ b/src/hot-reload.js
@@ -1,21 +1,26 @@
-require('raptor-polyfill/string/endsWith');
+/* eslint-disable no-console */
 
-const nodePath = require('path');
-const fs = require('fs');
-const nodeRequire = require('./node-require');
+require("raptor-polyfill/string/endsWith");
+
+const nodePath = require("path");
+const fs = require("fs");
+const nodeRequire = require("./node-require");
 
 var compiler;
 var marko;
 var runtime;
-var components;
 
 var modifiedId = 1;
-var HOT_RELOAD_KEY = Symbol('HOT_RELOAD');
+var HOT_RELOAD_KEY = Symbol("HOT_RELOAD");
 
 function cleaResolvePathCache() {
-    var modulePathCache = require('module').Module._pathCache;
+    var modulePathCache = require("module").Module._pathCache;
     if (!modulePathCache) {
-        console.log('[marko/hot-reload] WARNING: Missing: require("module").Module._pathCache [' + __filename + ']');
+        console.log(
+            '[marko/hot-reload] WARNING: Missing: require("module").Module._pathCache [' +
+                __filename +
+                "]"
+        );
         return;
     }
 
@@ -26,11 +31,11 @@ function cleaResolvePathCache() {
 }
 
 function tryReloadTemplate(path) {
-    path = path.replace(/\.js$/, '');
+    path = path.replace(/\.js$/, "");
 
     try {
         return marko.load(path);
-    } catch(e) {
+    } catch (e) {
         return undefined;
     }
 }
@@ -48,7 +53,7 @@ exports.enable = function(options) {
 
     // We set an environment variable so that _all_ marko modules
     // installed in the project will have hot reload enabled.
-    process.env.MARKO_HOT_RELOAD = 'true';
+    process.env.MARKO_HOT_RELOAD = "true";
 
     function createHotReloadProxy(func, template, methodName) {
         var hotReloadData = template[HOT_RELOAD_KEY];
@@ -67,16 +72,23 @@ exports.enable = function(options) {
         function hotReloadProxy() {
             if (hotReloadData.modifiedId !== modifiedId) {
                 hotReloadData.modifiedId = modifiedId;
-                hotReloadData.latest = tryReloadTemplate(templatePath) || template;
+                hotReloadData.latest =
+                    tryReloadTemplate(templatePath) || template;
 
                 if (hotReloadData.latest !== template) {
                     template.meta = hotReloadData.latest.meta;
-                    if (!silent) { console.log('[marko/hot-reload] Template successfully reloaded: ' + templatePath); }
+                    if (!silent) {
+                        console.log(
+                            "[marko/hot-reload] Template successfully reloaded: " +
+                                templatePath
+                        );
+                    }
                 }
             }
 
             var latest = hotReloadData.latest;
-            var originals = latest[HOT_RELOAD_KEY] && latest[HOT_RELOAD_KEY].originals;
+            var originals =
+                latest[HOT_RELOAD_KEY] && latest[HOT_RELOAD_KEY].originals;
             if (!originals) {
                 originals = latest;
             }
@@ -90,17 +102,21 @@ exports.enable = function(options) {
 
     var oldCreateTemplate = runtime.t;
 
-    runtime.t = function hotReloadCreateTemplate(path) {
+    runtime.t = function hotReloadCreateTemplate() {
         var originalTemplate = oldCreateTemplate.apply(runtime, arguments);
         var actualRenderFunc;
 
-        Object.defineProperty(originalTemplate, '_', {
+        Object.defineProperty(originalTemplate, "_", {
             get: function() {
                 return actualRenderFunc;
             },
 
             set: function(renderFunc) {
-                actualRenderFunc = createHotReloadProxy(renderFunc, originalTemplate, '_');
+                actualRenderFunc = createHotReloadProxy(
+                    renderFunc,
+                    originalTemplate,
+                    "_"
+                );
             }
         });
 
@@ -121,15 +137,18 @@ function _endsWithMarkoExtension(path, requireExtensions) {
 }
 
 function normalizeExtension(extension) {
-    if (extension.charAt(0) !== '.') {
-        extension = '.' + extension;
+    if (extension.charAt(0) !== ".") {
+        extension = "." + extension;
     }
     return extension;
 }
 
 exports.handleFileModified = function(path, options) {
     if (!fs.existsSync(path)) {
-        console.log('[marko/hot-reload] WARNING cannot resolve template path: ', path);
+        console.log(
+            "[marko/hot-reload] WARNING cannot resolve template path: ",
+            path
+        );
         return;
     }
 
@@ -137,7 +156,7 @@ exports.handleFileModified = function(path, options) {
     var silent = options.silent || false;
 
     // Default hot-reloaded extensions
-    var requireExtensions = ['.marko', '.marko.html', '.marko.xml'];
+    var requireExtensions = [".marko", ".marko.html", ".marko.xml"];
 
     if (options.extension) {
         requireExtensions.push(options.extension);
@@ -159,37 +178,38 @@ exports.handleFileModified = function(path, options) {
     var basename = nodePath.basename(path);
 
     function handleFileModified() {
-        if (!silent) { console.log('[marko/hot-reload] File modified: ' + path); }
+        if (!silent) {
+            console.log("[marko/hot-reload] File modified: " + path);
+        }
         runtime.cache = {};
         compiler.clearCaches();
         cleaResolvePathCache();
         modifiedId++;
     }
 
-    if (basename === 'marko-tag.json' || basename === 'marko.json') {
+    if (basename === "marko-tag.json" || basename === "marko.json") {
         handleFileModified();
         // If we taglib was modified then uncache *all* templates so that they will
         // all be reloaded
-        Object.keys(require.cache).forEach((filename) => {
-            if (filename.endsWith('.marko') || filename.endsWith('.marko.js')) {
+        Object.keys(require.cache).forEach(filename => {
+            if (filename.endsWith(".marko") || filename.endsWith(".marko.js")) {
                 delete require.cache[filename];
             }
         });
     } else if (_endsWithMarkoExtension(path, requireExtensions)) {
         handleFileModified();
         delete require.cache[path];
-        delete require.cache[path + '.js'];
-    } else if (basename === 'component.js') {
+        delete require.cache[path + ".js"];
+    } else if (basename === "component.js") {
         handleFileModified();
         var dir = nodePath.dirname(path);
-        var templatePath = nodePath.join(dir, 'index.marko');
+        var templatePath = nodePath.join(dir, "index.marko");
         delete require.cache[path];
         delete require.cache[templatePath];
-        delete require.cache[templatePath + '.js'];
+        delete require.cache[templatePath + ".js"];
     }
 };
 
-compiler = require('./compiler');
-marko = require('./');
-runtime = require('./runtime/html');
-components = require('./components');
+compiler = require("./compiler");
+marko = require("./");
+runtime = require("./runtime/html");
diff --git a/src/html.js b/src/html.js
index 139c708c2..0d30fa00a 100644
--- a/src/html.js
+++ b/src/html.js
@@ -1 +1 @@
-module.exports = require('./runtime/html');
+module.exports = require("./runtime/html");
diff --git a/src/index-browser.js b/src/index-browser.js
index 61a0cae3e..7a2dc2fb8 100644
--- a/src/index-browser.js
+++ b/src/index-browser.js
@@ -1,3 +1,3 @@
-'use strict';
-exports.createOut = require('./runtime/createOut');
-exports.load = require('./loader');
\ No newline at end of file
+"use strict";
+exports.createOut = require("./runtime/createOut");
+exports.load = require("./loader");
diff --git a/src/index.js b/src/index.js
index 0e9917253..93ed8ed3c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,20 +1,24 @@
-'use strict';
-require('./components/legacy/dependencies/html');
+"use strict";
+require("./components/legacy/dependencies/html");
 
 if (!process.env.BUNDLE) {
     if (process.env.MARKO_HOT_RELOAD) {
-        require('./hot-reload').enable();
+        require("./hot-reload").enable();
     }
 
     // If process was launched with browser refresh then automatically
     // enable browser-refresh
-    require('./browser-refresh').enable();
+    require("./browser-refresh").enable();
 }
 
 function fixFlush() {
     try {
-        var OutgoingMessage = require('http').OutgoingMessage;
-        if (OutgoingMessage.prototype.flush && OutgoingMessage.prototype.flush.toString().indexOf('deprecated') !== -1) {
+        var OutgoingMessage = require("http").OutgoingMessage;
+        if (
+            OutgoingMessage.prototype.flush &&
+            OutgoingMessage.prototype.flush.toString().indexOf("deprecated") !==
+                -1
+        ) {
             // Yes, we are monkey-patching http. This method should never have been added and it was introduced on
             // the iojs fork. It was quickly deprecated and I'm 99% sure no one is actually using it.
             // See:
@@ -24,12 +28,14 @@ function fixFlush() {
             // This method causes problems since marko looks for the flush method and calls it found.
             // The `res.flush()` method is introduced by the [compression](https://www.npmjs.com/package/compression)
             // middleware, but, otherwise, it should typically not exist.
-            delete require('http').OutgoingMessage.prototype.flush;
+            delete require("http").OutgoingMessage.prototype.flush;
         }
-    } catch(e) {}
+    } catch (e) {
+        /* ignore error */
+    }
 }
 
 fixFlush();
 
-exports.createOut = require('./runtime/createOut');
-exports.load = require('./loader');
+exports.createOut = require("./runtime/createOut");
+exports.load = require("./loader");
diff --git a/src/loader/browser.json b/src/loader/browser.json
index fd212863e..0a10ce05e 100644
--- a/src/loader/browser.json
+++ b/src/loader/browser.json
@@ -5,4 +5,4 @@
             "to": "./index-browser-dynamic.js"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/src/loader/index-browser-dynamic.js b/src/loader/index-browser-dynamic.js
index 0654f8b46..8e378df6a 100644
--- a/src/loader/index-browser-dynamic.js
+++ b/src/loader/index-browser-dynamic.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 module.exports = function load(templatePath) {
     // We make the assumption that the template path is a
     // fully resolved module path and that the module exists
     // as a CommonJS module
     return require(templatePath);
-};
\ No newline at end of file
+};
diff --git a/src/loader/index-browser.js b/src/loader/index-browser.js
index 345a35d8e..43f15f0cf 100644
--- a/src/loader/index-browser.js
+++ b/src/loader/index-browser.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 module.exports = function load(templatePath) {
-    throw Error('Not found: ' + templatePath);
-};
\ No newline at end of file
+    throw Error("Not found: " + templatePath);
+};
diff --git a/src/loader/index-default.js b/src/loader/index-default.js
index c03f52b09..51f3c2de4 100644
--- a/src/loader/index-default.js
+++ b/src/loader/index-default.js
@@ -1,29 +1,31 @@
-'use strict';
+"use strict";
 
-var nodePath = require('path');
-var fs = require('fs');
-var Module = require('module').Module;
-var compilerPath = nodePath.join(__dirname, '../compiler');
+var nodePath = require("path");
+var fs = require("fs");
+var Module = require("module").Module;
+var compilerPath = nodePath.join(__dirname, "../compiler");
 var markoCompiler = require(compilerPath);
 var cwd = process.cwd();
-var fsOptions = {encoding: 'utf8'};
+var fsOptions = { encoding: "utf8" };
 
 module.exports = function load(templatePath, templateSrc, options) {
-    if (typeof templatePath === 'string') {
+    if (typeof templatePath === "string") {
         const parsed = nodePath.parse(templatePath);
 
-        if (parsed.ext === '.js') {
+        if (parsed.ext === ".js") {
             // assume compiled template
             return require(templatePath);
-        } else if (parsed.ext === '.marko') {
+        } else if (parsed.ext === ".marko") {
             // Check if precompiled js file already exists.
-            const jsFilePath = nodePath.join(parsed.dir, parsed.name + '.js');
+            const jsFilePath = nodePath.join(parsed.dir, parsed.name + ".js");
             let foundPrecompiled = false;
 
             try {
                 fs.accessSync(jsFilePath);
                 foundPrecompiled = true;
-            } catch(e) {}
+            } catch (e) {
+                /* ignore error */
+            }
 
             if (foundPrecompiled) {
                 return require(jsFilePath);
@@ -37,7 +39,7 @@ module.exports = function load(templatePath, templateSrc, options) {
         // see if second argument is templateSrc (a String)
         // or options (an Object)
         var lastArg = arguments[arguments.length - 1];
-        if (typeof lastArg === 'string') {
+        if (typeof lastArg === "string") {
             return doLoad(templatePath, templateSrc);
         } else {
             var finalOptions = templateSrc;
@@ -47,12 +49,12 @@ module.exports = function load(templatePath, templateSrc, options) {
         // assume function called according to function signature
         return doLoad(templatePath, templateSrc, options);
     } else {
-        throw new Error('Illegal arguments');
+        throw new Error("Illegal arguments");
     }
 };
 
 function loadSource(templatePath, compiledSrc) {
-    templatePath += '.js';
+    templatePath += ".js";
 
     // Short-circuit loading if the template has already been cached in the Node.js require cache
     var cached = require.cache[templatePath];
@@ -61,14 +63,14 @@ function loadSource(templatePath, compiledSrc) {
     }
 
     var templateModule = new Module(templatePath, module);
-    templateModule.paths = Module._nodeModulePaths(nodePath.dirname(templatePath));
+    templateModule.paths = Module._nodeModulePaths(
+        nodePath.dirname(templatePath)
+    );
     templateModule.filename = templatePath;
 
     Module._cache[templatePath] = templateModule;
 
-    templateModule._compile(
-        compiledSrc,
-        templatePath);
+    templateModule._compile(compiledSrc, templatePath);
 
     return templateModule.exports;
 }
@@ -101,8 +103,8 @@ function getPreviousTemplate(templatePath, options) {
     2) /path/to/my-template.marko.js
     */
     var ext = nodePath.extname(templatePath);
-    var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + '.js';
-    var targetFileDebug = templatePath + '.js';
+    var targetFilePrecompiled = templatePath.slice(0, 0 - ext.length) + ".js";
+    var targetFileDebug = templatePath + ".js";
 
     // Short-circuit loading if the template has already been cached in the Node.js require cache
     var cachedTemplate =
@@ -140,7 +142,7 @@ function doLoad(templatePath, templateSrc, options) {
     options = Object.assign({}, markoCompiler.defaultOptions, options);
 
     var template;
-    if (typeof templatePath.render === 'function') {
+    if (typeof templatePath.render === "function") {
         template = templatePath;
     } else {
         templatePath = nodePath.resolve(cwd, templatePath);
@@ -153,13 +155,17 @@ function doLoad(templatePath, templateSrc, options) {
                 templateSrc = fs.readFileSync(templatePath, fsOptions);
             }
 
-            var compiledSrc = markoCompiler.compile(templateSrc, templatePath, options);
+            var compiledSrc = markoCompiler.compile(
+                templateSrc,
+                templatePath,
+                options
+            );
 
             if (writeToDisk === true) {
-                var targetFile = templatePath + '.js';
+                var targetFile = templatePath + ".js";
                 try {
                     fs.writeFileSync(targetFile, compiledSrc, fsOptions);
-                } catch(e) {
+                } catch (e) {
                     // if this fails, that's okay.
                     // writing to file is nice for debugging and not much else
                 }
@@ -175,7 +181,8 @@ function doLoad(templatePath, templateSrc, options) {
         template = new Template(
             template.path,
             createRenderProxy(template),
-            options);
+            options
+        );
     }
 
     return template;
diff --git a/src/loader/index.js b/src/loader/index.js
index 1363736c6..87b66f917 100644
--- a/src/loader/index.js
+++ b/src/loader/index.js
@@ -1,7 +1,7 @@
 if (process.env.BUNDLE) {
     // you cannot load templates dynamically within a bundle
     // all templates should be pre-compiled as part of the bundle
-    module.exports = function(){};
+    module.exports = function() {};
 } else {
-    module.exports = require('./index-default');
-}
\ No newline at end of file
+    module.exports = require("./index-default");
+}
diff --git a/src/morphdom/.jshintrc b/src/morphdom/.jshintrc
deleted file mode 100644
index 2f825eddc..000000000
--- a/src/morphdom/.jshintrc
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "predef": [
-        "document"
-    ],
-    "node" : true,
-    "esnext": true,
-    "boss" : false,
-    "curly": false,
-    "debug": false,
-    "devel": false,
-    "evil": true,
-    "forin": false,
-    "immed": true,
-    "laxbreak": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "nomen": false,
-    "onevar": false,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "sub": false,
-    "white": false,
-    "eqeqeq": false,
-    "latedef": "func",
-    "unused": "vars",
-    "strict": false,
-    "eqnull": true,
-    "-W041": false
-}
diff --git a/src/morphdom/index.js b/src/morphdom/index.js
index d1faf5883..aac740d11 100644
--- a/src/morphdom/index.js
+++ b/src/morphdom/index.js
@@ -1,12 +1,12 @@
-'use strict';
-var specialElHandlers = require('./specialElHandlers');
-var componentsUtil = require('../components/util');
+"use strict";
+var specialElHandlers = require("./specialElHandlers");
+var componentsUtil = require("../components/util");
 var existingComponentLookup = componentsUtil.___componentLookup;
 var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
-var VElement = require('../runtime/vdom/vdom').___VElement;
-var virtualizeElement =  VElement.___virtualize;
+var VElement = require("../runtime/vdom/vdom").___VElement;
+var virtualizeElement = VElement.___virtualize;
 var morphAttrs = VElement.___morphAttrs;
-var eventDelegation = require('../components/event-delegation');
+var eventDelegation = require("../components/event-delegation");
 
 var ELEMENT_NODE = 1;
 var TEXT_NODE = 3;
@@ -34,17 +34,20 @@ function insertBefore(node, referenceNode, parentNode) {
 }
 
 function insertAfter(node, referenceNode, parentNode) {
-    return parentNode.insertBefore(node, referenceNode && referenceNode.nextSibling);
+    return parentNode.insertBefore(
+        node,
+        referenceNode && referenceNode.nextSibling
+    );
 }
 
 function morphdom(
-        parentNode,
-        startNode,
-        endNode,
-        toNode,
-        doc,
-        componentsContext
-    ) {
+    parentNode,
+    startNode,
+    endNode,
+    toNode,
+    doc,
+    componentsContext
+) {
     var globalComponentsContext;
     var isRerenderInBrowser = false;
 
@@ -53,11 +56,17 @@ function morphdom(
         isRerenderInBrowser = globalComponentsContext.___isRerenderInBrowser;
     }
 
-    function createMarkerComment(referenceNode, parentNode) {
-        return doc.createComment('$marko');
+    function createMarkerComment() {
+        return doc.createComment("$marko");
     }
 
-    function insertVirtualNodeBefore(vNode, key, referenceEl, parentEl, component) {
+    function insertVirtualNodeBefore(
+        vNode,
+        key,
+        referenceEl,
+        parentEl,
+        component
+    ) {
         var realNode = vNode.___actualize(doc);
         insertBefore(realNode, referenceEl, parentEl);
 
@@ -73,8 +82,17 @@ function morphdom(
         onNodeAdded(realNode, componentsContext);
     }
 
-    function insertVirtualComponentBefore(vComponent, referenceNode, referenceNodeParentEl, component) {
-        component.___startNode = component.___endNode = insertBefore(createMarkerComment(), referenceNode, referenceNodeParentEl);
+    function insertVirtualComponentBefore(
+        vComponent,
+        referenceNode,
+        referenceNodeParentEl,
+        component
+    ) {
+        component.___startNode = component.___endNode = insertBefore(
+            createMarkerComment(),
+            referenceNode,
+            referenceNodeParentEl
+        );
         morphComponent(referenceNodeParentEl, component, vComponent);
     }
 
@@ -87,7 +105,7 @@ function morphdom(
         // a single text node
         var isPrevText = vChild.___nodeType === TEXT_NODE;
 
-        while((vChild = vChild.___nextSibling)) {
+        while ((vChild = vChild.___nextSibling)) {
             var nextRealNode = endNode.nextSibling;
 
             // We stop when there are no more corresponding real nodes or when
@@ -127,16 +145,30 @@ function morphdom(
         var tempChild;
 
         if (!beforeChild) {
-            tempChild = beforeChild = insertBefore(createMarkerComment(), startNode, parentFromNode);
+            tempChild = beforeChild = insertBefore(
+                createMarkerComment(),
+                startNode,
+                parentFromNode
+            );
         }
 
-        morphChildren(parentFromNode, startNode, afterChild, vComponent, component);
+        morphChildren(
+            parentFromNode,
+            startNode,
+            afterChild,
+            vComponent,
+            component
+        );
 
         endNode = undefined;
 
         startNode = beforeChild.nextSibling;
         if (!startNode || startNode === afterChild) {
-            startNode = endNode = insertAfter(createMarkerComment(), beforeChild, parentFromNode);
+            startNode = endNode = insertAfter(
+                createMarkerComment(),
+                beforeChild,
+                parentFromNode
+            );
         }
 
         if (tempChild) {
@@ -153,15 +185,25 @@ function morphdom(
 
         // Make sure we don't use a detached node as the component boundary and
         // we can't use a node that is already the boundary node for another component
-        if (startNode.___markoDetached !== undefined || startNode.___markoComponent) {
-            startNode = insertBefore(createMarkerComment(), startNode, parentFromNode);
+        if (
+            startNode.___markoDetached !== undefined ||
+            startNode.___markoComponent
+        ) {
+            startNode = insertBefore(
+                createMarkerComment(),
+                startNode,
+                parentFromNode
+            );
         }
 
         if (endNode.___markoDetached !== undefined || endNode.___endNode) {
-            endNode = insertAfter(createMarkerComment(), endNode, parentFromNode);
+            endNode = insertAfter(
+                createMarkerComment(),
+                endNode,
+                parentFromNode
+            );
         }
 
-
         startNode.___markoComponent = component;
         endNode.___endNode = true;
 
@@ -189,7 +231,13 @@ function morphdom(
         component.destroy();
     }
 
-    function morphChildren(parentFromNode, startNode, endNode, toNode, component) {
+    function morphChildren(
+        parentFromNode,
+        startNode,
+        endNode,
+        toNode,
+        component
+    ) {
         var curFromNodeChild = startNode;
         var curToNodeChild = toNode.___firstChild;
 
@@ -211,35 +259,65 @@ function morphdom(
             var componentForNode = curToNodeChild.___component || component;
 
             if (curToNodeType === COMPONENT_NODE) {
-
-                if ((matchingFromComponent = existingComponentLookup[componentForNode.id]) === undefined) {
+                if (
+                    (matchingFromComponent =
+                        existingComponentLookup[componentForNode.id]) ===
+                    undefined
+                ) {
                     if (isRerenderInBrowser === true) {
                         var firstVChild = curToNodeChild.___firstChild;
                         if (firstVChild) {
                             if (!curFromNodeChild) {
-                                curFromNodeChild = insertBefore(createMarkerComment(), null, parentFromNode);
+                                curFromNodeChild = insertBefore(
+                                    createMarkerComment(),
+                                    null,
+                                    parentFromNode
+                                );
                             }
 
                             componentForNode.___startNode = curFromNodeChild;
-                            componentForNode.___endNode = resolveComponentEndNode(curFromNodeChild, firstVChild, parentFromNode);
-
-                        }  else {
-                            componentForNode.___startNode = componentForNode.___endNode = insertBefore(createMarkerComment(), curFromNodeChild, parentFromNode);
+                            componentForNode.___endNode = resolveComponentEndNode(
+                                curFromNodeChild,
+                                firstVChild,
+                                parentFromNode
+                            );
+                        } else {
+                            componentForNode.___startNode = componentForNode.___endNode = insertBefore(
+                                createMarkerComment(),
+                                curFromNodeChild,
+                                parentFromNode
+                            );
                         }
 
-                        curFromNodeChild = morphComponent(parentFromNode, componentForNode, curToNodeChild);
+                        curFromNodeChild = morphComponent(
+                            parentFromNode,
+                            componentForNode,
+                            curToNodeChild
+                        );
                     } else {
-                        insertVirtualComponentBefore(curToNodeChild, curFromNodeChild, parentFromNode, componentForNode);
+                        insertVirtualComponentBefore(
+                            curToNodeChild,
+                            curFromNodeChild,
+                            parentFromNode,
+                            componentForNode
+                        );
                     }
                 } else {
-                    if (matchingFromComponent.___startNode !== curFromNodeChild) {
-                        if (curFromNodeChild &&
-                            (fromComponent = curFromNodeChild.___markoComponent) &&
-                            globalComponentsContext.___renderedComponentsById[fromComponent.id] === undefined) {
-
+                    if (
+                        matchingFromComponent.___startNode !== curFromNodeChild
+                    ) {
+                        if (
+                            curFromNodeChild &&
+                            (fromComponent =
+                                curFromNodeChild.___markoComponent) &&
+                            globalComponentsContext.___renderedComponentsById[
+                                fromComponent.id
+                            ] === undefined
+                        ) {
                             // The component associated with the current real DOM node was not rendered
                             // so we should just remove it out of the real DOM by destroying it
-                            curFromNodeChild = fromComponent.___endNode.nextSibling;
+                            curFromNodeChild =
+                                fromComponent.___endNode.nextSibling;
                             destroyComponent(fromComponent);
                             continue;
                         }
@@ -247,17 +325,29 @@ function morphdom(
                         // We need to move the existing component into
                         // the correct location and preserve focus.
                         var activeElement = doc.activeElement;
-                        insertBefore(matchingFromComponent.___detach(), curFromNodeChild, parentFromNode);
+                        insertBefore(
+                            matchingFromComponent.___detach(),
+                            curFromNodeChild,
+                            parentFromNode
+                        );
                         // This focus patch should be a temporary fix.
-                        if (activeElement !== doc.activeElement && activeElement.focus) {
+                        if (
+                            activeElement !== doc.activeElement &&
+                            activeElement.focus
+                        ) {
                             activeElement.focus();
                         }
                     }
 
                     if (curToNodeChild.___preserve) {
-                        curFromNodeChild = matchingFromComponent.___endNode.nextSibling;
+                        curFromNodeChild =
+                            matchingFromComponent.___endNode.nextSibling;
                     } else {
-                        curFromNodeChild = morphComponent(parentFromNode, componentForNode, curToNodeChild);
+                        curFromNodeChild = morphComponent(
+                            parentFromNode,
+                            componentForNode,
+                            curToNodeChild
+                        );
                     }
                 }
 
@@ -267,14 +357,14 @@ function morphdom(
                 curVFromNodeChild = undefined;
                 curFromNodeKey = undefined;
 
-                var keySequence = componentForNode.___keySequence ||
+                var keySequence =
+                    componentForNode.___keySequence ||
                     (componentForNode.___keySequence = globalComponentsContext.___createKeySequence());
 
                 // We have a keyed element. This is the fast path for matching
                 // up elements
                 curToNodeKey = keySequence.___nextKey(curToNodeKey);
 
-
                 if (curFromNodeChild) {
                     if (curFromNodeChild !== endNode) {
                         curFromNodeKey = curFromNodeChild.___markoKey;
@@ -288,34 +378,72 @@ function morphdom(
                     if ((curToNodeChild.___flags & FLAG_PRESERVE) === 0) {
                         // We just skip over the fromNode if it is preserved
 
-
-                        if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
-                            morphEl(curFromNodeChild, curVFromNodeChild, curToNodeChild, componentForNode, curToNodeKey);
+                        if (
+                            compareNodeNames(curToNodeChild, curVFromNodeChild)
+                        ) {
+                            morphEl(
+                                curFromNodeChild,
+                                curVFromNodeChild,
+                                curToNodeChild,
+                                componentForNode,
+                                curToNodeKey
+                            );
                         } else {
                             // Remove the old node
-                            detachNode(curFromNodeChild, parentFromNode, componentForNode);
+                            detachNode(
+                                curFromNodeChild,
+                                parentFromNode,
+                                componentForNode
+                            );
 
                             // Incompatible nodes. Just move the target VNode into the DOM at this position
-                            insertVirtualNodeBefore(curToNodeChild, curToNodeKey, curFromNodeChild, parentFromNode, componentForNode);
+                            insertVirtualNodeBefore(
+                                curToNodeChild,
+                                curToNodeKey,
+                                curFromNodeChild,
+                                parentFromNode,
+                                componentForNode
+                            );
                         }
                     } else {
                         // this should be preserved.
-
                     }
                 } else {
-                    if ((matchingFromEl = componentForNode.___keyedElements[curToNodeKey]) === undefined) {
-                        if (isRerenderInBrowser === true && curFromNodeChild &&
-                                curFromNodeChild.nodeType === ELEMENT_NODE &&
-                                curFromNodeChild.nodeName === curToNodeChild.___nodeName) {
-                            curVFromNodeChild = virtualizeElement(curFromNodeChild);
+                    if (
+                        (matchingFromEl =
+                            componentForNode.___keyedElements[curToNodeKey]) ===
+                        undefined
+                    ) {
+                        if (
+                            isRerenderInBrowser === true &&
+                            curFromNodeChild &&
+                            curFromNodeChild.nodeType === ELEMENT_NODE &&
+                            curFromNodeChild.nodeName ===
+                                curToNodeChild.___nodeName
+                        ) {
+                            curVFromNodeChild = virtualizeElement(
+                                curFromNodeChild
+                            );
                             curFromNodeChild.___markoKey = curToNodeKey;
-                            morphEl(curFromNodeChild, curVFromNodeChild, curToNodeChild, componentForNode, curToNodeKey);
+                            morphEl(
+                                curFromNodeChild,
+                                curVFromNodeChild,
+                                curToNodeChild,
+                                componentForNode,
+                                curToNodeKey
+                            );
                             curToNodeChild = toNextSibling;
                             curFromNodeChild = fromNextSibling;
                             continue;
                         }
 
-                        insertVirtualNodeBefore(curToNodeChild, curToNodeKey, curFromNodeChild, parentFromNode, componentForNode);
+                        insertVirtualNodeBefore(
+                            curToNodeChild,
+                            curToNodeKey,
+                            curFromNodeChild,
+                            parentFromNode,
+                            componentForNode
+                        );
                         fromNextSibling = curFromNodeChild;
                     } else {
                         if (matchingFromEl.___markoDetached !== undefined) {
@@ -323,7 +451,9 @@ function morphdom(
                         }
                         curVFromNodeChild = matchingFromEl.___markoVElement;
 
-                        if (compareNodeNames(curVFromNodeChild, curToNodeChild)) {
+                        if (
+                            compareNodeNames(curVFromNodeChild, curToNodeChild)
+                        ) {
                             if (fromNextSibling === matchingFromEl) {
                                 // Single element removal:
                                 // A <-> A
@@ -336,14 +466,21 @@ function morphdom(
                                 // B <-> C <-- We are here
                                 // C     B
 
-                                if (toNextSibling && toNextSibling.___key === curFromNodeKey) {
+                                if (
+                                    toNextSibling &&
+                                    toNextSibling.___key === curFromNodeKey
+                                ) {
                                     // Single element swap
 
                                     // We want to stay on the current real DOM node
                                     fromNextSibling = curFromNodeChild;
 
                                     // But move the matching element into place
-                                    insertBefore(matchingFromEl, curFromNodeChild, parentFromNode);
+                                    insertBefore(
+                                        matchingFromEl,
+                                        curFromNodeChild,
+                                        parentFromNode
+                                    );
                                 } else {
                                     // Single element removal
 
@@ -351,13 +488,17 @@ function morphdom(
                                     // and the matching real DOM node will fall into
                                     // place. We will continue diffing with next sibling
                                     // after the real DOM node that just fell into place
-                                    fromNextSibling = fromNextSibling.nextSibling;
+                                    fromNextSibling =
+                                        fromNextSibling.nextSibling;
 
                                     if (curFromNodeChild) {
-                                        detachNode(curFromNodeChild, parentFromNode, componentForNode);
+                                        detachNode(
+                                            curFromNodeChild,
+                                            parentFromNode,
+                                            componentForNode
+                                        );
                                     }
                                 }
-
                             } else {
                                 // A <-> A
                                 // B <-> D <-- We are here
@@ -365,21 +506,47 @@ function morphdom(
                                 // D
 
                                 // We need to move the matching node into place
-                                insertAfter(matchingFromEl, curFromNodeChild, parentFromNode);
+                                insertAfter(
+                                    matchingFromEl,
+                                    curFromNodeChild,
+                                    parentFromNode
+                                );
 
                                 if (curFromNodeChild) {
-                                    detachNode(curFromNodeChild, parentFromNode, componentForNode);
+                                    detachNode(
+                                        curFromNodeChild,
+                                        parentFromNode,
+                                        componentForNode
+                                    );
                                 }
                             }
 
-                            if ((curToNodeChild.___flags & FLAG_PRESERVE) === 0) {
-                                morphEl(matchingFromEl, curVFromNodeChild, curToNodeChild, componentForNode, curToNodeKey, curToNodeKey);
+                            if (
+                                (curToNodeChild.___flags & FLAG_PRESERVE) ===
+                                0
+                            ) {
+                                morphEl(
+                                    matchingFromEl,
+                                    curVFromNodeChild,
+                                    curToNodeChild,
+                                    componentForNode,
+                                    curToNodeKey,
+                                    curToNodeKey
+                                );
                             }
-
-
                         } else {
-                            insertVirtualNodeBefore(curToNodeChild, curToNodeKey, curFromNodeChild, parentFromNode, componentForNode);
-                            detachNode(matchingFromEl, parentFromNode, componentForNode);
+                            insertVirtualNodeBefore(
+                                curToNodeChild,
+                                curToNodeKey,
+                                curFromNodeChild,
+                                parentFromNode,
+                                componentForNode
+                            );
+                            detachNode(
+                                matchingFromEl,
+                                parentFromNode,
+                                componentForNode
+                            );
                         }
                     }
                 }
@@ -393,7 +560,10 @@ function morphdom(
             // it is also not a preserve node. Let's now match up the HTML
             // element, text node, comment, etc.
             while (curFromNodeChild && curFromNodeChild !== endNode) {
-                if ((fromComponent = curFromNodeChild.___markoComponent) && fromComponent !== componentForNode) {
+                if (
+                    (fromComponent = curFromNodeChild.___markoComponent) &&
+                    fromComponent !== componentForNode
+                ) {
                     // The current "to" element is not associated with a component,
                     // but the current "from" element is associated with a component
 
@@ -402,7 +572,11 @@ function morphdom(
                     // not compatible with the current "to" node
                     curFromNodeChild = fromComponent.___endNode.nextSibling;
 
-                    if (!globalComponentsContext.___renderedComponentsById[fromComponent.id]) {
+                    if (
+                        !globalComponentsContext.___renderedComponentsById[
+                            fromComponent.id
+                        ]
+                    ) {
                         destroyComponent(fromComponent);
                     }
 
@@ -421,28 +595,45 @@ function morphdom(
                         curVFromNodeChild = curFromNodeChild.___markoVElement;
                         if (curVFromNodeChild === undefined) {
                             if (isRerenderInBrowser === true) {
-                                curVFromNodeChild = virtualizeElement(curFromNodeChild);
+                                curVFromNodeChild = virtualizeElement(
+                                    curFromNodeChild
+                                );
                             } else {
                                 // Skip over nodes that don't look like ours...
                                 curFromNodeChild = fromNextSibling;
                                 continue;
                             }
-                        } else if ((curFromNodeKey = curVFromNodeChild.___key)) {
+                        } else if (
+                            (curFromNodeKey = curVFromNodeChild.___key)
+                        ) {
                             // We have a keyed element here but our target VDOM node
                             // is not keyed so this not doesn't belong
                             isCompatible = false;
                         }
 
-                        isCompatible = isCompatible !== false && compareNodeNames(curVFromNodeChild, curToNodeChild) === true;
+                        isCompatible =
+                            isCompatible !== false &&
+                            compareNodeNames(
+                                curVFromNodeChild,
+                                curToNodeChild
+                            ) === true;
 
                         if (isCompatible === true) {
                             // We found compatible DOM elements so transform
                             // the current "from" node to match the current
                             // target DOM node.
-                            morphEl(curFromNodeChild, curVFromNodeChild, curToNodeChild, component, curToNodeKey);
+                            morphEl(
+                                curFromNodeChild,
+                                curVFromNodeChild,
+                                curToNodeChild,
+                                component,
+                                curToNodeKey
+                            );
                         }
-
-                    } else if (curFromNodeType === TEXT_NODE || curFromNodeType === COMMENT_NODE) {
+                    } else if (
+                        curFromNodeType === TEXT_NODE ||
+                        curFromNodeType === COMMENT_NODE
+                    ) {
                         // Both nodes being compared are Text or Comment nodes
                         isCompatible = true;
                         // Simply update nodeValue on the original node to
@@ -451,23 +642,42 @@ function morphdom(
                         var content = curFromNodeChild.nodeValue;
                         if (content == curToNodeChild.___nodeValue) {
                             if (/^F\^/.test(content)) {
-                                var closingContent = content.replace(/^F\^/, 'F/');
-                                while((curFromNodeChild = curFromNodeChild.nextSibling)) {
-                                    if (curFromNodeChild.nodeValue === closingContent) {
+                                var closingContent = content.replace(
+                                    /^F\^/,
+                                    "F/"
+                                );
+                                while (
+                                    (curFromNodeChild =
+                                        curFromNodeChild.nextSibling)
+                                ) {
+                                    if (
+                                        curFromNodeChild.nodeValue ===
+                                        closingContent
+                                    ) {
                                         break;
                                     }
                                 }
-                                while((curToNodeChild = curToNodeChild.___nextSibling)) {
-                                    if (curToNodeChild.___nodeValue === closingContent) {
+                                while (
+                                    (curToNodeChild =
+                                        curToNodeChild.___nextSibling)
+                                ) {
+                                    if (
+                                        curToNodeChild.___nodeValue ===
+                                        closingContent
+                                    ) {
                                         break;
                                     }
                                 }
                                 curToNodeChild = curToNodeChild.___nextSibling;
-                                curFromNodeChild = curFromNodeChild === endNode ? null : curFromNodeChild.nextSibling;
+                                curFromNodeChild =
+                                    curFromNodeChild === endNode
+                                        ? null
+                                        : curFromNodeChild.nextSibling;
                                 continue outer;
                             }
                         } else {
-                            curFromNodeChild.nodeValue = curToNodeChild.___nodeValue;
+                            curFromNodeChild.nodeValue =
+                                curToNodeChild.___nodeValue;
                         }
                     }
                 }
@@ -480,11 +690,23 @@ function morphdom(
                 }
 
                 if (curFromNodeKey) {
-                    if (globalComponentsContext.___preservedEls[curFromNodeKey] === undefined) {
-                        detachNode(curFromNodeChild, parentFromNode, componentForNode);
+                    if (
+                        globalComponentsContext.___preservedEls[
+                            curFromNodeKey
+                        ] === undefined
+                    ) {
+                        detachNode(
+                            curFromNodeChild,
+                            parentFromNode,
+                            componentForNode
+                        );
                     }
                 } else {
-                    detachNode(curFromNodeChild, parentFromNode, componentForNode);
+                    detachNode(
+                        curFromNodeChild,
+                        parentFromNode,
+                        componentForNode
+                    );
                 }
 
                 curFromNodeChild = fromNextSibling;
@@ -494,7 +716,13 @@ function morphdom(
             // our "to node" and we exhausted all of the children "from"
             // nodes. Therefore, we will just append the current "to" node
             // to the end
-            insertVirtualNodeBefore(curToNodeChild, curToNodeKey, curFromNodeChild, parentFromNode, componentForNode);
+            insertVirtualNodeBefore(
+                curToNodeChild,
+                curToNodeKey,
+                curFromNodeChild,
+                parentFromNode,
+                componentForNode
+            );
 
             curToNodeChild = toNextSibling;
             curFromNodeChild = fromNextSibling;
@@ -503,11 +731,18 @@ function morphdom(
         // We have processed all of the "to nodes". If curFromNodeChild is
         // non-null then we still have some from nodes left over that need
         // to be removed
-        while (curFromNodeChild && (endNode === null || curFromNodeChild !== endNode)) {
+        while (
+            curFromNodeChild &&
+            (endNode === null || curFromNodeChild !== endNode)
+        ) {
             fromNextSibling = curFromNodeChild.nextSibling;
 
             if ((fromComponent = curFromNodeChild.___markoComponent)) {
-                if (globalComponentsContext.___renderedComponentsById[fromComponent.id]) {
+                if (
+                    globalComponentsContext.___renderedComponentsById[
+                        fromComponent.id
+                    ]
+                ) {
                     // Skip over this component since it was rendered in the target VDOM
                     // and will be moved into place later
                     curFromNodeChild = fromComponent.___endNode.nextSibling;
@@ -519,7 +754,9 @@ function morphdom(
 
             // For transcluded content, we need to check if the element belongs to a different component
             // context than the current component and ensure it gets removed from its key index.
-            fromComponent = curVFromNodeChild && curVFromNodeChild.___component || component;
+            fromComponent =
+                (curVFromNodeChild && curVFromNodeChild.___component) ||
+                component;
 
             detachNode(curFromNodeChild, parentFromNode, fromComponent);
 
@@ -541,12 +778,15 @@ function morphdom(
 
         morphAttrs(fromEl, vFromEl, toEl);
 
-        if (toElKey && globalComponentsContext.___preservedElBodies[toElKey] === true) {
+        if (
+            toElKey &&
+            globalComponentsContext.___preservedElBodies[toElKey] === true
+        ) {
             // Don't morph the children since they are preserved
             return;
         }
 
-        if (nodeName !== 'TEXTAREA') {
+        if (nodeName !== "TEXTAREA") {
             morphChildren(fromEl, fromEl.firstChild, null, toEl, component);
         }
 
@@ -568,14 +808,16 @@ function morphdom(
             if (componentToDestroy) {
                 componentToDestroy.destroy();
             } else if (node.parentNode) {
-                destroyNodeRecursive(node, detachedFromComponent !== true && detachedFromComponent);
+                destroyNodeRecursive(
+                    node,
+                    detachedFromComponent !== true && detachedFromComponent
+                );
 
                 if (eventDelegation.___handleNodeDetach(node) != false) {
-                     node.parentNode.removeChild(node);
+                    node.parentNode.removeChild(node);
                 }
             }
         }
-
     });
 }
 
diff --git a/src/morphdom/specialElHandlers.js b/src/morphdom/specialElHandlers.js
index 5e684620f..0dea90513 100644
--- a/src/morphdom/specialElHandlers.js
+++ b/src/morphdom/specialElHandlers.js
@@ -2,9 +2,9 @@ function syncBooleanAttrProp(fromEl, toEl, name) {
     if (fromEl[name] !== toEl[name]) {
         fromEl[name] = toEl[name];
         if (fromEl[name]) {
-            fromEl.setAttribute(name, '');
+            fromEl.setAttribute(name, "");
         } else {
-            fromEl.removeAttribute(name, '');
+            fromEl.removeAttribute(name, "");
         }
     }
 }
@@ -17,7 +17,7 @@ SpecialElHandlers.prototype = {
      * attribute when reading over the attributes using selectEl.attributes
      */
     OPTION: function(fromEl, toEl) {
-        syncBooleanAttrProp(fromEl, toEl, 'selected');
+        syncBooleanAttrProp(fromEl, toEl, "selected");
     },
     /**
      * The "value" attribute is special for the <input> element since it sets
@@ -26,15 +26,15 @@ SpecialElHandlers.prototype = {
      * initial value.  Similar for the "checked" attribute, and "disabled".
      */
     INPUT: function(fromEl, toEl) {
-        syncBooleanAttrProp(fromEl, toEl, 'checked');
-        syncBooleanAttrProp(fromEl, toEl, 'disabled');
+        syncBooleanAttrProp(fromEl, toEl, "checked");
+        syncBooleanAttrProp(fromEl, toEl, "disabled");
 
         if (fromEl.value != toEl.___value) {
             fromEl.value = toEl.___value;
         }
 
-        if (!toEl.___hasAttribute('value')) {
-            fromEl.removeAttribute('value');
+        if (!toEl.___hasAttribute("value")) {
+            fromEl.removeAttribute("value");
         }
     },
 
@@ -50,7 +50,10 @@ SpecialElHandlers.prototype = {
             // node value and vise versa. This ignores an empty update.
             var oldValue = firstChild.nodeValue;
 
-            if (oldValue == newValue || (!newValue && oldValue == fromEl.placeholder)) {
+            if (
+                oldValue == newValue ||
+                (!newValue && oldValue == fromEl.placeholder)
+            ) {
                 return;
             }
 
@@ -58,17 +61,15 @@ SpecialElHandlers.prototype = {
         }
     },
     SELECT: function(fromEl, toEl) {
-        if (!toEl.___hasAttribute('multiple')) {
-            var selectedIndex = -1;
-            var i = 0;
+        if (!toEl.___hasAttribute("multiple")) {
+            var i = -1;
             var curChild = toEl.___firstChild;
-            while(curChild) {
-                if (curChild.___nodeName == 'OPTION') {
-                    if (curChild.___hasAttribute('selected')) {
-                        selectedIndex = i;
+            while (curChild) {
+                if (curChild.___nodeName == "OPTION") {
+                    i++;
+                    if (curChild.___hasAttribute("selected")) {
                         break;
                     }
-                    i++;
                 }
                 curChild = curChild.___nextSibling;
             }
diff --git a/src/node-require/index-browser.js b/src/node-require/index-browser.js
index 62ab746d1..d85bc626e 100644
--- a/src/node-require/index-browser.js
+++ b/src/node-require/index-browser.js
@@ -1 +1 @@
-exports.install = function() {};
\ No newline at end of file
+exports.install = function() {};
diff --git a/src/node-require/index.js b/src/node-require/index.js
index 39d6eb0db..21c30ddfe 100644
--- a/src/node-require/index.js
+++ b/src/node-require/index.js
@@ -1,22 +1,26 @@
-'use strict';
-require('../');
+"use strict";
+require("../");
 
-const path = require('path');
-const resolveFrom = require('resolve-from');
-const fs = require('fs');
-const fsReadOptions = { encoding: 'utf8' };
-const MARKO_EXTENSIONS = Symbol('MARKO_EXTENSIONS');
+const path = require("path");
+const resolveFrom = require("resolve-from");
+const fs = require("fs");
+const fsReadOptions = { encoding: "utf8" };
+const MARKO_EXTENSIONS = Symbol("MARKO_EXTENSIONS");
 
 function normalizeExtension(extension) {
-    if (extension.charAt(0) !== '.') {
-        extension = '.' + extension;
+    if (extension.charAt(0) !== ".") {
+        extension = "." + extension;
     }
     return extension;
 }
 
 function compile(templatePath, markoCompiler, compilerOptions) {
     if (compilerOptions) {
-        compilerOptions = Object.assign({}, markoCompiler.defaultOptions, compilerOptions);
+        compilerOptions = Object.assign(
+            {},
+            markoCompiler.defaultOptions,
+            compilerOptions
+        );
     } else {
         compilerOptions = markoCompiler.defaultOptions;
     }
@@ -33,9 +37,12 @@ function compile(templatePath, markoCompiler, compilerOptions) {
         templateSrc = fs.readFileSync(templatePath, fsReadOptions);
         compiledSrc = markoCompiler.compile(templateSrc, templatePath);
     } else {
-        var targetFile = templatePath + '.js';
+        var targetFile = templatePath + ".js";
 
-        if (markoCompiler.defaultOptions.assumeUpToDate && fs.existsSync(targetFile)) {
+        if (
+            markoCompiler.defaultOptions.assumeUpToDate &&
+            fs.existsSync(targetFile)
+        ) {
             // If the target file already exists and "assumeUpToDate" then just use the previously
             // compiled template.
             return fs.readFileSync(targetFile, fsReadOptions);
@@ -49,14 +56,21 @@ function compile(templatePath, markoCompiler, compilerOptions) {
             compiledSrc = fs.readFileSync(targetFile, fsReadOptions);
         } else {
             templateSrc = fs.readFileSync(templatePath, fsReadOptions);
-        	compiledSrc = markoCompiler.compile(templateSrc, templatePath, compilerOptions);
+            compiledSrc = markoCompiler.compile(
+                templateSrc,
+                templatePath,
+                compilerOptions
+            );
 
             // Write to a temporary file and move it into place to avoid problems
             // assocatiated with multiple processes write to the same file. We only
             // write the compiled source code to disk so that stack traces will
             // be accurate.
             var filename = path.basename(targetFile);
-            var tempFile = path.join(targetDir, '.' + process.pid + '.' + Date.now() + '.' + filename);
+            var tempFile = path.join(
+                targetDir,
+                "." + process.pid + "." + Date.now() + "." + filename
+            );
             fs.writeFileSync(tempFile, compiledSrc, fsReadOptions);
             fs.renameSync(tempFile, targetFile);
         }
@@ -74,14 +88,14 @@ function getLoadedTemplate(path) {
 function install(options) {
     options = options || {};
 
-    var requireExtensions = options.require ? // options.require introduced for testing
-        options.require.extensions :
-        require.extensions;
+    var requireExtensions = options.require // options.require introduced for testing
+        ? options.require.extensions
+        : require.extensions;
 
     var compilerOptions = options.compilerOptions;
 
     if (compilerOptions) {
-        require('../compiler').configure(compilerOptions);
+        require("../compiler").configure(compilerOptions);
     } else {
         compilerOptions = {};
     }
@@ -97,12 +111,13 @@ function install(options) {
     }
 
     if (extensions.length === 0) {
-        extensions.push('.marko');
+        extensions.push(".marko");
     }
 
     function markoRequireExtension(module, filename) {
-        var targetFile = filename + '.js';
-        var cachedTemplate = getLoadedTemplate(targetFile) || getLoadedTemplate(filename);
+        var targetFile = filename + ".js";
+        var cachedTemplate =
+            getLoadedTemplate(targetFile) || getLoadedTemplate(filename);
         if (cachedTemplate) {
             // The template has already been loaded so use the exports of the already loaded template
             module.exports = cachedTemplate;
@@ -112,7 +127,7 @@ function install(options) {
         // Resolve the appropriate compiler relative to the location of the
         // marko template file on disk using the "resolve-from" module.
         var dirname = path.dirname(filename);
-        var markoCompilerModulePath = resolveFrom(dirname, 'marko/compiler');
+        var markoCompilerModulePath = resolveFrom(dirname, "marko/compiler");
         var markoCompiler = require(markoCompilerModulePath);
 
         // Now use the appropriate Marko compiler to compile the Marko template
@@ -124,10 +139,11 @@ function install(options) {
         module._compile(compiledSrc, targetFile);
     }
 
-    requireExtensions[MARKO_EXTENSIONS] = requireExtensions[MARKO_EXTENSIONS] ||
+    requireExtensions[MARKO_EXTENSIONS] =
+        requireExtensions[MARKO_EXTENSIONS] ||
         (requireExtensions[MARKO_EXTENSIONS] = []);
 
-    extensions.forEach((extension) => {
+    extensions.forEach(extension => {
         extension = normalizeExtension(extension);
         requireExtensions[extension] = markoRequireExtension;
         requireExtensions[MARKO_EXTENSIONS].push(extension);
diff --git a/src/runtime/RenderResult.js b/src/runtime/RenderResult.js
index abf2cb305..ba303d01a 100644
--- a/src/runtime/RenderResult.js
+++ b/src/runtime/RenderResult.js
@@ -1,28 +1,28 @@
-var domInsert = require('./dom-insert');
+var domInsert = require("./dom-insert");
 
 function getComponentDefs(result) {
     var componentDefs = result.___components;
 
     if (!componentDefs) {
-        throw Error('No component');
+        throw Error("No component");
     }
     return componentDefs;
 }
 
 function RenderResult(out) {
-   this.out = this.___out = out;
-   this.___components = undefined;
+    this.out = this.___out = out;
+    this.___components = undefined;
 }
 
 module.exports = RenderResult;
 
-var proto = RenderResult.prototype = {
+var proto = (RenderResult.prototype = {
     getComponent: function() {
         return this.getComponents()[0];
     },
     getComponents: function(selector) {
         if (this.___components === undefined) {
-            throw Error('Not added to DOM');
+            throw Error("Not added to DOM");
         }
 
         var componentDefs = getComponentDefs(this);
@@ -59,8 +59,8 @@ var proto = RenderResult.prototype = {
     toString: function() {
         return this.___out.toString();
     },
-    document: typeof document != 'undefined' && document
-};
+    document: typeof document != "undefined" && document
+});
 
 // Add all of the following DOM methods to Component.prototype:
 // - appendTo(referenceEl)
@@ -75,6 +75,11 @@ domInsert(
         return renderResult.getNode(referenceEl.ownerDocument);
     },
     function afterInsert(renderResult, referenceEl) {
-        var isShadow = typeof ShadowRoot === 'function' && referenceEl instanceof ShadowRoot;
-        return renderResult.afterInsert(isShadow ? referenceEl : referenceEl.ownerDocument);
-    });
+        var isShadow =
+            typeof ShadowRoot === "function" &&
+            referenceEl instanceof ShadowRoot;
+        return renderResult.afterInsert(
+            isShadow ? referenceEl : referenceEl.ownerDocument
+        );
+    }
+);
diff --git a/src/runtime/dom-insert.js b/src/runtime/dom-insert.js
index 8348a5c61..bebcb9197 100644
--- a/src/runtime/dom-insert.js
+++ b/src/runtime/dom-insert.js
@@ -1,14 +1,14 @@
-var extend = require('raptor-util/extend');
-var componentsUtil = require('../components/util');
+var extend = require("raptor-util/extend");
+var componentsUtil = require("../components/util");
 var destroyComponentForNode = componentsUtil.___destroyComponentForNode;
 var destroyNodeRecursive = componentsUtil.___destroyNodeRecursive;
 
 function resolveEl(el) {
-    if (typeof el == 'string') {
+    if (typeof el == "string") {
         var elId = el;
         el = document.getElementById(elId);
         if (!el) {
-            throw Error('Not found: ' + elId);
+            throw Error("Not found: " + elId);
         }
     }
     return el;
@@ -45,13 +45,13 @@ module.exports = function(target, getEl, afterInsert) {
             var el = getEl(this, referenceEl);
 
             var curChild = referenceEl.firstChild;
-            while(curChild) {
+            while (curChild) {
                 var nextSibling = curChild.nextSibling; // Just in case the DOM changes while removing
                 beforeRemove(curChild);
                 curChild = nextSibling;
             }
 
-            referenceEl.innerHTML = '';
+            referenceEl.innerHTML = "";
             referenceEl.appendChild(el);
             return afterInsert(this, referenceEl);
         },
@@ -64,7 +64,6 @@ module.exports = function(target, getEl, afterInsert) {
         insertAfter: function(referenceEl) {
             referenceEl = resolveEl(referenceEl);
             var el = getEl(this, referenceEl);
-            el = el;
             var nextSibling = referenceEl.nextSibling;
             var parentNode = referenceEl.parentNode;
             if (nextSibling) {
diff --git a/src/runtime/events.js b/src/runtime/events.js
index 94f6a32a0..d08281bbf 100644
--- a/src/runtime/events.js
+++ b/src/runtime/events.js
@@ -1,2 +1,2 @@
-var EventEmitter = require('events-light');
-module.exports = new EventEmitter();
\ No newline at end of file
+var EventEmitter = require("events-light");
+module.exports = new EventEmitter();
diff --git a/src/runtime/helper-forEachPropStatusVar.js b/src/runtime/helper-forEachPropStatusVar.js
index 4537b60db..9b1009648 100644
--- a/src/runtime/helper-forEachPropStatusVar.js
+++ b/src/runtime/helper-forEachPropStatusVar.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 function LoopStatus(getLength, isLast, isFirst, getIndex) {
     this.getLength = getLength;
@@ -13,22 +13,23 @@ module.exports = function forEachPropStatusVarHelper(object, callback) {
     var i = 0;
     var len = keys.length;
     var loopStatus = new LoopStatus(
-            function getLength() {
-                return len;
-            },
-            function isLast() {
-                return i === len - 1;
-            },
-            function isFirst() {
-                return i === 0;
-            },
-            function getIndex() {
-                return i;
-            });
+        function getLength() {
+            return len;
+        },
+        function isLast() {
+            return i === len - 1;
+        },
+        function isFirst() {
+            return i === 0;
+        },
+        function getIndex() {
+            return i;
+        }
+    );
 
     for (; i < len; i++) {
         var key = keys[i];
         var value = object[key];
         callback(key, value, loopStatus);
     }
-};
\ No newline at end of file
+};
diff --git a/src/runtime/helper-forEachProperty.js b/src/runtime/helper-forEachProperty.js
index 5232803d9..041940020 100644
--- a/src/runtime/helper-forEachProperty.js
+++ b/src/runtime/helper-forEachProperty.js
@@ -10,10 +10,10 @@ module.exports = function forEachPropertyHelper(o, func) {
     }
 
     if (isArray(o)) {
-        for (var i=0; i<o.length; i++) {
+        for (var i = 0; i < o.length; i++) {
             func(i, o[i]);
         }
-    } else if (typeof Map !== 'undefined' && o instanceof Map) {
+    } else if (typeof Map !== "undefined" && o instanceof Map) {
         o.forEach(function(v, k) {
             func(k, v);
         });
diff --git a/src/runtime/helper-forEachWithStatusVar.js b/src/runtime/helper-forEachWithStatusVar.js
index 74e3ab3e8..be11f1780 100644
--- a/src/runtime/helper-forEachWithStatusVar.js
+++ b/src/runtime/helper-forEachWithStatusVar.js
@@ -37,4 +37,4 @@ module.exports = function forEachStatusVariableHelper(array, callback) {
         var o = array[loopStatus.i];
         callback(o, loopStatus);
     }
-};
\ No newline at end of file
+};
diff --git a/src/runtime/helper-forRange.js b/src/runtime/helper-forRange.js
index b83da136e..4d1253a5c 100644
--- a/src/runtime/helper-forRange.js
+++ b/src/runtime/helper-forRange.js
@@ -1,18 +1,15 @@
 module.exports = function forRangeHelper(from, to, step, callback) {
-    if (step == null) {
-        step = from <= to ? 1 : -1;
-    }
-
     var i;
 
-    if (step > 0) {
-        for (i=from; i<=to; i += step) {
+    step = step == null ? 1 : Math.abs(step);
+
+    if (from < to) {
+        for (i = from; i <= to; i += step) {
             callback(i);
         }
     } else {
-        for (i=from; i>=to; i += step) {
+        for (i = from; i >= to; i -= step) {
             callback(i);
         }
     }
-
-};
\ No newline at end of file
+};
diff --git a/src/runtime/helper-loadNestedTag.js b/src/runtime/helper-loadNestedTag.js
index 9e06cb59e..1ffb9bf3e 100644
--- a/src/runtime/helper-loadNestedTag.js
+++ b/src/runtime/helper-loadNestedTag.js
@@ -12,4 +12,4 @@ module.exports = function loadNestedTagHelper(targetProperty, isRepeated) {
             parent[targetProperty] = input;
         }
     };
-};
\ No newline at end of file
+};
diff --git a/src/runtime/helper-loadTemplate.js b/src/runtime/helper-loadTemplate.js
index 7a1e46d73..346cf1c16 100644
--- a/src/runtime/helper-loadTemplate.js
+++ b/src/runtime/helper-loadTemplate.js
@@ -1,4 +1,4 @@
 /**
  * Loads a template
  */
-module.exports = require('../loader');
+module.exports = require("../loader");
diff --git a/src/runtime/helper-merge.js b/src/runtime/helper-merge.js
index 49ad769e3..cc3a4027a 100644
--- a/src/runtime/helper-merge.js
+++ b/src/runtime/helper-merge.js
@@ -13,4 +13,4 @@ function merge(into, source) {
     return into;
 }
 
-module.exports = merge;
\ No newline at end of file
+module.exports = merge;
diff --git a/src/runtime/helper-mergeNestedTags.js b/src/runtime/helper-mergeNestedTags.js
index e1a33fa6c..cf0a126c2 100644
--- a/src/runtime/helper-mergeNestedTags.js
+++ b/src/runtime/helper-mergeNestedTags.js
@@ -12,4 +12,4 @@ function mergeNestedTags(input) {
     return input;
 }
 
-module.exports = mergeNestedTags;
\ No newline at end of file
+module.exports = mergeNestedTags;
diff --git a/src/runtime/helpers.js b/src/runtime/helpers.js
index 4177905fc..0fc45cae3 100644
--- a/src/runtime/helpers.js
+++ b/src/runtime/helpers.js
@@ -1,23 +1,23 @@
-'use strict';
+"use strict";
 var isArray = Array.isArray;
 
 function isFunction(arg) {
-    return typeof arg == 'function';
+    return typeof arg == "function";
 }
 
 function classList(arg, classNames) {
     var len;
 
     if (arg) {
-        if (typeof arg == 'string') {
+        if (typeof arg == "string") {
             if (arg) {
                 classNames.push(arg);
             }
-        } else if (typeof (len = arg.length) == 'number') {
-            for (var i=0; i<len; i++) {
+        } else if (typeof (len = arg.length) == "number") {
+            for (var i = 0; i < len; i++) {
                 classList(arg[i], classNames);
             }
-        } else if (typeof arg == 'object') {
+        } else if (typeof arg == "object") {
             for (var name in arg) {
                 if (arg.hasOwnProperty(name)) {
                     var value = arg[name];
@@ -40,7 +40,7 @@ function createDeferredRenderer(handler) {
     deferredRenderer.renderer = function(input, out) {
         var rendererFunc = handler.renderer || handler._ || handler.render;
         if (!isFunction(rendererFunc)) {
-            throw Error('Invalid renderer');
+            throw Error("Invalid renderer");
         }
         // Use the actual renderer from now on
         deferredRenderer.renderer = rendererFunc;
@@ -75,7 +75,7 @@ var helpers = {
      * @private
      */
     s: function strHelper(str) {
-        return (str == null) ? '' : str.toString();
+        return str == null ? "" : str.toString();
     },
 
     /**
@@ -84,7 +84,7 @@ var helpers = {
      */
     f: function forEachHelper(array, callback) {
         if (isArray(array)) {
-            for (var i=0; i<array.length; i++) {
+            for (var i = 0; i < array.length; i++) {
                 callback(array[i]);
             }
         } else if (isFunction(array)) {
@@ -96,12 +96,18 @@ var helpers = {
     /**
      * Helper to load a custom tag
      */
-    t: function loadTagHelper(renderer, targetProperty, isRepeated) {
+    t: function loadTagHelper(renderer) {
         if (renderer) {
             renderer = resolveRenderer(renderer);
         }
 
-        return function wrappedRenderer(input, out, componentDef, key, customEvents) {
+        return function wrappedRenderer(
+            input,
+            out,
+            componentDef,
+            key,
+            customEvents
+        ) {
             out.c(componentDef, key, customEvents);
             renderer(input, out);
             out.___assignedComponentDef = null;
@@ -118,7 +124,7 @@ var helpers = {
     cl: function classListHelper() {
         var classNames = [];
         classList(arguments, classNames);
-        return classNames.join(' ');
+        return classNames.join(" ");
     }
 };
 
diff --git a/src/runtime/html/AsyncStream.js b/src/runtime/html/AsyncStream.js
index 84c3da462..d62223e3e 100644
--- a/src/runtime/html/AsyncStream.js
+++ b/src/runtime/html/AsyncStream.js
@@ -1,13 +1,13 @@
-'use strict';
-var EventEmitter = require('events-light');
-var StringWriter = require('./StringWriter');
-var BufferedWriter = require('./BufferedWriter');
-var defaultDocument = typeof document != 'undefined' && document;
-var RenderResult = require('../RenderResult');
-var attrsHelper = require('./helper-attrs');
-var escapeXml = require('./escape').escapeXml;
+"use strict";
+var EventEmitter = require("events-light");
+var StringWriter = require("./StringWriter");
+var BufferedWriter = require("./BufferedWriter");
+var defaultDocument = typeof document != "undefined" && document;
+var RenderResult = require("../RenderResult");
+var attrsHelper = require("./helper-attrs");
+var escapeXml = require("./escape").escapeXml;
 
-var voidWriter = { write:function(){} };
+var voidWriter = { write: function() {} };
 
 function State(root, stream, writer, events) {
     this.root = root;
@@ -19,11 +19,10 @@ function State(root, stream, writer, events) {
 }
 
 function AsyncStream(global, writer, parentOut, shouldBuffer) {
-
     if (parentOut === null) {
-        throw new Error('illegal state');
+        throw new Error("illegal state");
     }
-    var finalGlobal = this.attributes = global || {};
+    var finalGlobal = (this.attributes = global || {});
     var originalStream;
     var state;
 
@@ -31,7 +30,8 @@ function AsyncStream(global, writer, parentOut, shouldBuffer) {
         state = parentOut._state;
         originalStream = state.stream;
     } else {
-        var events = finalGlobal.events /* deprecated */ = writer && writer.on ? writer : new EventEmitter();
+        var events = (finalGlobal.events /* deprecated */ =
+            writer && writer.on ? writer : new EventEmitter());
 
         if (writer) {
             originalStream = writer;
@@ -78,19 +78,19 @@ function AsyncStream(global, writer, parentOut, shouldBuffer) {
 AsyncStream.DEFAULT_TIMEOUT = 10000;
 
 /**
-* If set to `true`, AsyncStream errors will include the full stack trace
-*/
+ * If set to `true`, AsyncStream errors will include the full stack trace
+ */
 AsyncStream.INCLUDE_STACK =
-    typeof process !== 'undefined' &&
+    typeof process !== "undefined" &&
     (!process.env.NODE_ENV ||
-        process.env.NODE_ENV === 'development' ||
-        process.env.NODE_ENV === 'dev');
+        process.env.NODE_ENV === "development" ||
+        process.env.NODE_ENV === "dev");
 
 AsyncStream.enableAsyncStackTrace = function() {
     AsyncStream.INCLUDE_STACK = true;
 };
 
-var proto = AsyncStream.prototype = {
+var proto = (AsyncStream.prototype = {
     constructor: AsyncStream,
     ___document: defaultDocument,
     ___isOut: true,
@@ -132,7 +132,7 @@ var proto = AsyncStream.prototype = {
 
     beginAsync: function(options) {
         if (this._sync) {
-            throw new Error('beginAsync() not allowed when using renderSync()');
+            throw new Error("beginAsync() not allowed when using renderSync()");
         }
 
         var state = this._state;
@@ -156,52 +156,60 @@ var proto = AsyncStream.prototype = {
            ┃ NOW ┃               ↓↑              ↓↑
            ┗━━━━━┛  prevWriter → currentWriter → newWriter → nextWriter  */
 
-       var timeout;
-       var name;
+        var timeout;
+        var name;
 
-       this._remaining++;
+        this._remaining++;
 
-       if (options != null) {
-           if (typeof options === 'number') {
-               timeout = options;
-           } else {
-               timeout = options.timeout;
+        if (options != null) {
+            if (typeof options === "number") {
+                timeout = options;
+            } else {
+                timeout = options.timeout;
 
-               if (options.last === true) {
-                   if (timeout == null) {
-                       // Don't assign a timeout to last flush fragments
-                       // unless it is explicitly given a timeout
-                       timeout = 0;
-                   }
+                if (options.last === true) {
+                    if (timeout == null) {
+                        // Don't assign a timeout to last flush fragments
+                        // unless it is explicitly given a timeout
+                        timeout = 0;
+                    }
 
-                   this._lastCount++;
-               }
+                    this._lastCount++;
+                }
 
-               name = options.name;
-           }
-       }
+                name = options.name;
+            }
+        }
 
-       if (timeout == null) {
-           timeout = AsyncStream.DEFAULT_TIMEOUT;
-       }
+        if (timeout == null) {
+            timeout = AsyncStream.DEFAULT_TIMEOUT;
+        }
 
-       newStream._stack = AsyncStream.INCLUDE_STACK ? new Error().stack : null;
-       newStream.name = name;
+        newStream._stack = AsyncStream.INCLUDE_STACK ? new Error().stack : null;
+        newStream.name = name;
 
-       if (timeout > 0) {
-           newStream._timeoutId = setTimeout(function() {
-               newStream.error(new Error('Async fragment ' + (name ? '(' + name + ') ': '') + 'timed out after ' + timeout + 'ms'));
-           }, timeout);
-       }
+        if (timeout > 0) {
+            newStream._timeoutId = setTimeout(function() {
+                newStream.error(
+                    new Error(
+                        "Async fragment " +
+                            (name ? "(" + name + ") " : "") +
+                            "timed out after " +
+                            timeout +
+                            "ms"
+                    )
+                );
+            }, timeout);
+        }
 
-       state.events.emit('beginAsync', {
-           writer: newStream, // Legacy
-           parentWriter: this, // Legacy
-           out: newStream,
-           parentOut: this
-       });
+        state.events.emit("beginAsync", {
+            writer: newStream, // Legacy
+            parentWriter: this, // Legacy
+            out: newStream,
+            parentOut: this
+        });
 
-       return newStream;
+        return newStream;
     },
 
     _doFinish: function() {
@@ -212,7 +220,7 @@ var proto = AsyncStream.prototype = {
         if (state.writer.end) {
             state.writer.end();
         } else {
-            state.events.emit('finish', this.___getResult());
+            state.events.emit("finish", this.___getResult());
         }
     },
 
@@ -248,29 +256,29 @@ var proto = AsyncStream.prototype = {
            ┃     ┃  ──────────────┴────────────────────────────────
            ┗━━━━━┛    Flushed & garbage collected: nextWriter  */
 
-       var parentOut = this._parentOut;
+        var parentOut = this._parentOut;
 
-       if (parentOut === undefined) {
-           if (remaining === 0) {
-               this._doFinish();
-           } else if (remaining - this._lastCount === 0) {
-               this._emitLast();
-           }
-       } else {
-           var timeoutId = this._timeoutId;
+        if (parentOut === undefined) {
+            if (remaining === 0) {
+                this._doFinish();
+            } else if (remaining - this._lastCount === 0) {
+                this._emitLast();
+            }
+        } else {
+            var timeoutId = this._timeoutId;
 
-           if (timeoutId) {
-               clearTimeout(timeoutId);
-           }
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
 
-           if (remaining === 0) {
-               parentOut._handleChildDone();
-           } else if (remaining - this._lastCount === 0) {
-               this._emitLast();
-           }
-       }
+            if (remaining === 0) {
+                parentOut._handleChildDone();
+            } else if (remaining - this._lastCount === 0) {
+                this._emitLast();
+            }
+        }
 
-       return this;
+        return this;
     },
 
     _handleChildDone: function() {
@@ -318,9 +326,9 @@ var proto = AsyncStream.prototype = {
     on: function(event, callback) {
         var state = this._state;
 
-        if (event === 'finish' && state.finished === true) {
+        if (event === "finish" && state.finished === true) {
             callback(this.___getResult());
-        } else if (event === 'last') {
+        } else if (event === "last") {
             this.onLast(callback);
         } else {
             state.events.on(event, callback);
@@ -332,9 +340,9 @@ var proto = AsyncStream.prototype = {
     once: function(event, callback) {
         var state = this._state;
 
-        if (event === 'finish' && state.finished === true) {
+        if (event === "finish" && state.finished === true) {
             callback(this.___getResult());
-        } else if (event === 'last') {
+        } else if (event === "last") {
             this.onLast(callback);
         } else {
             state.events.once(event, callback);
@@ -377,7 +385,7 @@ var proto = AsyncStream.prototype = {
 
     emit: function(type, arg) {
         var events = this._state.events;
-        switch(arguments.length) {
+        switch (arguments.length) {
             case 1:
                 events.emit(type);
                 break;
@@ -415,21 +423,21 @@ var proto = AsyncStream.prototype = {
         var message;
 
         if (name) {
-            message = 'Render async fragment error (' + name + ')';
+            message = "Render async fragment error (" + name + ")";
         } else {
-            message = 'Render error';
+            message = "Render error";
         }
 
-        message += '. Exception: ' + (e.stack || e);
+        message += ". Exception: " + (e.stack || e);
 
         if (stack) {
-            message += '\nCreation stack trace: ' + stack;
+            message += "\nCreation stack trace: " + stack;
         }
 
         e = new Error(message);
 
         try {
-            this.emit('error', e);
+            this.emit("error", e);
         } finally {
             // If there is no listener for the error event then it will
             // throw a new here. In order to ensure that the async fragment
@@ -438,10 +446,6 @@ var proto = AsyncStream.prototype = {
             this.end();
         }
 
-        if (console) {
-            console.error(message);
-        }
-
         return this;
     },
 
@@ -462,22 +466,17 @@ var proto = AsyncStream.prototype = {
     },
 
     element: function(tagName, elementAttrs, openTagOnly) {
-        var str = '<' + tagName +
-            attrsHelper(elementAttrs) +
-            '>';
+        var str = "<" + tagName + attrsHelper(elementAttrs) + ">";
 
         if (openTagOnly !== true) {
-            str += '</' + tagName + '>';
+            str += "</" + tagName + ">";
         }
 
         this.write(str);
     },
 
     beginElement: function(name, elementAttrs) {
-
-        var str = '<' + name +
-            attrsHelper(elementAttrs) +
-            '>';
+        var str = "<" + name + attrsHelper(elementAttrs) + ">";
 
         this.write(str);
 
@@ -490,11 +489,11 @@ var proto = AsyncStream.prototype = {
 
     endElement: function() {
         var tagName = this._elStack.pop();
-        this.write('</' + tagName + '>');
+        this.write("</" + tagName + ">");
     },
 
     comment: function(str) {
-        this.write('<!--' + escapeXml(str) + '-->');
+        this.write("<!--" + escapeXml(str) + "-->");
     },
 
     text: function(str) {
@@ -513,7 +512,7 @@ var proto = AsyncStream.prototype = {
 
         if (!node) {
             if (html) {
-                newBodyEl = doc.createElement('body');
+                newBodyEl = doc.createElement("body");
                 newBodyEl.innerHTML = html;
                 if (newBodyEl.childNodes.length == 1) {
                     // If the rendered component resulted in a single node then just use that node
@@ -537,8 +536,8 @@ var proto = AsyncStream.prototype = {
     then: function(fn, fnErr) {
         var out = this;
         var promise = new Promise(function(resolve, reject) {
-            out.on('error', reject);
-            out.on('finish', function(result) {
+            out.on("error", reject);
+            out.on("finish", function(result) {
                 resolve(result);
             });
         });
@@ -555,7 +554,7 @@ var proto = AsyncStream.prototype = {
         this.___assignedKey = key;
         this.___assignedCustomEvents = customEvents;
     }
-};
+});
 
 // alias:
 proto.w = proto.write;
diff --git a/src/runtime/html/BufferedWriter.js b/src/runtime/html/BufferedWriter.js
index cb889f780..3bc94feae 100644
--- a/src/runtime/html/BufferedWriter.js
+++ b/src/runtime/html/BufferedWriter.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * Simple wrapper that can be used to wrap a stream
@@ -7,7 +7,7 @@
  * by reducing the number of chunks by buffering the output.
  */
 function BufferedWriter(wrappedStream) {
-    this._buffer = '';
+    this._buffer = "";
     this._wrapped = wrappedStream;
 }
 
@@ -19,7 +19,7 @@ BufferedWriter.prototype = {
     flush: function() {
         if (this._buffer.length !== 0) {
             this._wrapped.write(this._buffer);
-            this._buffer = '';
+            this._buffer = "";
             if (this._wrapped.flush) {
                 this._wrapped.flush();
             }
@@ -34,8 +34,8 @@ BufferedWriter.prototype = {
     },
 
     clear: function() {
-        this._buffer = '';
+        this._buffer = "";
     }
 };
 
-module.exports = BufferedWriter;
\ No newline at end of file
+module.exports = BufferedWriter;
diff --git a/src/runtime/html/StringWriter.js b/src/runtime/html/StringWriter.js
index 425779ec0..37a1b9691 100644
--- a/src/runtime/html/StringWriter.js
+++ b/src/runtime/html/StringWriter.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
 function StringWriter() {
-    this.str = '';
+    this.str = "";
 }
 
 StringWriter.prototype = {
@@ -20,4 +20,4 @@ StringWriter.prototype = {
     }
 };
 
-module.exports = StringWriter;
\ No newline at end of file
+module.exports = StringWriter;
diff --git a/src/runtime/html/Template.js b/src/runtime/html/Template.js
index 31d8d11c3..f63a706dc 100644
--- a/src/runtime/html/Template.js
+++ b/src/runtime/html/Template.js
@@ -1,15 +1,15 @@
-'use strict';
-var AsyncStream = require('./AsyncStream');
-var makeRenderable = require('../renderable');
-var stream = require('stream');
+"use strict";
+var AsyncStream = require("./AsyncStream");
+var makeRenderable = require("../renderable");
+var stream = require("stream");
 
 class Readable extends stream.Readable {
     constructor(template, data, options) {
-       super();
-       this._t = template;
-       this._d = data;
-       this._shouldBuffer = !options || options.shouldBuffer !== false;
-       this._rendered = false;
+        super();
+        this._t = template;
+        this._d = data;
+        this._shouldBuffer = !options || options.shouldBuffer !== false;
+        this._rendered = false;
     }
 
     write(data) {
diff --git a/src/runtime/html/escape.js b/src/runtime/html/escape.js
index d7fe2c359..e3c36266a 100644
--- a/src/runtime/html/escape.js
+++ b/src/runtime/html/escape.js
@@ -1,14 +1,14 @@
 var elTest = /[&<]/;
 var elTestReplace = /[&<]/g;
-var attrTest = /[&<\"\n]/;
-var attrReplace = /[&<\"\n]/g;
+var attrTest = /[&<"\n]/;
+var attrReplace = /[&<"\n]/g;
 
 var replacements = {
-    '<': '&lt;',
-    '&': '&amp;',
-    '"': '&quot;',
-    '\'': '&#39;',
-    '\n': '&#10;' //Preserve new lines so that they don't get normalized as space
+    "<": "&lt;",
+    "&": "&amp;",
+    '"': "&quot;",
+    "'": "&#39;",
+    "\n": "&#10;" //Preserve new lines so that they don't get normalized as space
 };
 
 function replaceChar(match) {
@@ -21,15 +21,15 @@ function escapeString(str, regexpTest, regexpReplace) {
 
 function escapeXmlHelper(value, regexpTest, regexpReplace) {
     // check for most common case first
-    if (typeof value === 'string') {
+    if (typeof value === "string") {
         return escapeString(value, regexpTest, regexpReplace);
     } else if (value == null) {
-        return '';
-    } else if (typeof value === 'object') {
+        return "";
+    } else if (typeof value === "object") {
         if (value.toHTML) {
             return value.toHTML();
         }
-    } else if (value === true || value === false || typeof value === 'number') {
+    } else if (value === true || value === false || typeof value === "number") {
         return value.toString();
     }
 
diff --git a/src/runtime/html/helper-attr.js b/src/runtime/html/helper-attr.js
index 57060bd2d..f45eb206d 100644
--- a/src/runtime/html/helper-attr.js
+++ b/src/runtime/html/helper-attr.js
@@ -1,29 +1,39 @@
-var escape = require('./escape');
+var escape = require("./escape");
 var escapeString = escape.escapeString;
 var escapeXmlAttr = escape.escapeXmlAttr;
 
-var stringifiedAttrTest = /[&\'\n]/;
-var stringifiedAttrReplace = /[&\'\n]/g;
+var stringifiedAttrTest = /[&'\n]/;
+var stringifiedAttrReplace = /[&'\n]/g;
 
 function attr(name, value, shouldEscape) {
     shouldEscape = shouldEscape !== false;
     var type = typeof value;
 
-    if (type === 'string') {
-        return ' ' + name + '="' + (shouldEscape ? escapeXmlAttr(value) : value) + '"';
+    if (type === "string") {
+        return (
+            " " +
+            name +
+            '="' +
+            (shouldEscape ? escapeXmlAttr(value) : value) +
+            '"'
+        );
     } else if (value === true) {
-        return ' ' + name;
+        return " " + name;
     } else if (value == null || value === false) {
-        return '';
-    } else if (type === 'object') {
+        return "";
+    } else if (type === "object") {
         value = JSON.stringify(value);
         if (shouldEscape) {
-            value = escapeString(value, stringifiedAttrTest, stringifiedAttrReplace);
+            value = escapeString(
+                value,
+                stringifiedAttrTest,
+                stringifiedAttrReplace
+            );
         }
 
-        return ' ' + name + "='" + value + "'";
+        return " " + name + "='" + value + "'";
     } else {
-        return ' ' + name + '=' + value; // number (doesn't need quotes)
+        return " " + name + "=" + value; // number (doesn't need quotes)
     }
 }
 
diff --git a/src/runtime/html/helper-attrs.js b/src/runtime/html/helper-attrs.js
index cd115e9ad..b68402b4e 100644
--- a/src/runtime/html/helper-attrs.js
+++ b/src/runtime/html/helper-attrs.js
@@ -1,16 +1,16 @@
-var attrHelper = require('./helper-attr');
+var attrHelper = require("./helper-attr");
 
 function attrs(arg) {
-    if (typeof arg === 'object') {
-        var out = '';
+    if (typeof arg === "object") {
+        var out = "";
         for (var attrName in arg) {
             out += attrHelper(attrName, arg[attrName]);
         }
         return out;
-    } else if (typeof arg === 'string') {
+    } else if (typeof arg === "string") {
         return arg;
     }
-    return '';
+    return "";
 }
 
-module.exports = attrs;
\ No newline at end of file
+module.exports = attrs;
diff --git a/src/runtime/html/helper-createInlineTemplate.js b/src/runtime/html/helper-createInlineTemplate.js
index b2e328eeb..6aa530106 100644
--- a/src/runtime/html/helper-createInlineTemplate.js
+++ b/src/runtime/html/helper-createInlineTemplate.js
@@ -1,5 +1,5 @@
-var Template = require('./Template');
+var Template = require("./Template");
 
 module.exports = function(path, renderFunc) {
     return new Template(path, renderFunc);
-};
\ No newline at end of file
+};
diff --git a/src/runtime/html/helpers.js b/src/runtime/html/helpers.js
index 8778ca4c2..711fd912b 100644
--- a/src/runtime/html/helpers.js
+++ b/src/runtime/html/helpers.js
@@ -1,21 +1,14 @@
-'use strict';
-var extend = require('raptor-util/extend');
+"use strict";
+var extend = require("raptor-util/extend");
 
-var STYLE_ATTR = 'style';
-var CLASS_ATTR = 'class';
+var STYLE_ATTR = "style";
+var CLASS_ATTR = "class";
 
-var escape = require('./escape');
+var escape = require("./escape");
 var escapeXml = escape.escapeXml;
 var escapeXmlAttr = escape.escapeXmlAttr;
-var attrHelper = require('./helper-attr');
-var attrsHelper = require('./helper-attrs');
-
-var classList;
-
-
-
-
-
+var attrHelper = require("./helper-attr");
+var attrsHelper = require("./helper-attrs");
 
 /**
  * Internal method to escape special XML characters
@@ -45,7 +38,9 @@ exports.xa = escapeXmlAttr;
  */
 var escapeEndingScriptTagRegExp = /<\/script/g;
 exports.xs = function escapeScriptHelper(val) {
-    return (typeof val === 'string') ? val.replace(escapeEndingScriptTagRegExp, '\\u003C/script') : val;
+    return typeof val === "string"
+        ? val.replace(escapeEndingScriptTagRegExp, "\\u003C/script")
+        : val;
 };
 
 /**
@@ -63,7 +58,9 @@ exports.xs = function escapeScriptHelper(val) {
  */
 var escapeEndingStyleTagRegExp = /<\/style/g;
 exports.xc = function escapeScriptHelper(val) {
-    return (typeof val === 'string') ? val.replace(escapeEndingStyleTagRegExp, '\\003C/style') : val;
+    return typeof val === "string"
+        ? val.replace(escapeEndingStyleTagRegExp, "\\003C/style")
+        : val;
 };
 
 /**
@@ -90,31 +87,33 @@ var dashedNames = {};
 
 exports.sa = function(style) {
     if (!style) {
-        return '';
+        return "";
     }
 
     var type = typeof style;
 
-    if (type === 'string') {
+    if (type === "string") {
         return attrHelper(STYLE_ATTR, style, false);
-    } else if (type === 'object') {
-        var styles = '';
+    } else if (type === "object") {
+        var styles = "";
         for (var name in style) {
             var value = style[name];
             if (value != null) {
-                if (typeof value === 'number' && value) {
-                    value += 'px';
+                if (typeof value === "number" && value) {
+                    value += "px";
                 }
                 var nameDashed = dashedNames[name];
                 if (!nameDashed) {
-                    nameDashed = dashedNames[name] = name.replace(/([A-Z])/g, '-$1').toLowerCase();
+                    nameDashed = dashedNames[name] = name
+                        .replace(/([A-Z])/g, "-$1")
+                        .toLowerCase();
                 }
-                styles += nameDashed + ':' + value + ';';
+                styles += nameDashed + ":" + value + ";";
             }
         }
-        return styles ? ' ' + STYLE_ATTR + '="' + styles +'"' : '';
+        return styles ? " " + STYLE_ATTR + '="' + styles + '"' : "";
     } else {
-        return '';
+        return "";
     }
 };
 
@@ -128,37 +127,39 @@ exports.sa = function(style) {
  */
 exports.ca = function(classNames) {
     if (!classNames) {
-        return '';
+        return "";
     }
 
-    if (typeof classNames === 'string') {
+    if (typeof classNames === "string") {
         return attrHelper(CLASS_ATTR, classNames, false);
     } else {
         return attrHelper(CLASS_ATTR, classList(classNames), false);
     }
 };
 
-
 function classList(arg) {
-    var len, name, value, str = '';
+    var len,
+        name,
+        value,
+        str = "";
 
     if (arg) {
-        if (typeof arg === 'string') {
+        if (typeof arg === "string") {
             if (arg) {
-                str += ' ' + arg;
+                str += " " + arg;
             }
-        } else if (typeof (len = arg.length) === 'number') {
-            for (var i=0; i<len; i++) {
+        } else if (typeof (len = arg.length) === "number") {
+            for (var i = 0; i < len; i++) {
                 value = classList(arg[i]);
                 if (value) {
-                    str += ' ' + value;
+                    str += " " + value;
                 }
             }
-        } else if (typeof arg === 'object') {
+        } else if (typeof arg === "object") {
             for (name in arg) {
                 value = arg[name];
                 if (value) {
-                    str += ' ' + name;
+                    str += " " + name;
                 }
             }
         }
@@ -167,11 +168,10 @@ function classList(arg) {
     return (str && str.slice(1)) || null;
 }
 
-var commonHelpers = require('../helpers');
+var commonHelpers = require("../helpers");
 extend(exports, commonHelpers);
 exports.cl = classList;
 
-
 /**
  * Internal helper method to insert a script tag that assigns properties
  * to the dom node the precede it.
@@ -183,20 +183,21 @@ var assignPropsFunction = `
         Object.assign(s.previousSibling, p);
         s.parentNode.removeChild(s);
     }
-`.replace(/\s+/g, ' ')
- .replace(/([\W]) (.)/g, '$1$2')
- .replace(/(.) ([\W])/g, '$1$2')
- .trim();
+`
+    .replace(/\s+/g, " ")
+    .replace(/([\W]) (.)/g, "$1$2")
+    .replace(/(.) ([\W])/g, "$1$2")
+    .trim();
 exports.p = function propsForPreviousNode(props, out) {
     var cspNonce = out.global.cspNonce;
-    var nonceAttr = cspNonce ? ' nonce='+JSON.stringify(cspNonce) : '';
+    var nonceAttr = cspNonce ? " nonce=" + JSON.stringify(cspNonce) : "";
 
-    out.w('<script' + nonceAttr + '>');
+    out.w("<script" + nonceAttr + ">");
 
     if (!out.global.assignPropsFunction) {
         out.w(assignPropsFunction);
         out.global.assignPropsFunction = true;
     }
 
-    out.w('ap_(' + escapeScript(JSON.stringify(props)) + ');</script>');
+    out.w("ap_(" + escapeScript(JSON.stringify(props)) + ");</script>");
 };
diff --git a/src/runtime/html/index.js b/src/runtime/html/index.js
index a9fb8cc70..588ff100c 100644
--- a/src/runtime/html/index.js
+++ b/src/runtime/html/index.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var Template;
 
@@ -9,13 +9,13 @@ var Template;
  * @private
  */
 exports.t = function createTemplate(path) {
-     return new Template(path);
+    return new Template(path);
 };
 
-require('../../');
+require("../../");
 
-var AsyncStream = require('./AsyncStream');
-Template = require('./Template');
+var AsyncStream = require("./AsyncStream");
+Template = require("./Template");
 
 function createOut(globalData, parent, state, buffer) {
     return new AsyncStream(globalData, parent, state, buffer);
@@ -30,4 +30,4 @@ exports.___createOut = createOut;
 exports.AsyncStream = AsyncStream;
 exports.enableAsyncStackTrace = AsyncStream.enableAsyncStackTrace;
 
-require('../createOut').___setCreateOut(createOut);
+require("../createOut").___setCreateOut(createOut);
diff --git a/src/runtime/nextTick-browser.js b/src/runtime/nextTick-browser.js
index 0582c87ea..afd279bcf 100644
--- a/src/runtime/nextTick-browser.js
+++ b/src/runtime/nextTick-browser.js
@@ -6,21 +6,25 @@ var setImmediate = win.setImmediate;
 if (!setImmediate) {
     if (win.postMessage) {
         var queue = [];
-        var messageName = 'si';
-        win.addEventListener('message', function (event) {
-            var source = event.source;
-            if (source == win || !source && event.data === messageName) {
-                event.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
+        var messageName = "si";
+        win.addEventListener(
+            "message",
+            function(event) {
+                var source = event.source;
+                if (source == win || (!source && event.data === messageName)) {
+                    event.stopPropagation();
+                    if (queue.length > 0) {
+                        var fn = queue.shift();
+                        fn();
+                    }
                 }
-            }
-        }, true);
+            },
+            true
+        );
 
         setImmediate = function(fn) {
             queue.push(fn);
-            win.postMessage(messageName, '*');
+            win.postMessage(messageName, "*");
         };
     } else {
         setImmediate = setTimeout;
diff --git a/src/runtime/renderable.js b/src/runtime/renderable.js
index e69d883a0..6177dc059 100644
--- a/src/runtime/renderable.js
+++ b/src/runtime/renderable.js
@@ -1,5 +1,5 @@
-var defaultCreateOut = require('./createOut');
-var extend = require('raptor-util/extend');
+var defaultCreateOut = require("./createOut");
+var extend = require("raptor-util/extend");
 
 function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
     try {
@@ -8,7 +8,7 @@ function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
         if (shouldEnd) {
             finalOut.end();
         }
-    } catch(err) {
+    } catch (err) {
         var actualEnd = finalOut.end;
         finalOut.end = function() {};
 
@@ -21,7 +21,8 @@ function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
 }
 
 module.exports = function(target, renderer) {
-    var renderFunc = renderer && (renderer.renderer || renderer.render || renderer);
+    var renderFunc =
+        renderer && (renderer.renderer || renderer.render || renderer);
     var createOut = target.createOut || renderer.createOut || defaultCreateOut;
 
     return extend(target, {
@@ -40,10 +41,11 @@ module.exports = function(target, renderer) {
             }
 
             if (callback) {
-                out.on('finish', function() {
-                       callback(null, out.toString(), out);
-                   })
-                   .once('error', callback);
+                out
+                    .on("finish", function() {
+                        callback(null, out.toString(), out);
+                    })
+                    .once("error", callback);
 
                 return safeRender(render, localData, out, true);
             } else {
@@ -109,7 +111,7 @@ module.exports = function(target, renderer) {
                 finalOut = out;
                 shouldEnd = false;
                 extend(out.global, globalData);
-            } else if (typeof out == 'function') {
+            } else if (typeof out == "function") {
                 finalOut = createOut(globalData);
                 callback = out;
             } else {
@@ -123,10 +125,10 @@ module.exports = function(target, renderer) {
 
             if (callback) {
                 finalOut
-                    .on('finish', function() {
+                    .on("finish", function() {
                         callback(null, finalOut.___getResult());
                     })
-                    .once('error', callback);
+                    .once("error", callback);
             }
 
             globalData = finalOut.global;
diff --git a/src/runtime/vdom/AsyncVDOMBuilder.js b/src/runtime/vdom/AsyncVDOMBuilder.js
index 6a2095688..332a3e327 100644
--- a/src/runtime/vdom/AsyncVDOMBuilder.js
+++ b/src/runtime/vdom/AsyncVDOMBuilder.js
@@ -1,20 +1,19 @@
-var EventEmitter = require('events-light');
-var vdom = require('./vdom');
+var EventEmitter = require("events-light");
+var vdom = require("./vdom");
 var VElement = vdom.___VElement;
 var VDocumentFragment = vdom.___VDocumentFragment;
 var VComment = vdom.___VComment;
 var VText = vdom.___VText;
 var VComponent = vdom.___VComponent;
 var virtualizeHTML = vdom.___virtualizeHTML;
-var RenderResult = require('../RenderResult');
+var RenderResult = require("../RenderResult");
 var defaultDocument = vdom.___defaultDocument;
-var morphdom = require('../../morphdom');
+var morphdom = require("../../morphdom");
 
-var EVENT_UPDATE = 'update';
-var EVENT_FINISH = 'finish';
+var EVENT_UPDATE = "update";
+var EVENT_FINISH = "finish";
 
 function State(tree) {
-
     this.___events = new EventEmitter();
     this.___tree = tree;
     this.___finished = false;
@@ -38,7 +37,6 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
     this.___last = null;
     this.___parentOut = parentOut;
 
-
     this.data = {};
     this.___state = state;
     this.___parent = parentNode;
@@ -53,7 +51,7 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
     this.___assignedCustomEvents = null;
 }
 
-var proto = AsyncVDOMBuilder.prototype = {
+var proto = (AsyncVDOMBuilder.prototype = {
     ___isOut: true,
     ___document: defaultDocument,
 
@@ -76,13 +74,45 @@ var proto = AsyncVDOMBuilder.prototype = {
         return childCount === 0 ? this : child;
     },
 
-    element: function(tagName, attrs, key, component, childCount, flags, props) {
-        var element = new VElement(tagName, attrs, key, component, childCount, flags, props);
+    element: function(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    ) {
+        var element = new VElement(
+            tagName,
+            attrs,
+            key,
+            component,
+            childCount,
+            flags,
+            props
+        );
         return this.___beginNode(element, childCount);
     },
 
-    ___elementDynamicTag: function(tagName, attrs, key, component, childCount, flags, props) {
-        var element = VElement.___createElementDynamicTag(tagName, attrs, key, component, childCount, flags, props);
+    ___elementDynamicTag: function(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    ) {
+        var element = VElement.___createElementDynamicTag(
+            tagName,
+            attrs,
+            key,
+            component,
+            childCount,
+            flags,
+            props
+        );
         return this.___beginNode(element, childCount);
     },
 
@@ -104,10 +134,10 @@ var proto = AsyncVDOMBuilder.prototype = {
     text: function(text) {
         var type = typeof text;
 
-        if (type != 'string') {
+        if (type != "string") {
             if (text == null) {
                 return;
-            } else if (type === 'object') {
+            } else if (type === "object") {
                 if (text.toHTML) {
                     return this.h(text.toHTML());
                 }
@@ -133,14 +163,46 @@ var proto = AsyncVDOMBuilder.prototype = {
         return this;
     },
 
-    beginElement: function(tagName, attrs, key, component, childCount, flags, props) {
-        var element = new VElement(tagName, attrs, key, component, childCount, flags, props);
+    beginElement: function(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    ) {
+        var element = new VElement(
+            tagName,
+            attrs,
+            key,
+            component,
+            childCount,
+            flags,
+            props
+        );
         this.___beginNode(element, childCount, true);
         return this;
     },
 
-    ___beginElementDynamicTag: function(tagName, attrs, key, component, childCount, flags, props) {
-        var element = VElement.___createElementDynamicTag(tagName, attrs, key, component, childCount, flags, props);
+    ___beginElementDynamicTag: function(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    ) {
+        var element = VElement.___createElementDynamicTag(
+            tagName,
+            attrs,
+            key,
+            component,
+            childCount,
+            flags,
+            props
+        );
         this.___beginNode(element, childCount, true);
         return this;
     },
@@ -148,7 +210,7 @@ var proto = AsyncVDOMBuilder.prototype = {
     endElement: function() {
         var stack = this.___stack;
         stack.pop();
-        this.___parent = stack[stack.length-1];
+        this.___parent = stack[stack.length - 1];
     },
 
     end: function() {
@@ -213,7 +275,7 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     error: function(e) {
         try {
-            this.emit('error', e);
+            this.emit("error", e);
         } finally {
             // If there is no listener for the error event then it will
             // throw a new Error here. In order to ensure that the async fragment
@@ -227,7 +289,9 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     beginAsync: function(options) {
         if (this.___sync) {
-            throw Error('Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942).');
+            throw Error(
+                "Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942)."
+            );
         }
 
         var state = this.___state;
@@ -241,14 +305,18 @@ var proto = AsyncVDOMBuilder.prototype = {
         this.___remaining++;
 
         var documentFragment = this.___parent.___appendDocumentFragment();
-        var asyncOut = new AsyncVDOMBuilder(this.global, documentFragment, this);
+        var asyncOut = new AsyncVDOMBuilder(
+            this.global,
+            documentFragment,
+            this
+        );
 
-        state.___events.emit('beginAsync', {
-           out: asyncOut,
-           parentOut: this
-       });
+        state.___events.emit("beginAsync", {
+            out: asyncOut,
+            parentOut: this
+        });
 
-       return asyncOut;
+        return asyncOut;
     },
 
     createOut: function() {
@@ -276,7 +344,7 @@ var proto = AsyncVDOMBuilder.prototype = {
 
         if (event === EVENT_FINISH && state.___finished) {
             callback(this.___getResult());
-        } else if (event === 'last') {
+        } else if (event === "last") {
             this.onLast(callback);
         } else {
             state.___events.on(event, callback);
@@ -288,9 +356,9 @@ var proto = AsyncVDOMBuilder.prototype = {
     once: function(event, callback) {
         var state = this.___state;
 
-        if (event === EVENT_FINISH && (state.___finished)) {
+        if (event === EVENT_FINISH && state.___finished) {
             callback(this.___getResult());
-        } else if (event === 'last') {
+        } else if (event === "last") {
             this.onLast(callback);
         } else {
             state.___events.once(event, callback);
@@ -301,7 +369,7 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     emit: function(type, arg) {
         var events = this.___state.___events;
-        switch(arguments.length) {
+        switch (arguments.length) {
             case 1:
                 events.emit(type);
                 break;
@@ -355,13 +423,13 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     toString: function(doc) {
         var docFragment = this.___getNode(doc);
-        var html = '';
+        var html = "";
 
         var child = docFragment.firstChild;
-        while(child) {
+        while (child) {
             var nextSibling = child.nextSibling;
             if (child.nodeType != 1) {
-                var container = docFragment.ownerDocument.createElement('div');
+                var container = docFragment.ownerDocument.createElement("div");
                 container.appendChild(child.cloneNode());
                 html += container.innerHTML;
             } else {
@@ -377,10 +445,9 @@ var proto = AsyncVDOMBuilder.prototype = {
     then: function(fn, fnErr) {
         var out = this;
         var promise = new Promise(function(resolve, reject) {
-            out.on('error', reject)
-                .on(EVENT_FINISH, function(result) {
-                    resolve(result);
-                });
+            out.on("error", reject).on(EVENT_FINISH, function(result) {
+                resolve(result);
+            });
         });
 
         return Promise.resolve(promise).then(fn, fnErr);
@@ -397,7 +464,7 @@ var proto = AsyncVDOMBuilder.prototype = {
         this.___assignedKey = key;
         this.___assignedCustomEvents = customEvents;
     }
-};
+});
 
 proto.e = proto.element;
 proto.ed = proto.___elementDynamicTag;
diff --git a/src/runtime/vdom/VComment.js b/src/runtime/vdom/VComment.js
index 7aa400c5d..543438b06 100644
--- a/src/runtime/vdom/VComment.js
+++ b/src/runtime/vdom/VComment.js
@@ -1,5 +1,5 @@
-var VNode = require('./VNode');
-var inherit = require('raptor-util/inherit');
+var VNode = require("./VNode");
+var inherit = require("raptor-util/inherit");
 
 function VComment(value) {
     this.___VNode(-1 /* no children */);
diff --git a/src/runtime/vdom/VComponent.js b/src/runtime/vdom/VComponent.js
index 59530d043..ac9d2aebf 100644
--- a/src/runtime/vdom/VComponent.js
+++ b/src/runtime/vdom/VComponent.js
@@ -1,5 +1,5 @@
-var VNode = require('./VNode');
-var inherit = require('raptor-util/inherit');
+var VNode = require("./VNode");
+var inherit = require("raptor-util/inherit");
 
 function VComponent(component, preserve) {
     this.___VNode(null /* childCount */);
diff --git a/src/runtime/vdom/VDocumentFragment.js b/src/runtime/vdom/VDocumentFragment.js
index 709363477..4c9546793 100644
--- a/src/runtime/vdom/VDocumentFragment.js
+++ b/src/runtime/vdom/VDocumentFragment.js
@@ -1,6 +1,6 @@
-var VNode = require('./VNode');
-var inherit = require('raptor-util/inherit');
-var extend = require('raptor-util/extend');
+var VNode = require("./VNode");
+var inherit = require("raptor-util/inherit");
+var extend = require("raptor-util/extend");
 
 function VDocumentFragmentClone(other) {
     extend(this, other);
diff --git a/src/runtime/vdom/VElement.js b/src/runtime/vdom/VElement.js
index 978787bf0..cb151176a 100644
--- a/src/runtime/vdom/VElement.js
+++ b/src/runtime/vdom/VElement.js
@@ -1,8 +1,8 @@
 /* jshint newcap:false */
-var VNode = require('./VNode');
-var inherit = require('raptor-util/inherit');
-var NS_XLINK = 'http://www.w3.org/1999/xlink';
-var ATTR_XLINK_HREF = 'xlink:href';
+var VNode = require("./VNode");
+var inherit = require("raptor-util/inherit");
+var NS_XLINK = "http://www.w3.org/1999/xlink";
+var ATTR_XLINK_HREF = "xlink:href";
 var xmlnsRegExp = /^xmlns(:|$)/;
 
 var toString = String;
@@ -15,13 +15,13 @@ var FLAG_CUSTOM_ELEMENT = 16;
 
 var defineProperty = Object.defineProperty;
 
-var ATTR_HREF = 'href';
+var ATTR_HREF = "href";
 var EMPTY_OBJECT = Object.freeze({});
 
 function convertAttrValue(type, value) {
     if (value === true) {
-        return '';
-    } else if (type == 'object') {
+        return "";
+    } else if (type == "object") {
         return JSON.stringify(value);
     } else {
         return toString(value);
@@ -73,7 +73,7 @@ function VElement(tagName, attrs, key, component, childCount, flags, props) {
 
     if ((this.___flags = flags || 0)) {
         if (flags & FLAG_IS_SVG) {
-            namespaceURI = 'http://www.w3.org/2000/svg';
+            namespaceURI = "http://www.w3.org/2000/svg";
         }
         if (flags & FLAG_IS_TEXTAREA) {
             isTextArea = true;
@@ -106,7 +106,17 @@ VElement.prototype = {
      * @param  {int|null} childCount The number of child nodes (or `null` if not known)
      */
     e: function(tagName, attrs, key, component, childCount, flags, props) {
-        var child = this.___appendChild(new VElement(tagName, attrs, key, component, childCount, flags, props));
+        var child = this.___appendChild(
+            new VElement(
+                tagName,
+                attrs,
+                key,
+                component,
+                childCount,
+                flags,
+                props
+            )
+        );
 
         if (childCount === 0) {
             return this.___finishChild();
@@ -123,7 +133,17 @@ VElement.prototype = {
      * @param  {int|null} childCount The number of child nodes (or `null` if not known)
      */
     ed: function(tagName, attrs, key, component, childCount, flags, props) {
-        var child = this.___appendChild(VElement.___createElementDynamicTag(tagName, attrs, key, component, childCount, flags, props));
+        var child = this.___appendChild(
+            VElement.___createElementDynamicTag(
+                tagName,
+                attrs,
+                key,
+                component,
+                childCount,
+                flags,
+                props
+            )
+        );
 
         if (childCount === 0) {
             return this.___finishChild();
@@ -152,9 +172,10 @@ VElement.prototype = {
         var attributes = this.___attributes;
         var flags = this.___flags;
 
-        var el = namespaceURI !== undefined ?
-            doc.createElementNS(namespaceURI, tagName) :
-            doc.createElement(tagName);
+        var el =
+            namespaceURI !== undefined
+                ? doc.createElementNS(namespaceURI, tagName)
+                : doc.createElement(tagName);
 
         if (flags & FLAG_CUSTOM_ELEMENT) {
             Object.assign(el, attributes);
@@ -165,7 +186,7 @@ VElement.prototype = {
                 if (attrValue !== false && attrValue != null) {
                     var type = typeof attrValue;
 
-                    if (type !== 'string') {
+                    if (type !== "string") {
                         // Special attributes aren't copied to the real DOM. They are only
                         // kept in the virtual attributes map
                         attrValue = convertAttrValue(type, attrValue);
@@ -200,31 +221,47 @@ VElement.prototype = {
 
 inherit(VElement, VNode);
 
-var proto = VElementClone.prototype = VElement.prototype;
+var proto = (VElementClone.prototype = VElement.prototype);
 
-['checked', 'selected', 'disabled'].forEach(function(name) {
+["checked", "selected", "disabled"].forEach(function(name) {
     defineProperty(proto, name, {
-        get: function () {
+        get: function() {
             var value = this.___attributes[name];
             return value !== false && value != null;
         }
     });
 });
 
-defineProperty(proto, '___value', {
-    get: function () {
+defineProperty(proto, "___value", {
+    get: function() {
         var value = this.___valueInternal;
         if (value == null) {
             value = this.___attributes.value;
         }
-        return value != null ? toString(value) : '';
+        return value != null ? toString(value) : "";
     }
 });
 
-VElement.___createElementDynamicTag = function(tagName, attrs, key, component, childCount, flags, props) {
+VElement.___createElementDynamicTag = function(
+    tagName,
+    attrs,
+    key,
+    component,
+    childCount,
+    flags,
+    props
+) {
     var namespace = attrs && attrs.xmlns;
     tagName = namespace ? tagName : tagName.toUpperCase();
-    var element = new VElement(tagName, attrs, key, component, childCount, flags, props);
+    var element = new VElement(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    );
     element.___namespaceURI = namespace;
     return element;
 };
@@ -245,10 +282,10 @@ function virtualizeElement(node, virtualizeChildNodes) {
 
     if (attrCount) {
         attrs = {};
-        for (var i=0; i<attrCount; i++) {
+        for (var i = 0; i < attrCount; i++) {
             var attr = attributes[i];
             var attrName = attr.name;
-            if (!xmlnsRegExp.test(attrName) && attrName !== 'data-marko') {
+            if (!xmlnsRegExp.test(attrName) && attrName !== "data-marko") {
                 var attrNamespaceURI = attr.namespaceURI;
                 if (attrNamespaceURI === NS_XLINK) {
                     attrs[ATTR_XLINK_HREF] = attr.value;
@@ -262,12 +299,20 @@ function virtualizeElement(node, virtualizeChildNodes) {
     var flags = 0;
 
     var tagName = node.nodeName;
-    if (tagName === 'TEXTAREA') {
+    if (tagName === "TEXTAREA") {
         flags |= FLAG_IS_TEXTAREA;
     }
 
-    var vdomEl = new VElement(tagName, attrs, null /*key*/, null /*component*/, 0 /*child count*/, flags, null /*props*/);
-    if (node.namespaceURI !== 'http://www.w3.org/1999/xhtml') {
+    var vdomEl = new VElement(
+        tagName,
+        attrs,
+        null /*key*/,
+        null /*component*/,
+        0 /*child count*/,
+        flags,
+        null /*props*/
+    );
+    if (node.namespaceURI !== "http://www.w3.org/1999/xhtml") {
         vdomEl.___namespaceURI = node.namespaceURI;
     }
 
@@ -326,7 +371,7 @@ VElement.___morphAttrs = function(fromEl, vFromEl, toEl) {
     var attrValue;
 
     if (toFlags & FLAG_SIMPLE_ATTRS && fromFlags & FLAG_SIMPLE_ATTRS) {
-        if (oldAttrs['class'] !== (attrValue = attrs['class'])) {
+        if (oldAttrs["class"] !== (attrValue = attrs["class"])) {
             fromEl.className = attrValue;
         }
         if (oldAttrs.id !== (attrValue = attrs.id)) {
@@ -338,7 +383,6 @@ VElement.___morphAttrs = function(fromEl, vFromEl, toEl) {
         return;
     }
 
-
     // In some cases we only want to set an attribute value for the first
     // render or we don't want certain attributes to be touched. To support
     // that use case we delete out all of the preserved attributes
@@ -364,7 +408,7 @@ VElement.___morphAttrs = function(fromEl, vFromEl, toEl) {
         } else if (oldAttrs[attrName] !== attrValue) {
             var type = typeof attrValue;
 
-            if (type !== 'string') {
+            if (type !== "string") {
                 attrValue = convertAttrValue(type, attrValue);
             }
 
diff --git a/src/runtime/vdom/VNode.js b/src/runtime/vdom/VNode.js
index 937a2c706..d0debbcdd 100644
--- a/src/runtime/vdom/VNode.js
+++ b/src/runtime/vdom/VNode.js
@@ -52,7 +52,8 @@ VNode.prototype = {
         if (this.___isTextArea === true) {
             if (child.___Text) {
                 var childValue = child.___nodeValue;
-                this.___valueInternal = (this.___valueInternal || '') + childValue;
+                this.___valueInternal =
+                    (this.___valueInternal || "") + childValue;
             } else {
                 throw TypeError();
             }
@@ -74,13 +75,15 @@ VNode.prototype = {
     },
 
     ___finishChild: function finishChild() {
-        if (this.___childCount === this.___finalChildCount && this.___parentNode) {
+        if (
+            this.___childCount === this.___finalChildCount &&
+            this.___parentNode
+        ) {
             return this.___parentNode.___finishChild();
         } else {
             return this;
         }
-    },
-
+    }
 
     // ,toJSON: function() {
     //     var clone = Object.assign({
diff --git a/src/runtime/vdom/VText.js b/src/runtime/vdom/VText.js
index cb6a91bc0..31d9ac4c8 100644
--- a/src/runtime/vdom/VText.js
+++ b/src/runtime/vdom/VText.js
@@ -1,5 +1,5 @@
-var VNode = require('./VNode');
-var inherit = require('raptor-util/inherit');
+var VNode = require("./VNode");
+var inherit = require("raptor-util/inherit");
 
 function VText(value) {
     this.___VNode(-1 /* no children */);
diff --git a/src/runtime/vdom/helper-createInlineTemplate.js b/src/runtime/vdom/helper-createInlineTemplate.js
index aef100160..320121fb2 100644
--- a/src/runtime/vdom/helper-createInlineTemplate.js
+++ b/src/runtime/vdom/helper-createInlineTemplate.js
@@ -1,5 +1,5 @@
-var Template = require('./').Template;
+var Template = require("./").Template;
 
 module.exports = function(path, renderFunc) {
     return new Template(path, renderFunc);
-};
\ No newline at end of file
+};
diff --git a/src/runtime/vdom/helper-styleAttr.js b/src/runtime/vdom/helper-styleAttr.js
index e488a0898..03be4a6ea 100644
--- a/src/runtime/vdom/helper-styleAttr.js
+++ b/src/runtime/vdom/helper-styleAttr.js
@@ -12,22 +12,24 @@ module.exports = function(style) {
 
     var type = typeof style;
 
-    if (type === 'string') {
+    if (type === "string") {
         return style;
-    } else if (type === 'object') {
-        var styles = '';
+    } else if (type === "object") {
+        var styles = "";
         for (var name in style) {
             var value = style[name];
             if (value != null) {
-                if (typeof value === 'number' && value) {
-                    value += 'px';
+                if (typeof value === "number" && value) {
+                    value += "px";
                 }
 
                 var nameDashed = dashedNames[name];
                 if (!nameDashed) {
-                    nameDashed = dashedNames[name] = name.replace(/([A-Z])/g, '-$1').toLowerCase();
+                    nameDashed = dashedNames[name] = name
+                        .replace(/([A-Z])/g, "-$1")
+                        .toLowerCase();
                 }
-                styles += nameDashed + ':' + value + ';';
+                styles += nameDashed + ":" + value + ";";
             }
         }
         return styles || null;
diff --git a/src/runtime/vdom/helpers.js b/src/runtime/vdom/helpers.js
index e6ae716b3..c551b69db 100644
--- a/src/runtime/vdom/helpers.js
+++ b/src/runtime/vdom/helpers.js
@@ -1,49 +1,60 @@
-'use strict';
+"use strict";
 
-var vdom = require('./vdom');
+var vdom = require("./vdom");
 var VElement = vdom.___VElement;
 var VText = vdom.___VText;
 
-var commonHelpers = require('../helpers');
-var extend = require('raptor-util/extend');
+var commonHelpers = require("../helpers");
+var extend = require("raptor-util/extend");
 
 var classList = commonHelpers.cl;
 
-var helpers = extend({
-    e: function(tagName, attrs, key, component, childCount, flags, props) {
-        return new VElement(tagName, attrs, key, component, childCount, flags, props);
-    },
+var helpers = extend(
+    {
+        e: function(tagName, attrs, key, component, childCount, flags, props) {
+            return new VElement(
+                tagName,
+                attrs,
+                key,
+                component,
+                childCount,
+                flags,
+                props
+            );
+        },
 
-    t: function(value) {
-        return new VText(value);
-    },
+        t: function(value) {
+            return new VText(value);
+        },
 
-    const: function(id) {
-        var i=0;
-        return function() {
-            return id + (i++);
-        };
-    },
+        const: function(id) {
+            var i = 0;
+            return function() {
+                return id + i++;
+            };
+        },
 
-    /**
-     * Internal helper method to handle the "class" attribute. The value can either
-     * be a string, an array or an object. For example:
-     *
-     * ca('foo bar') ==> ' class="foo bar"'
-     * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
-     * ca(['foo', 'bar']) ==> ' class="foo bar"'
-     */
-    ca: function(classNames) {
-        if (!classNames) {
-            return null;
+        /**
+         * Internal helper method to handle the "class" attribute. The value can either
+         * be a string, an array or an object. For example:
+         *
+         * ca('foo bar') ==> ' class="foo bar"'
+         * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
+         * ca(['foo', 'bar']) ==> ' class="foo bar"'
+         */
+        ca: function(classNames) {
+            if (!classNames) {
+                return null;
+            }
+
+            if (typeof classNames === "string") {
+                return classNames;
+            } else {
+                return classList(classNames);
+            }
         }
-
-        if (typeof classNames === 'string') {
-            return classNames;
-        } else {
-            return classList(classNames);
-        }
-    }
-}, commonHelpers);
+    },
+    commonHelpers
+);
 
 module.exports = helpers;
diff --git a/src/runtime/vdom/index.js b/src/runtime/vdom/index.js
index dd77fbb70..37e89268f 100644
--- a/src/runtime/vdom/index.js
+++ b/src/runtime/vdom/index.js
@@ -1,10 +1,10 @@
-'use strict';
-require('../../');
+"use strict";
+require("../../");
 
 // helpers provide a core set of various utility methods
 // that are available in every template
-var AsyncVDOMBuilder = require('./AsyncVDOMBuilder');
-var makeRenderable = require('../renderable');
+var AsyncVDOMBuilder = require("./AsyncVDOMBuilder");
+var makeRenderable = require("../renderable");
 
 /**
  * Method is for internal usage only. This method
@@ -13,7 +13,7 @@ var makeRenderable = require('../renderable');
  * @private
  */
 exports.t = function createTemplate(path) {
-     return new Template(path);
+    return new Template(path);
 };
 
 function Template(path, func) {
@@ -26,13 +26,13 @@ function createOut(globalData, parent, parentOut) {
     return new AsyncVDOMBuilder(globalData, parent, parentOut);
 }
 
-var Template_prototype = Template.prototype = {
+var Template_prototype = (Template.prototype = {
     createOut: createOut
-};
+});
 
 makeRenderable(Template_prototype);
 
 exports.Template = Template;
 exports.___createOut = createOut;
 
-require('../createOut').___setCreateOut(createOut);
+require("../createOut").___setCreateOut(createOut);
diff --git a/src/runtime/vdom/preserve-attrs.js b/src/runtime/vdom/preserve-attrs.js
index 314078786..c4df52a1e 100644
--- a/src/runtime/vdom/preserve-attrs.js
+++ b/src/runtime/vdom/preserve-attrs.js
@@ -1,4 +1,4 @@
-var extend = require('raptor-util/extend');
+var extend = require("raptor-util/extend");
 
 function removePreservedAttributes(attrs, props) {
     var preservedAttrs = props && props.noupdate;
@@ -12,4 +12,4 @@ function removePreservedAttributes(attrs, props) {
     return attrs;
 }
 
-require('./VElement').___removePreservedAttributes = removePreservedAttributes;
+require("./VElement").___removePreservedAttributes = removePreservedAttributes;
diff --git a/src/runtime/vdom/vdom.js b/src/runtime/vdom/vdom.js
index 111e533db..24bdd4d4f 100644
--- a/src/runtime/vdom/vdom.js
+++ b/src/runtime/vdom/vdom.js
@@ -1,24 +1,23 @@
-var VNode = require('./VNode');
-var VComment = require('./VComment');
-var VDocumentFragment = require('./VDocumentFragment');
-var VElement = require('./VElement');
-var VText = require('./VText');
-var VComponent = require('./VComponent');
+var VNode = require("./VNode");
+var VComment = require("./VComment");
+var VDocumentFragment = require("./VDocumentFragment");
+var VElement = require("./VElement");
+var VText = require("./VText");
+var VComponent = require("./VComponent");
 
-var defaultDocument = typeof document != 'undefined' && document;
+var defaultDocument = typeof document != "undefined" && document;
 var specialHtmlRegexp = /[&<]/;
 
-
 function virtualizeChildNodes(node, vdomParent) {
     var curChild = node.firstChild;
-    while(curChild) {
+    while (curChild) {
         vdomParent.___appendChild(virtualize(curChild));
         curChild = curChild.nextSibling;
     }
 }
 
-function virtualize(node, shallow) {
-    switch(node.nodeType) {
+function virtualize(node) {
+    switch (node.nodeType) {
         case 1:
             return VElement.___virtualize(node, virtualizeChildNodes);
         case 3:
@@ -37,12 +36,12 @@ function virtualizeHTML(html, doc) {
         return new VText(html);
     }
 
-    var container = doc.createElement('body');
+    var container = doc.createElement("body");
     container.innerHTML = html;
     var vdomFragment = new VDocumentFragment();
 
     var curChild = container.firstChild;
-    while(curChild) {
+    while (curChild) {
         vdomFragment.___appendChild(virtualize(curChild));
         curChild = curChild.nextSibling;
     }
@@ -60,10 +59,10 @@ Node_prototype.t = function(value) {
     var type = typeof value;
     var vdomNode;
 
-    if (type !== 'string') {
+    if (type !== "string") {
         if (value == null) {
-            value = '';
-        } else if (type === 'object') {
+            value = "";
+        } else if (type === "object") {
             if (value.toHTML) {
                 vdomNode = virtualizeHTML(value.toHTML(), document);
             }
diff --git a/src/taglibs/async/AsyncValue.js b/src/taglibs/async/AsyncValue.js
index f7d335561..b39c25657 100644
--- a/src/taglibs/async/AsyncValue.js
+++ b/src/taglibs/async/AsyncValue.js
@@ -1,6 +1,6 @@
-var nextTick = require('../../runtime/nextTick');
+var nextTick = require("../../runtime/nextTick");
 
-function AsyncValue(options) {
+function AsyncValue() {
     /**
      * The data that was provided via call to resolve(data).
      * This property is assumed to be public and available for inspection.
@@ -47,7 +47,6 @@ AsyncValue.prototype = {
      * available.
      */
     ___done: function(callback) {
-
         // Do we already have data or error?
         if (this.___settled) {
             // invoke the callback immediately
@@ -85,22 +84,22 @@ AsyncValue.prototype = {
     /**
      * This method will trigger any callbacks to be notified of data.
      */
-    ___resolve: function (value) {
+    ___resolve: function(value) {
         if (this.___settled) {
             return;
         }
 
-        if (value && typeof value.then === 'function') {
+        if (value && typeof value.then === "function") {
             var asyncValue = this;
 
-            var finalPromise = value
-                .then(
-                    function onFulfilled(value) {
-                        nextTick(asyncValue.___resolve.bind(asyncValue, value));
-                    },
-                    function onRejected(err) {
-                        nextTick(asyncValue.___reject.bind(asyncValue, err));
-                    });
+            var finalPromise = value.then(
+                function onFulfilled(value) {
+                    nextTick(asyncValue.___resolve.bind(asyncValue, value));
+                },
+                function onRejected(err) {
+                    nextTick(asyncValue.___reject.bind(asyncValue, err));
+                }
+            );
 
             if (finalPromise.done) {
                 finalPromise.done();
diff --git a/src/taglibs/async/async-fragment-to-await-transformer.js b/src/taglibs/async/async-fragment-to-await-transformer.js
index 4d32aeb3d..9c9fd2b85 100644
--- a/src/taglibs/async/async-fragment-to-await-transformer.js
+++ b/src/taglibs/async/async-fragment-to-await-transformer.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
 var newTags = {
-    'async-fragment':'await',
-    'async-fragments':'await-reorderer',
-    'async-fragment-placeholder':'await-placeholder',
-    'async-fragment-timeout':'await-timeout',
-    'async-fragment-error':'await-error'
+    "async-fragment": "await",
+    "async-fragments": "await-reorderer",
+    "async-fragment-placeholder": "await-placeholder",
+    "async-fragment-timeout": "await-timeout",
+    "async-fragment-error": "await-error"
 };
 
 module.exports = function transform(oldNode, context) {
@@ -15,24 +15,30 @@ module.exports = function transform(oldNode, context) {
     var varName;
     var argument;
 
-    context.deprecate('The <'+oldTag+'> tag is deprecated.  Please use <'+newTag+'> instead.');
+    context.deprecate(
+        "The <" +
+            oldTag +
+            "> tag is deprecated.  Please use <" +
+            newTag +
+            "> instead."
+    );
 
-    if(oldTag == 'async-fragment'/* new: <await> */) {
+    if (oldTag == "async-fragment" /* new: <await> */) {
         // need to convert data-provider and var attributes
         // to an argument: <await(var from dataProvider)>
-        varName = oldNode.getAttributeValue('var').value;
-        provider = oldNode.getAttributeValue('data-provider').toString();
-        argument = varName + ' from ' + provider;
+        varName = oldNode.getAttributeValue("var").value;
+        provider = oldNode.getAttributeValue("data-provider").toString();
+        argument = varName + " from " + provider;
 
         // now remove the attributes
-        oldNode.removeAttribute('var');
-        oldNode.removeAttribute('data-provider');
+        oldNode.removeAttribute("var");
+        oldNode.removeAttribute("data-provider");
     }
 
-    if(oldTag == 'async-fragments'/* new: <await-reorderer> */) {
+    if (oldTag == "async-fragments" /* new: <await-reorderer> */) {
         // all this tag ever did was handling of client reordering
         // we'll remove the attribute as that's all this new tag does
-        oldNode.removeAttribute('client-reorder');
+        oldNode.removeAttribute("client-reorder");
     }
 
     var newNode = context.createNodeForEl(
diff --git a/src/taglibs/async/await-nested-tag-transformer.js b/src/taglibs/async/await-nested-tag-transformer.js
index 36af0b145..943dd0e1b 100644
--- a/src/taglibs/async/await-nested-tag-transformer.js
+++ b/src/taglibs/async/await-nested-tag-transformer.js
@@ -1,25 +1,30 @@
-'use strict';
+"use strict";
 
 module.exports = function transform(el, context) {
     var parentNode = el.parentNode;
 
-    if (parentNode.tagName !== 'await') {
-        context.addError('The <' + el.tagName + '> should be nested within an <await> tag.');
+    if (parentNode.tagName !== "await") {
+        context.addError(
+            "The <" + el.tagName + "> should be nested within an <await> tag."
+        );
         return;
     }
 
     var targetProp;
 
-    if (el.tagName === 'await-error') {
-        targetProp = 'renderError';
-    } else if (el.tagName === 'await-timeout') {
-        targetProp = 'renderTimeout';
-    } else if (el.tagName === 'await-placeholder') {
-        targetProp = 'renderPlaceholder';
+    if (el.tagName === "await-error") {
+        targetProp = "renderError";
+    } else if (el.tagName === "await-timeout") {
+        targetProp = "renderTimeout";
+    } else if (el.tagName === "await-placeholder") {
+        targetProp = "renderPlaceholder";
     }
 
     var builder = context.builder;
 
-    parentNode.setAttributeValue(targetProp, builder.renderBodyFunction(el.body));
+    parentNode.setAttributeValue(
+        targetProp,
+        builder.renderBodyFunction(el.body)
+    );
     el.detach();
 };
diff --git a/src/taglibs/async/await-reorderer-tag.js b/src/taglibs/async/await-reorderer-tag.js
index 4d7efe2f9..2170aa849 100644
--- a/src/taglibs/async/await-reorderer-tag.js
+++ b/src/taglibs/async/await-reorderer-tag.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-const clientReorder = require('./client-reorder');
+const clientReorder = require("./client-reorder");
 
 module.exports = function(input, out) {
     // We cannot call beginSync() when using renderSync(). In this case we will
@@ -21,39 +21,54 @@ module.exports = function(input, out) {
 
     global.__awaitReordererInvoked = true;
 
-    var asyncOut = out.beginAsync({ last: true, timeout: -1, name: 'await-reorderer' });
+    var asyncOut = out.beginAsync({
+        last: true,
+        timeout: -1,
+        name: "await-reorderer"
+    });
 
     out.onLast(function(next) {
         var awaitContext = global.___clientReorderContext;
         var remaining;
 
         // Validate that we have remaining <await> instances that need handled
-        if (!awaitContext ||
+        if (
+            !awaitContext ||
             !awaitContext.instances ||
-            !(remaining = awaitContext.instances.length)) {
+            !(remaining = awaitContext.instances.length)
+        ) {
             asyncOut.end();
             next();
             return;
         }
 
         function handleAwait(awaitInfo) {
-            awaitInfo.out.on('finish', function(result) {
+            awaitInfo.out
+                .on("finish", function(result) {
                     if (!global._afRuntime) {
                         asyncOut.write(clientReorder.getCode());
                         global._afRuntime = true;
                     }
 
-                    asyncOut.write('<div id="af' + awaitInfo.id + '" style="display:none">' +
-                        result.toString() +
-                        '</div>' +
-                        '<script type="text/javascript">$af(' +
-                            (typeof awaitInfo.id === 'number' ? awaitInfo.id : '"' + awaitInfo.id + '"') +
-                            (awaitInfo.after ? (',"' + awaitInfo.after + '"') : '' ) +
-                        ')</script>');
+                    asyncOut.write(
+                        '<div id="af' +
+                            awaitInfo.id +
+                            '" style="display:none">' +
+                            result.toString() +
+                            "</div>" +
+                            '<script type="text/javascript">$af(' +
+                            (typeof awaitInfo.id === "number"
+                                ? awaitInfo.id
+                                : '"' + awaitInfo.id + '"') +
+                            (awaitInfo.after
+                                ? ',"' + awaitInfo.after + '"'
+                                : "") +
+                            ")</script>"
+                    );
 
                     awaitInfo.out.writer = asyncOut.writer;
 
-                    out.emit('await:finish', awaitInfo);
+                    out.emit("await:finish", awaitInfo);
 
                     out.flush();
 
@@ -62,14 +77,14 @@ module.exports = function(input, out) {
                         next();
                     }
                 })
-                .on('error', function(err) {
+                .on("error", function(err) {
                     asyncOut.error(err);
                 });
         }
 
         awaitContext.instances.forEach(handleAwait);
 
-        out.on('await:clientReorder', function(awaitInfo) {
+        out.on("await:clientReorder", function(awaitInfo) {
             remaining++;
             handleAwait(awaitInfo);
         });
diff --git a/src/taglibs/async/await-tag-transformer.js b/src/taglibs/async/await-tag-transformer.js
index 25030a1b2..c1d1e2fcc 100644
--- a/src/taglibs/async/await-tag-transformer.js
+++ b/src/taglibs/async/await-tag-transformer.js
@@ -1,17 +1,21 @@
-'use strict';
+"use strict";
 
-var isObjectEmpty = require('raptor-util/isObjectEmpty');
+var isObjectEmpty = require("raptor-util/isObjectEmpty");
 
 module.exports = function transform(el, context) {
-    if(!el.argument) {
-        context.addError('Invalid <await> tag. Argument is missing. Example: <await(user from data.userProvider)>');
+    if (!el.argument) {
+        context.addError(
+            "Invalid <await> tag. Argument is missing. Example: <await(user from data.userProvider)>"
+        );
         return;
     }
 
     var match = /^([$A-Z_][0-9A-Z_$]*) from (.*)$/i.exec(el.argument);
 
-    if(!match) {
-        context.addError('Invalid <await> tag. Argument is malformed. Example: <await(user from data.userProvider)>');
+    if (!match) {
+        context.addError(
+            "Invalid <await> tag. Argument is malformed. Example: <await(user from data.userProvider)>"
+        );
         return;
     }
 
@@ -19,14 +23,19 @@ module.exports = function transform(el, context) {
     var dataProviderAttr = match[2];
 
     if (!context.util.isValidJavaScriptIdentifier(varName)) {
-        context.addError('Invalid <await> tag. Argument\'s variable name should be a valid JavaScript identifier. Example: user, as in <await(user from data.userProvider)>');
+        context.addError(
+            "Invalid <await> tag. Argument's variable name should be a valid JavaScript identifier. Example: user, as in <await(user from data.userProvider)>"
+        );
         return;
     }
 
     var builder = context.builder;
 
-    el.setAttributeValue('_var', builder.literal(varName));
-    el.setAttributeValue('_dataProvider', builder.parseExpression(dataProviderAttr));
+    el.setAttributeValue("_var", builder.literal(varName));
+    el.setAttributeValue(
+        "_dataProvider",
+        builder.parseExpression(dataProviderAttr)
+    );
     el.argument = null;
 
     ////////////////////
@@ -34,28 +43,28 @@ module.exports = function transform(el, context) {
     var attrs = el.getAttributes().concat([]);
     var arg = {};
 
-    attrs.forEach((attr) => {
+    attrs.forEach(attr => {
         var attrName = attr.name;
-        if (attrName.startsWith('arg-')) {
-            let argName = attrName.substring('arg-'.length);
+        if (attrName.startsWith("arg-")) {
+            let argName = attrName.substring("arg-".length);
             arg[argName] = attr.value;
             el.removeAttribute(attrName);
         }
     });
 
-    var name = el.getAttributeValue('name');
+    var name = el.getAttributeValue("name");
     if (name == null) {
-        el.setAttributeValue('_name', builder.literal(dataProviderAttr));
+        el.setAttributeValue("_name", builder.literal(dataProviderAttr));
     }
 
-    if (el.hasAttribute('arg')) {
+    if (el.hasAttribute("arg")) {
         if (isObjectEmpty(arg)) {
-            arg = el.getAttributeValue('arg');
+            arg = el.getAttributeValue("arg");
         } else {
-            let mergeVar = context.helper('merge');
+            let mergeVar = context.helper("merge");
             arg = builder.functionCall(mergeVar, [
                 builder.literal(arg), // Input props from the attributes take precedence
-                el.getAttributeValue('arg')
+                el.getAttributeValue("arg")
             ]);
         }
     } else {
@@ -67,30 +76,33 @@ module.exports = function transform(el, context) {
     }
 
     if (arg) {
-        el.setAttributeValue('arg', arg);
+        el.setAttributeValue("arg", arg);
     }
 
-    var timeoutMessage = el.getAttributeValue('timeout-message');
+    var timeoutMessage = el.getAttributeValue("timeout-message");
     if (timeoutMessage) {
-        el.removeAttribute('timeout-message');
-        el.setAttributeValue('renderTimeout', builder.renderBodyFunction([
-            builder.text(timeoutMessage)
-        ]));
+        el.removeAttribute("timeout-message");
+        el.setAttributeValue(
+            "renderTimeout",
+            builder.renderBodyFunction([builder.text(timeoutMessage)])
+        );
     }
 
-    var errorMessage = el.getAttributeValue('error-message');
+    var errorMessage = el.getAttributeValue("error-message");
     if (errorMessage) {
-        el.removeAttribute('error-message');
-        el.setAttributeValue('renderError', builder.renderBodyFunction([
-            builder.text(errorMessage)
-        ]));
+        el.removeAttribute("error-message");
+        el.setAttributeValue(
+            "renderError",
+            builder.renderBodyFunction([builder.text(errorMessage)])
+        );
     }
 
-    var placeholder = el.getAttributeValue('placeholder');
+    var placeholder = el.getAttributeValue("placeholder");
     if (placeholder) {
-        el.removeAttribute('placeholder');
-        el.setAttributeValue('renderPlaceholder', builder.renderBodyFunction([
-            builder.text(placeholder)
-        ]));
+        el.removeAttribute("placeholder");
+        el.setAttributeValue(
+            "renderPlaceholder",
+            builder.renderBodyFunction([builder.text(placeholder)])
+        );
     }
 };
diff --git a/src/taglibs/async/await-tag.js b/src/taglibs/async/await-tag.js
index 23b172cd1..539cd8e60 100644
--- a/src/taglibs/async/await-tag.js
+++ b/src/taglibs/async/await-tag.js
@@ -1,11 +1,11 @@
-'use strict';
-var isClientReorderSupported = require('./client-reorder').isSupported;
-var AsyncValue = require('./AsyncValue');
+"use strict";
+var isClientReorderSupported = require("./client-reorder").isSupported;
+var AsyncValue = require("./AsyncValue");
 
 function safeRenderBody(renderBody, targetOut, data) {
     try {
         renderBody(targetOut, data);
-    } catch(err) {
+    } catch (err) {
         return err;
     }
 }
@@ -13,7 +13,7 @@ function safeRenderBody(renderBody, targetOut, data) {
 function requestData(provider, args, thisObj, timeout) {
     var asyncValue = new AsyncValue();
 
-    if (typeof provider === 'function') {
+    if (typeof provider === "function") {
         var callback = function(err, data) {
             if (err) {
                 asyncValue.___reject(err);
@@ -22,11 +22,12 @@ function requestData(provider, args, thisObj, timeout) {
             }
         };
 
-        var value = (provider.length === 1) ?
-            // one argument so only provide callback to function call
-            provider.call(thisObj, callback) :
-            // two arguments so provide args and callback to function call
-            provider.call(thisObj, args, callback);
+        var value =
+            provider.length === 1
+                ? // one argument so only provide callback to function call
+                  provider.call(thisObj, callback)
+                : // two arguments so provide args and callback to function call
+                  provider.call(thisObj, args, callback);
 
         if (value !== undefined) {
             asyncValue.___resolve(value);
@@ -43,12 +44,12 @@ function requestData(provider, args, thisObj, timeout) {
     if (timeout > 0) {
         let timeoutId = setTimeout(function() {
             timeoutId = null;
-            var error = new Error('Timed out after ' + timeout + 'ms');
-            error.code = 'ERR_AWAIT_TIMEDOUT';
+            var error = new Error("Timed out after " + timeout + "ms");
+            error.code = "ERR_AWAIT_TIMEDOUT";
             asyncValue.___reject(error);
         }, timeout);
 
-        asyncValue.___done(function(err, data) {
+        asyncValue.___done(function() {
             if (timeoutId != null) {
                 clearTimeout(timeoutId);
             }
@@ -58,14 +59,14 @@ function requestData(provider, args, thisObj, timeout) {
     return asyncValue;
 }
 
-const LAST_OPTIONS = { last: true, name: 'await:finish' };
+const LAST_OPTIONS = { last: true, name: "await:finish" };
 
 module.exports = function awaitTag(input, out) {
-
     var arg = input.arg || {};
     arg.out = out;
 
-    var clientReorder = isClientReorderSupported && input.clientReorder === true && !out.isVDOM;
+    var clientReorder =
+        isClientReorderSupported && input.clientReorder === true && !out.isVDOM;
 
     var name = input.name || input._name;
     var scope = input.scope || this;
@@ -96,21 +97,24 @@ module.exports = function awaitTag(input, out) {
     if (clientReorder) {
         awaitInfo.after = input.showAfter;
 
-        clientReorderContext = out.global.___clientReorderContext ||
+        clientReorderContext =
+            out.global.___clientReorderContext ||
             (out.global.___clientReorderContext = {
                 instances: [],
                 nextId: 0
             });
 
-        var id = awaitInfo.id = input.name || (clientReorderContext.nextId++);
-        var placeholderIdAttrValue = 'afph' + id;
+        var id = (awaitInfo.id = input.name || clientReorderContext.nextId++);
+        var placeholderIdAttrValue = "afph" + id;
 
         if (input.renderPlaceholder) {
             out.write('<span id="' + placeholderIdAttrValue + '">');
             input.renderPlaceholder(out);
-            out.write('</span>');
+            out.write("</span>");
         } else {
-            out.write('<noscript id="' + placeholderIdAttrValue + '"></noscript>');
+            out.write(
+                '<noscript id="' + placeholderIdAttrValue + '"></noscript>'
+            );
         }
 
         // If `client-reorder` is enabled then we asynchronously render the await instance to a new
@@ -128,7 +132,7 @@ module.exports = function awaitTag(input, out) {
         // - await:finish
         //
         asyncOut.emit = function(event) {
-            if (event !== 'finish' && event !== 'error') {
+            if (event !== "finish" && event !== "error") {
                 // We don't want to proxy the finish and error events since those are
                 // very specific to the AsyncWriter associated with the await instance
                 out.emit.apply(out, arguments);
@@ -141,9 +145,9 @@ module.exports = function awaitTag(input, out) {
             clientReorderContext.instances.push(awaitInfo);
         }
 
-        out.emit('await:clientReorder', awaitInfo);
+        out.emit("await:clientReorder", awaitInfo);
     } else {
-        asyncOut = awaitInfo.out =  out.beginAsync({
+        asyncOut = awaitInfo.out = out.beginAsync({
             timeout: 0, // We will use our code for controlling timeout
             name: name
         });
@@ -151,7 +155,7 @@ module.exports = function awaitTag(input, out) {
 
     var beforeRenderEmitted = false;
 
-    out.emit('await:begin', awaitInfo);
+    out.emit("await:begin", awaitInfo);
 
     function renderBody(err, data) {
         if (awaitInfo.finished) {
@@ -164,14 +168,18 @@ module.exports = function awaitTag(input, out) {
 
         if (!beforeRenderEmitted) {
             beforeRenderEmitted = true;
-            out.emit('await:beforeRender', awaitInfo);
+            out.emit("await:beforeRender", awaitInfo);
         }
 
         if (err) {
-            if (err.code === 'ERR_AWAIT_TIMEDOUT' && input.renderTimeout) {
+            if (err.code === "ERR_AWAIT_TIMEDOUT" && input.renderTimeout) {
                 input.renderTimeout(asyncOut);
             } else if (input.renderError) {
-                console.error('Await (' + name + ') failed. Error:', (err.stack || err));
+                // eslint-disable-next-line no-console
+                console.error(
+                    "Await (" + name + ") failed. Error:",
+                    err.stack || err
+                );
                 input.renderError(asyncOut);
             } else {
                 asyncOut.error(err);
@@ -179,7 +187,11 @@ module.exports = function awaitTag(input, out) {
         } else {
             var renderBodyFunc = input.renderBody;
             if (renderBodyFunc) {
-                var renderBodyErr = safeRenderBody(renderBodyFunc, asyncOut, data);
+                var renderBodyErr = safeRenderBody(
+                    renderBodyFunc,
+                    asyncOut,
+                    data
+                );
                 if (renderBodyErr) {
                     return renderBody(renderBodyErr);
                 }
@@ -203,7 +215,7 @@ module.exports = function awaitTag(input, out) {
                 // to pass along the original `asyncOut` because that has contextual
                 // information (such as the rendered UI components)
                 asyncOut.writer = asyncLastOut.writer;
-                out.emit('await:finish', awaitInfo);
+                out.emit("await:finish", awaitInfo);
                 asyncOut.writer = oldWriter;
                 asyncLastOut.end();
                 out.flush();
@@ -213,6 +225,5 @@ module.exports = function awaitTag(input, out) {
         }
     }
 
-
     asyncValue.___done(renderBody);
 };
diff --git a/src/taglibs/async/client-reorder-browser.js b/src/taglibs/async/client-reorder-browser.js
index 667405f49..c95ee1644 100644
--- a/src/taglibs/async/client-reorder-browser.js
+++ b/src/taglibs/async/client-reorder-browser.js
@@ -1 +1 @@
-exports.isSupported = false;
\ No newline at end of file
+exports.isSupported = false;
diff --git a/src/taglibs/async/client-reorder-runtime.js b/src/taglibs/async/client-reorder-runtime.js
index 71b7a3ffb..e76ec8890 100644
--- a/src/taglibs/async/client-reorder-runtime.js
+++ b/src/taglibs/async/client-reorder-runtime.js
@@ -1,35 +1,48 @@
-function $af(id, after, doc, sourceEl, targetEl, docFragment, childNodes, i, len, af) {
+function $af(
+    id,
+    after,
+    doc,
+    sourceEl,
+    targetEl,
+    docFragment,
+    childNodes,
+    i,
+    len,
+    af
+) {
     af = $af;
 
     if (after && !af[after]) {
-        (af[(after = after + '$')] || (af[after] = [])).push(id);
+        (af[(after = after + "$")] || (af[after] = [])).push(id);
     } else {
         doc = document;
-        sourceEl = doc.getElementById('af' + id);
-        targetEl = doc.getElementById('afph' + id);
+        sourceEl = doc.getElementById("af" + id);
+        targetEl = doc.getElementById("afph" + id);
         docFragment = doc.createDocumentFragment();
         childNodes = sourceEl.childNodes;
         i = 0;
-        len=childNodes.length;
+        len = childNodes.length;
 
-        for (; i<len; i++) {
+        for (; i < len; i++) {
             docFragment.appendChild(childNodes.item(0));
         }
 
         targetEl.parentNode.replaceChild(docFragment, targetEl);
         af[id] = 1;
 
-        after = af[id + '$'];
+        after = af[id + "$"];
 
         if (after) {
             i = 0;
             len = after.length;
 
-            for (; i<len; i++) {
+            for (; i < len; i++) {
                 af(after[i]);
             }
         }
     }
 
     // sourceEl.parentNode.removeChild(sourceEl);
-}
\ No newline at end of file
+}
+
+window.$af = $af;
diff --git a/src/taglibs/async/client-reorder.js b/src/taglibs/async/client-reorder.js
index 680e221c8..3bdd7b805 100644
--- a/src/taglibs/async/client-reorder.js
+++ b/src/taglibs/async/client-reorder.js
@@ -1,12 +1,15 @@
 var code;
-var fs = require('fs');
+var fs = require("fs");
 
 exports.isSupported = true;
 
 exports.getCode = function() {
     if (!code) {
-        code = fs.readFileSync(require.resolve('./client-reorder-runtime.min.js'), 'utf8');
-        code = '<script type="text/javascript">' + code + '</script>';
+        code = fs.readFileSync(
+            require.resolve("./client-reorder-runtime.min.js"),
+            "utf8"
+        );
+        code = '<script type="text/javascript">' + code + "</script>";
     }
     return code;
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/async/marko.json b/src/taglibs/async/marko.json
index b4ab2cbb7..59fa7f72f 100644
--- a/src/taglibs/async/marko.json
+++ b/src/taglibs/async/marko.json
@@ -33,34 +33,39 @@
                 {
                     "snippet": "name=\"${1:name}\""
                 },
-                {
-                }
+                {}
             ]
         },
         "@_name": "string",
         "@client-reorder": {
             "type": "boolean",
-            "description": "Use JavaScript on client to move async fragment into the proper place."
+            "description":
+                "Use JavaScript on client to move async fragment into the proper place."
         },
         "@scope": {
             "type": "expression",
-            "description": "The value of 'this' when invoking the data provider function (N/A with promises)"
+            "description":
+                "The value of 'this' when invoking the data provider function (N/A with promises)"
         },
         "@show-after": {
             "type": "string"
         },
 
-        "vars": [{
-            "name-from-attribute": "_var"
-        }],
+        "vars": [
+            {
+                "name-from-attribute": "_var"
+            }
+        ],
         "transformer": "./await-tag-transformer",
         "autocomplete": [
             {
                 "snippet": "await(${1:varName} from ${2:data.myDataProvider})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait><code>"
             }
         ]
     },
@@ -69,10 +74,12 @@
         "autocomplete": [
             {
                 "snippet": "await-reorderer",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-reorderer><code>"
             }
         ]
     },
@@ -80,7 +87,8 @@
         "transformer": "./await-nested-tag-transformer",
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-placeholder><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-placeholder><code>"
             }
         ]
     },
@@ -88,7 +96,8 @@
         "transformer": "./await-nested-tag-transformer",
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-timeout><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-timeout><code>"
             }
         ]
     },
@@ -96,7 +105,8 @@
         "transformer": "./await-nested-tag-transformer",
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-error><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/async-taglib/#<code>&ltawait-error><code>"
             }
         ]
     },
@@ -135,4 +145,4 @@
         },
         "deprecated": true
     }
-}
\ No newline at end of file
+}
diff --git a/src/taglibs/async/noop-render.js b/src/taglibs/async/noop-render.js
index d1a9cfce6..0a55f349a 100644
--- a/src/taglibs/async/noop-render.js
+++ b/src/taglibs/async/noop-render.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
+module.exports = function() {};
diff --git a/src/taglibs/cache/cached-fragment-tag-transformer.js b/src/taglibs/cache/cached-fragment-tag-transformer.js
index d767f9987..0e5afd9b8 100644
--- a/src/taglibs/cache/cached-fragment-tag-transformer.js
+++ b/src/taglibs/cache/cached-fragment-tag-transformer.js
@@ -1,9 +1,12 @@
-var defaultCacheManagerPath = require.resolve('./default-cache-manager');
+var defaultCacheManagerPath = require.resolve("./default-cache-manager");
 
 module.exports = function(el, context) {
-    if (!el.hasAttribute('cache-manager')) {
+    if (!el.hasAttribute("cache-manager")) {
         var requirePath = context.getRequirePath(defaultCacheManagerPath);
-        var defaultCacheManagerVar = context.importModule('__defaultCacheManager', requirePath);
-        el.setAttributeValue('cache-manager', defaultCacheManagerVar);
+        var defaultCacheManagerVar = context.importModule(
+            "__defaultCacheManager",
+            requirePath
+        );
+        el.setAttributeValue("cache-manager", defaultCacheManagerVar);
     }
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/cache/cached-fragment-tag.js b/src/taglibs/cache/cached-fragment-tag.js
index 378c07ec8..8f06442ec 100644
--- a/src/taglibs/cache/cached-fragment-tag.js
+++ b/src/taglibs/cache/cached-fragment-tag.js
@@ -1,18 +1,21 @@
-'use strict';
+"use strict";
 module.exports = {
-    render: function (input, out) {
+    render: function(input, out) {
         var cacheKey = input.cacheKey;
         if (!cacheKey) {
-            throw new Error('cache-key is required for <cached-fragment>');
+            throw new Error("cache-key is required for <cached-fragment>");
         }
 
         var cacheManager = input.cacheManager;
 
-        var cache = cacheManager.getCache(input.cacheName || 'marko/cached-fragment');
+        var cache = cacheManager.getCache(
+            input.cacheName || "marko/cached-fragment"
+        );
 
         var asyncOut = out.beginAsync();
 
-        cache.get(cacheKey,
+        cache.get(
+            cacheKey,
             {
                 builder: function(callback) {
                     var nestedOut = out.createOut();
@@ -22,21 +25,22 @@ module.exports = {
                     }
 
                     nestedOut
-                        .on('error', callback)
-                        .on('finish', function(result) {
+                        .on("error", callback)
+                        .on("finish", function(result) {
                             callback(null, result.getOutput());
                         });
 
                     nestedOut.end();
                 }
-            }, function(err, result) {
+            },
+            function(err, result) {
                 if (err) {
                     return asyncOut.error(err);
                 }
 
                 if (result.___cloneNode) {
                     var curChild = result.___firstChild;
-                    while(curChild) {
+                    while (curChild) {
                         asyncOut.node(curChild.___cloneNode());
                         curChild = curChild.___nextSibling;
                     }
@@ -44,8 +48,7 @@ module.exports = {
                 } else {
                     asyncOut.end(result);
                 }
-
-
-            });
+            }
+        );
     }
 };
diff --git a/src/taglibs/cache/default-cache-manager.js b/src/taglibs/cache/default-cache-manager.js
index 2ffd33045..6a785a4d2 100644
--- a/src/taglibs/cache/default-cache-manager.js
+++ b/src/taglibs/cache/default-cache-manager.js
@@ -34,4 +34,4 @@ var defaultCacheManager = {
     }
 };
 
-module.exports = defaultCacheManager;
\ No newline at end of file
+module.exports = defaultCacheManager;
diff --git a/src/taglibs/cache/marko.json b/src/taglibs/cache/marko.json
index f7f22a977..38c5e5e06 100644
--- a/src/taglibs/cache/marko.json
+++ b/src/taglibs/cache/marko.json
@@ -6,4 +6,4 @@
         "@cache-manager": "string",
         "transformer": "./cached-fragment-tag-transformer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/src/taglibs/compiler.browser.json b/src/taglibs/compiler.browser.json
index d964acd5e..eaf17bec8 100644
--- a/src/taglibs/compiler.browser.json
+++ b/src/taglibs/compiler.browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: **/*.js"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: **/*.js"]
+}
diff --git a/src/taglibs/core/assign-tag.js b/src/taglibs/core/assign-tag.js
index 4a6123567..d526511c4 100644
--- a/src/taglibs/core/assign-tag.js
+++ b/src/taglibs/core/assign-tag.js
@@ -1,17 +1,21 @@
 module.exports = function codeGenerator(elNode, codegen) {
     var context = codegen.context;
-    context.deprecate('The "<assign>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags');
+    context.deprecate(
+        'The "<assign>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags'
+    );
 
     var attributes = elNode.attributes;
 
     if (!attributes) {
-        codegen.addError('Invalid <assign> tag. Argument is missing. Example; <assign x=123 />');
+        codegen.addError(
+            "Invalid <assign> tag. Argument is missing. Example; <assign x=123 />"
+        );
         return elNode;
     }
 
     var builder = codegen.builder;
 
-    return attributes.map((attr) => {
+    return attributes.map(attr => {
         if (attr.value == null) {
             return builder.parseExpression(attr.name);
         } else {
diff --git a/src/taglibs/core/class-tag.js b/src/taglibs/core/class-tag.js
index b434b01ee..d232b7ee2 100644
--- a/src/taglibs/core/class-tag.js
+++ b/src/taglibs/core/class-tag.js
@@ -1,7 +1,9 @@
 module.exports = function functionCodeGenerator(el, codegen) {
-    if(el.parentNode.type !== 'TemplateRoot') {
-        codegen.addError('class is a static tag and can only be declared at the template root');
+    if (el.parentNode.type !== "TemplateRoot") {
+        codegen.addError(
+            "class is a static tag and can only be declared at the template root"
+        );
     }
     codegen.addStaticCode(codegen.builder.expression(el.tagString));
     return null;
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/core-transformer.js b/src/taglibs/core/core-transformer.js
index 010ccbe2c..59c6435d8 100644
--- a/src/taglibs/core/core-transformer.js
+++ b/src/taglibs/core/core-transformer.js
@@ -1,10 +1,11 @@
-'use strict';
+"use strict";
 
-var createLoopNode = require('./util/createLoopNode');
+var createLoopNode = require("./util/createLoopNode");
 
 var coreAttrHandlers = [
     [
-        'while', function(attr, node) {
+        "while",
+        function(attr, node) {
             var whileArgument = attr.argument;
             if (!whileArgument) {
                 return false;
@@ -15,7 +16,8 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'for', function(attr, node) {
+        "for",
+        function(attr, node) {
             var forArgument = attr.argument;
             if (!forArgument) {
                 return false;
@@ -25,8 +27,8 @@ var coreAttrHandlers = [
 
             try {
                 loopNode = createLoopNode(forArgument, null, this.builder);
-            } catch(e) {
-                if (e.code === 'INVALID_FOR') {
+            } catch (e) {
+                if (e.code === "INVALID_FOR") {
                     this.addError(e.message);
                     return;
                 } else {
@@ -34,7 +36,6 @@ var coreAttrHandlers = [
                 }
             }
 
-
             //Surround the existing node with the newly created loop node
             // NOTE: The loop node will be one of the following:
             //       ForEach, ForRange, ForEachProp or ForStatement
@@ -42,7 +43,8 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'if', function(attr, node) {
+        "if",
+        function(attr, node) {
             var ifArgument = attr.argument;
             if (!ifArgument) {
                 return false;
@@ -51,9 +53,11 @@ var coreAttrHandlers = [
             var test;
             try {
                 test = this.builder.parseExpression(ifArgument);
-            } catch(e) {
+            } catch (e) {
                 test = this.builder.literalFalse();
-                this.addError('Invalid expression for if statement:\n' + e.message);
+                this.addError(
+                    "Invalid expression for if statement:\n" + e.message
+                );
             }
 
             var ifNode = this.builder.ifStatement(test);
@@ -62,7 +66,8 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'unless', function(attr, node) {
+        "unless",
+        function(attr, node) {
             var ifArgument = attr.argument;
             if (!ifArgument) {
                 return false;
@@ -71,9 +76,11 @@ var coreAttrHandlers = [
             var test;
             try {
                 test = this.builder.parseExpression(ifArgument);
-            } catch(e) {
+            } catch (e) {
                 test = this.builder.literalFalse();
-                this.addError('Invalid expression for unless statement:\n' + e.message);
+                this.addError(
+                    "Invalid expression for unless statement:\n" + e.message
+                );
             }
 
             test = this.builder.negate(test);
@@ -83,7 +90,8 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'else-if', function(attr, node) {
+        "else-if",
+        function(attr, node) {
             var elseIfArgument = attr.argument;
             if (!elseIfArgument) {
                 return false;
@@ -92,9 +100,11 @@ var coreAttrHandlers = [
             var test;
             try {
                 test = this.builder.parseExpression(elseIfArgument);
-            } catch(e) {
+            } catch (e) {
                 test = this.builder.literalFalse();
-                this.addError('Invalid expression for else-if statement:\n' + e.message);
+                this.addError(
+                    "Invalid expression for else-if statement:\n" + e.message
+                );
             }
 
             var elseIfNode = this.builder.elseIfStatement(test);
@@ -103,14 +113,16 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'else', function(attr, node) {
+        "else",
+        function(attr, node) {
             var elseNode = this.builder.elseStatement();
             //Surround the existing node with an "Else" node
             node.wrapWith(elseNode);
         }
     ],
     [
-        'body-only-if', function(attr, node, el) {
+        "body-only-if",
+        function(attr, node, el) {
             var argument = attr.argument;
             if (!argument) {
                 return false;
@@ -119,26 +131,35 @@ var coreAttrHandlers = [
             var test;
             try {
                 test = this.builder.parseExpression(argument);
-            } catch(e) {
+            } catch (e) {
                 test = this.builder.literalFalse();
-                this.addError('Invalid expression for body-only-if statement:\n' + e.message);
+                this.addError(
+                    "Invalid expression for body-only-if statement:\n" +
+                        e.message
+                );
             }
 
             el.setBodyOnlyIf(test);
         }
     ],
     [
-        'marko-preserve-whitespace', function(attr, node, el) {
+        "marko-preserve-whitespace",
+        function(attr, node, el) {
             el.setPreserveWhitespace(true);
         }
     ],
     [
-        'marko-init', function(attr, node, el) {
-            if (el.tagName !== 'script') {
-                this.addError('The "marko-init" attribute should only be used on the <script> tag');
+        "marko-init",
+        function(attr, node, el) {
+            if (el.tagName !== "script") {
+                this.addError(
+                    'The "marko-init" attribute should only be used on the <script> tag'
+                );
                 return;
             }
-            this.context.deprecate('The "marko-init" attribute is deprecated.  Use the static tag instead. See https://github.com/marko-js/marko/issues/547');
+            this.context.deprecate(
+                'The "marko-init" attribute is deprecated.  Use the static tag instead. See https://github.com/marko-js/marko/issues/547'
+            );
             var bodyText = el.bodyText;
             el.noOutput = true;
             this.context.addStaticCode(bodyText);
@@ -147,12 +168,17 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'template-helpers', function(attr, node, el) {
-            if (el.tagName !== 'script') {
-                this.addError('The "template-helpers" attribute should only be used on the <script> tag');
+        "template-helpers",
+        function(attr, node, el) {
+            if (el.tagName !== "script") {
+                this.addError(
+                    'The "template-helpers" attribute should only be used on the <script> tag'
+                );
                 return;
             }
-            this.context.deprecate('The "template-helpers" attribute is deprecated and will be removed in the next release candidate. Use the static tag instead. See https://github.com/marko-js/marko/issues/547');
+            this.context.deprecate(
+                'The "template-helpers" attribute is deprecated and will be removed in the next release candidate. Use the static tag instead. See https://github.com/marko-js/marko/issues/547'
+            );
             var bodyText = el.bodyText;
             el.noOutput = true;
             this.context.addStaticCode(bodyText);
@@ -161,17 +187,24 @@ var coreAttrHandlers = [
         }
     ],
     [
-        'include', function(attr, node, el) {
+        "include",
+        function(attr, node, el) {
             var context = this.context;
 
-            if (typeof attr.argument === 'string') {
+            if (typeof attr.argument === "string") {
                 if (attr.argument) {
-                    var includeNode = context.createNodeForEl('include', null, attr.argument);
-                    node.appendChild(includeNode);                    
+                    var includeNode = context.createNodeForEl(
+                        "include",
+                        null,
+                        attr.argument
+                    );
+                    node.appendChild(includeNode);
                 } else {
-                    context.addError(el, 'The include attribute must have an argument. For example: include("./target.marko") or include(data.renderBody)');
+                    context.addError(
+                        el,
+                        'The include attribute must have an argument. For example: include("./target.marko") or include(data.renderBody)'
+                    );
                 }
-
             } else {
                 return false;
             }
@@ -203,18 +236,23 @@ coreAttrHandlers.forEach(function(attrHandler) {
 var attributeTransformers = AttributeTransformer.prototype;
 
 module.exports = function transform(el, context) {
-    el.removeAttribute('marko-body'); // This attribute is handled at parse time. We can just remove it now
+    el.removeAttribute("marko-body"); // This attribute is handled at parse time. We can just remove it now
 
     var attributeTransfomer;
     var node = el;
 
-    el.forEachAttribute((attr) => {
+    el.forEachAttribute(attr => {
         let attrName = attr.name;
         if (!attrName && !attr.spread) {
             if (!node.addDynamicAttributes) {
-                context.addError(el, 'Node does not support the "attrs" attribute');
+                context.addError(
+                    el,
+                    'Node does not support the "attrs" attribute'
+                );
             } else {
-                context.deprecate('${attrs} is deprecated, use ...attrs instead');
+                context.deprecate(
+                    "${attrs} is deprecated, use ...attrs instead"
+                );
                 node.addDynamicAttributes(attr.value);
             }
             return;
@@ -237,4 +275,4 @@ module.exports = function transform(el, context) {
             }
         }
     });
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/else-if-tag.js b/src/taglibs/core/else-if-tag.js
index ebffbf529..ca339e085 100644
--- a/src/taglibs/core/else-if-tag.js
+++ b/src/taglibs/core/else-if-tag.js
@@ -2,23 +2,26 @@ module.exports = function nodeFactory(el, context) {
     var argument = el.argument;
     var attributes = el.attributes;
 
-
     if (!argument) {
-        context.addError('Invalid <else-if> tag. Argument is missing. Example; <if(foo === true)>');
+        context.addError(
+            "Invalid <else-if> tag. Argument is missing. Example; <if(foo === true)>"
+        );
         return el;
     }
 
     if (attributes.length) {
-        context.addError('Invalid <else-if> tag. Attributes not allowed.');
+        context.addError("Invalid <else-if> tag. Attributes not allowed.");
         return el;
     }
 
     var test;
     try {
         test = context.builder.parseExpression(argument);
-    } catch(e) {
+    } catch (e) {
         test = context.builder.literalFalse();
-        context.addError('Invalid expression for else-if statement:\n' + e.message);
+        context.addError(
+            "Invalid expression for else-if statement:\n" + e.message
+        );
     }
 
     var elseIfStatement = context.builder.elseIfStatement(test);
diff --git a/src/taglibs/core/else-tag.js b/src/taglibs/core/else-tag.js
index 425285081..a98a56c63 100644
--- a/src/taglibs/core/else-tag.js
+++ b/src/taglibs/core/else-tag.js
@@ -1,26 +1,34 @@
-'use strict';
+"use strict";
 
 module.exports = function nodeFactory(el, context) {
-
     var elseStatement = context.builder.elseStatement();
 
     var argument = el.argument;
     if (argument) {
-        context.addError(elseStatement, 'Invalid <else> tag. Argument is not allowed');
+        context.addError(
+            elseStatement,
+            "Invalid <else> tag. Argument is not allowed"
+        );
     }
 
-    if (el.hasAttribute('if')) {
-        let ifAttr = el.getAttribute('if');
-        el.removeAttribute('if');
+    if (el.hasAttribute("if")) {
+        let ifAttr = el.getAttribute("if");
+        el.removeAttribute("if");
 
         if (el.attributes.length) {
-            context.addError(elseStatement, 'Invalid <else if> tag. Only the "if" attribute is allowed.');
+            context.addError(
+                elseStatement,
+                'Invalid <else if> tag. Only the "if" attribute is allowed.'
+            );
             return el;
         }
 
         var testExpression = ifAttr.argument;
         if (!testExpression) {
-            context.addError(elseStatement, 'Invalid <else if> tag. Invalid "if" attribute. Expected: <else if(<test>)>');
+            context.addError(
+                elseStatement,
+                'Invalid <else if> tag. Invalid "if" attribute. Expected: <else if(<test>)>'
+            );
             return el;
         }
         var elseIfStatement = context.builder.elseIfStatement(testExpression);
@@ -28,9 +36,12 @@ module.exports = function nodeFactory(el, context) {
     }
 
     if (el.attributes.length) {
-        context.addError(elseStatement, 'Invalid <else> tag. Attributes not allowed.');
+        context.addError(
+            elseStatement,
+            "Invalid <else> tag. Attributes not allowed."
+        );
         return el;
     }
 
     return elseStatement;
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/for-tag.js b/src/taglibs/core/for-tag.js
index 6f65892a5..9b2e1f332 100644
--- a/src/taglibs/core/for-tag.js
+++ b/src/taglibs/core/for-tag.js
@@ -1,9 +1,11 @@
-var createLoopNode = require('./util/createLoopNode');
+var createLoopNode = require("./util/createLoopNode");
 
 module.exports = function codeGenerator(elNode, codegen) {
     var argument = elNode.argument;
     if (!argument) {
-        codegen.addError('Invalid <for> tag. Argument is missing. Example: <for(color in colors)>');
+        codegen.addError(
+            "Invalid <for> tag. Argument is missing. Example: <for(color in colors)>"
+        );
         return elNode;
     }
 
@@ -12,12 +14,11 @@ module.exports = function codeGenerator(elNode, codegen) {
     try {
         var loopNode = createLoopNode(argument, elNode.body, builder);
         return loopNode;
-    } catch(e) {
-        if (e.code === 'INVALID_FOR') {
+    } catch (e) {
+        if (e.code === "INVALID_FOR") {
             codegen.addError(e.message);
         } else {
             throw e;
         }
     }
-
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/if-tag.js b/src/taglibs/core/if-tag.js
index 6c5d93ce5..717cb9169 100644
--- a/src/taglibs/core/if-tag.js
+++ b/src/taglibs/core/if-tag.js
@@ -2,14 +2,16 @@ module.exports = function nodeFactory(elNode, context) {
     var argument = elNode.argument;
 
     if (!argument) {
-        context.addError('Invalid <if> tag. Argument is missing. Example; <if(foo === true)>');
+        context.addError(
+            "Invalid <if> tag. Argument is missing. Example; <if(foo === true)>"
+        );
         return elNode;
     }
 
     var attributes = elNode.attributes;
 
     if (attributes.length) {
-        context.addError('Invalid <if> tag. Attributes not allowed.');
+        context.addError("Invalid <if> tag. Attributes not allowed.");
         return;
     }
 
@@ -17,10 +19,10 @@ module.exports = function nodeFactory(elNode, context) {
 
     try {
         test = context.builder.parseExpression(argument);
-    } catch(e) {
+    } catch (e) {
         test = context.builder.literalFalse();
-        context.addError('Invalid expression for if statement:\n' + e.message);
+        context.addError("Invalid expression for if statement:\n" + e.message);
     }
 
     return context.builder.ifStatement(test);
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/import-tag.js b/src/taglibs/core/import-tag.js
index 992756810..472bbf3a3 100644
--- a/src/taglibs/core/import-tag.js
+++ b/src/taglibs/core/import-tag.js
@@ -1,5 +1,5 @@
-var isValidJavaScriptVarName = require('../../compiler/util/isValidJavaScriptVarName');
-var parseImport = require('./util/parseImport');
+var isValidJavaScriptVarName = require("../../compiler/util/isValidJavaScriptVarName");
+var parseImport = require("./util/parseImport");
 
 module.exports = function codeGenerator(el, codegen) {
     var builder = codegen.builder;
@@ -10,23 +10,35 @@ module.exports = function codeGenerator(el, codegen) {
         var varName = arg.name;
 
         if (!isValidJavaScriptVarName(varName)) {
-            codegen.addError('Invalid JavaScript variable name: ' + varName, 'INVALID_VAR_NAME');
+            codegen.addError(
+                "Invalid JavaScript variable name: " + varName,
+                "INVALID_VAR_NAME"
+            );
             return;
         }
 
         if (arg.module) {
             var requireExpression = builder.require(builder.literal(arg.value));
-            var moduleName = 'module_' + varName;
+            var moduleName = "module_" + varName;
 
             if (varName) {
                 // saves identifier under a module alias.
-                vars[varName] = codegen.addStaticVar(moduleName, requireExpression);
+                vars[varName] = codegen.addStaticVar(
+                    moduleName,
+                    requireExpression
+                );
                 // extracts out the default export.
-                codegen.addStaticVar(varName, builder.logicalExpression(
-                    builder.memberExpression(moduleName, builder.identifier('default')),
-                    '||',
-                    moduleName
-                ));
+                codegen.addStaticVar(
+                    varName,
+                    builder.logicalExpression(
+                        builder.memberExpression(
+                            moduleName,
+                            builder.identifier("default")
+                        ),
+                        "||",
+                        moduleName
+                    )
+                );
             } else {
                 // require without saving var.
                 codegen.addStaticCode(requireExpression);
@@ -35,14 +47,17 @@ module.exports = function codeGenerator(el, codegen) {
             // ie: { bar } from "./bar"
             var modIdentifier = vars[arg.value.object];
             if (!modIdentifier) {
-                codegen.addError('Variable not found: ' + arg.value.object);
+                codegen.addError("Variable not found: " + arg.value.object);
                 return;
             }
 
-            codegen.addStaticVar(varName, builder.memberExpression(
-                modIdentifier,
-                builder.identifier(arg.value.property)
-            ));
+            codegen.addStaticVar(
+                varName,
+                builder.memberExpression(
+                    modIdentifier,
+                    builder.identifier(arg.value.property)
+                )
+            );
         }
     });
 
diff --git a/src/taglibs/core/include-html-tag-browser.js b/src/taglibs/core/include-html-tag-browser.js
index 266a504a6..d1425c694 100644
--- a/src/taglibs/core/include-html-tag-browser.js
+++ b/src/taglibs/core/include-html-tag-browser.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 module.exports = function codeGenerator(el, codegen) {
     let argument = el.argument;
     if (!argument) {
@@ -7,11 +7,22 @@ module.exports = function codeGenerator(el, codegen) {
 
     let builder = codegen.builder;
     let pathExpression = builder.parseExpression(argument);
-    if (pathExpression.type !== 'Literal' || typeof pathExpression.value !== 'string') {
-        codegen.addError('Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>');
+    if (
+        pathExpression.type !== "Literal" ||
+        typeof pathExpression.value !== "string"
+    ) {
+        codegen.addError(
+            'Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>'
+        );
         return;
     }
 
     var path = pathExpression.value;
-    return builder.text(builder.literal('<include-html> cannot be compiled in the browser (path="' + path + '")'));
-};
\ No newline at end of file
+    return builder.text(
+        builder.literal(
+            '<include-html> cannot be compiled in the browser (path="' +
+                path +
+                '")'
+        )
+    );
+};
diff --git a/src/taglibs/core/include-html-tag.js b/src/taglibs/core/include-html-tag.js
index 0ef70b987..fbaa1f946 100644
--- a/src/taglibs/core/include-html-tag.js
+++ b/src/taglibs/core/include-html-tag.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-var resolveFrom = require('resolve-from');
-var fs = require('fs');
+var resolveFrom = require("resolve-from");
+var fs = require("fs");
 
 module.exports = function codeGenerator(el, codegen) {
     let argument = el.argument;
@@ -11,8 +11,13 @@ module.exports = function codeGenerator(el, codegen) {
 
     let builder = codegen.builder;
     let pathExpression = builder.parseExpression(argument);
-    if (pathExpression.type !== 'Literal' || typeof pathExpression.value !== 'string') {
-        codegen.addError('Argument to the <include-html> tag should be a string value: <include-html("./foo.txt")/>');
+    if (
+        pathExpression.type !== "Literal" ||
+        typeof pathExpression.value !== "string"
+    ) {
+        codegen.addError(
+            'Argument to the <include-html> tag should be a string value: <include-html("./foo.txt")/>'
+        );
         return;
     }
 
@@ -20,11 +25,14 @@ module.exports = function codeGenerator(el, codegen) {
     var dirname = codegen.context.dirname;
     try {
         path = resolveFrom(dirname, path);
-    } catch(e) {
-        codegen.addError('File not found: ' + path);
+    } catch (e) {
+        codegen.addError("File not found: " + path);
         return;
     }
 
-    var txt = fs.readFileSync(path, { encoding: 'utf8' });
-    return builder.text(builder.literal(txt), false /* do not escape since this is HTML*/);
-};
\ No newline at end of file
+    var txt = fs.readFileSync(path, { encoding: "utf8" });
+    return builder.text(
+        builder.literal(txt),
+        false /* do not escape since this is HTML*/
+    );
+};
diff --git a/src/taglibs/core/include-tag-transformer.js b/src/taglibs/core/include-tag-transformer.js
index f6eb46bb4..5acd7e21f 100644
--- a/src/taglibs/core/include-tag-transformer.js
+++ b/src/taglibs/core/include-tag-transformer.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 module.exports = function(el, context) {
     let builder = context.builder;
@@ -10,7 +10,7 @@ module.exports = function(el, context) {
         let target = args[0];
         let arg = args[1];
 
-        if (target.type === 'Literal') {
+        if (target.type === "Literal") {
             target = context.importTemplate(target.value);
         }
 
@@ -23,7 +23,10 @@ module.exports = function(el, context) {
         }
 
         el.addProps(includeProps);
-    } else if (!el.hasProp('_target')) {
-        context.addError(el, 'The <include(...)> tag must have an argument: <include("./target.marko")/> or <include(data.renderBody)/>');
+    } else if (!el.hasProp("_target")) {
+        context.addError(
+            el,
+            'The <include(...)> tag must have an argument: <include("./target.marko")/> or <include(data.renderBody)/>'
+        );
     }
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/include-tag.js b/src/taglibs/core/include-tag.js
index 7ff7f7842..40b7dc020 100644
--- a/src/taglibs/core/include-tag.js
+++ b/src/taglibs/core/include-tag.js
@@ -1,12 +1,14 @@
-var RENDER_BODY_TOKEN = '%FN';
-var RENDER_BODY_TO_JSON = function() { return RENDER_BODY_TOKEN; };
+var RENDER_BODY_TOKEN = "%FN";
+var RENDER_BODY_TO_JSON = function() {
+    return RENDER_BODY_TOKEN;
+};
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
-var IS_SERVER = typeof window === 'undefined';
+var IS_SERVER = typeof window === "undefined";
 
 function doInclude(input, out, throwError) {
     var target = input._target;
     var arg = input._arg || input;
-    var renderBody = target && target.renderBody || target;
+    var renderBody = (target && target.renderBody) || target;
 
     if (target) {
         if (target.renderer) {
@@ -15,29 +17,35 @@ function doInclude(input, out, throwError) {
             return target.render(arg, out), true;
         } else if (target.safeHTML) {
             return out.write(target.safeHTML), true;
-        } else if (typeof renderBody !== 'function' && renderBody !== RENDER_BODY_TOKEN) {
-            if (typeof target === 'string') {
+        } else if (
+            typeof renderBody !== "function" &&
+            renderBody !== RENDER_BODY_TOKEN
+        ) {
+            if (typeof target === "string") {
                 // TODO: deprecate this
-                return (target && out.text(target)), true;
+                return target && out.text(target), true;
             } else if (throwError) {
-                out.error('Invalid include target');
+                out.error("Invalid include target");
             }
         }
     }
 
     if (renderBody) {
         var componentsContext = out.___components;
-        var componentDef = componentsContext && componentsContext.___componentDef;
-        var willRerenderInBrowser = componentDef && (componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER);
-        var key = (componentDef && componentDef.id) + ' ' + out.___assignedKey;
+        var componentDef =
+            componentsContext && componentsContext.___componentDef;
+        var willRerenderInBrowser =
+            componentDef &&
+            componentDef.___flags & FLAG_WILL_RERENDER_IN_BROWSER;
+        var key = (componentDef && componentDef.id) + " " + out.___assignedKey;
         var isFn = renderBody !== RENDER_BODY_TOKEN;
-        var insertMarkers = (IS_SERVER && willRerenderInBrowser)  || !isFn;
-        if (insertMarkers) out.comment('F^'+key);
+        var insertMarkers = (IS_SERVER && willRerenderInBrowser) || !isFn;
+        if (insertMarkers) out.comment("F^" + key);
         if (renderBody !== RENDER_BODY_TOKEN) {
             renderBody.toJSON = RENDER_BODY_TO_JSON;
             renderBody(out, arg);
         }
-        if (insertMarkers) out.comment('F/'+key);
+        if (insertMarkers) out.comment("F/" + key);
     }
 }
 
diff --git a/src/taglibs/core/include-text-tag-browser.js b/src/taglibs/core/include-text-tag-browser.js
index f8fcc402a..597f79066 100644
--- a/src/taglibs/core/include-text-tag-browser.js
+++ b/src/taglibs/core/include-text-tag-browser.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 module.exports = function codeGenerator(el, codegen) {
     let argument = el.argument;
     if (!argument) {
@@ -7,11 +7,22 @@ module.exports = function codeGenerator(el, codegen) {
 
     let builder = codegen.builder;
     let pathExpression = builder.parseExpression(argument);
-    if (pathExpression.type !== 'Literal' || typeof pathExpression.value !== 'string') {
-        codegen.addError('Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>');
+    if (
+        pathExpression.type !== "Literal" ||
+        typeof pathExpression.value !== "string"
+    ) {
+        codegen.addError(
+            'Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>'
+        );
         return;
     }
 
     var path = pathExpression.value;
-    return builder.text(builder.literal('<include-text> cannot be compiled in the browser (path="' + path + '")'));
-};
\ No newline at end of file
+    return builder.text(
+        builder.literal(
+            '<include-text> cannot be compiled in the browser (path="' +
+                path +
+                '")'
+        )
+    );
+};
diff --git a/src/taglibs/core/include-text-tag.js b/src/taglibs/core/include-text-tag.js
index f6636103b..3ce71767e 100644
--- a/src/taglibs/core/include-text-tag.js
+++ b/src/taglibs/core/include-text-tag.js
@@ -1,7 +1,7 @@
-'use strict';
+"use strict";
 
-var resolveFrom = require('resolve-from');
-var fs = require('fs');
+var resolveFrom = require("resolve-from");
+var fs = require("fs");
 
 module.exports = function codeGenerator(el, codegen) {
     let argument = el.argument;
@@ -11,8 +11,13 @@ module.exports = function codeGenerator(el, codegen) {
 
     let builder = codegen.builder;
     let pathExpression = builder.parseExpression(argument);
-    if (pathExpression.type !== 'Literal' || typeof pathExpression.value !== 'string') {
-        codegen.addError('Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>');
+    if (
+        pathExpression.type !== "Literal" ||
+        typeof pathExpression.value !== "string"
+    ) {
+        codegen.addError(
+            'Argument to the <include-text> tag should be a string value: <include-text("./foo.txt")/>'
+        );
         return;
     }
 
@@ -20,11 +25,11 @@ module.exports = function codeGenerator(el, codegen) {
     var dirname = codegen.context.dirname;
     try {
         path = resolveFrom(dirname, path);
-    } catch(e) {
-        codegen.addError('File not found: ' + path);
+    } catch (e) {
+        codegen.addError("File not found: " + path);
         return;
     }
 
-    var txt = fs.readFileSync(path, { encoding: 'utf8' });
+    var txt = fs.readFileSync(path, { encoding: "utf8" });
     return builder.text(builder.literal(txt));
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/invoke-tag.js b/src/taglibs/core/invoke-tag.js
index 3c53a24df..5a68f79c5 100644
--- a/src/taglibs/core/invoke-tag.js
+++ b/src/taglibs/core/invoke-tag.js
@@ -1,21 +1,27 @@
 module.exports = function codeGenerator(elNode, codegen) {
     var context = codegen.context;
-    context.deprecate('The "<invoke>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags');
+    context.deprecate(
+        'The "<invoke>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags'
+    );
 
     var functionAttr = elNode.attributes[0];
     if (!functionAttr) {
-        codegen.addError('Invalid <invoke> tag. Missing function attribute. Expected: <invoke console.log("Hello World")');
+        codegen.addError(
+            'Invalid <invoke> tag. Missing function attribute. Expected: <invoke console.log("Hello World")'
+        );
         return;
     }
 
     var arg = functionAttr.argument;
 
     if (arg === undefined) {
-        codegen.addError('Invalid <invoke> tag. Missing function arguments. Expected: <invoke console.log("Hello World")');
+        codegen.addError(
+            'Invalid <invoke> tag. Missing function arguments. Expected: <invoke console.log("Hello World")'
+        );
         return;
     }
 
     var functionName = functionAttr.name;
-    var functionCallExpression = functionName + '(' + arg + ')';
+    var functionCallExpression = functionName + "(" + arg + ")";
     return codegen.builder.parseExpression(functionCallExpression);
 };
diff --git a/src/taglibs/core/macro-body-tag.js b/src/taglibs/core/macro-body-tag.js
index d7fee940d..ddee4777d 100644
--- a/src/taglibs/core/macro-body-tag.js
+++ b/src/taglibs/core/macro-body-tag.js
@@ -1,7 +1,7 @@
 module.exports = function codeGenerator(elNode, codegen) {
     var builder = codegen.builder;
-    
-    return builder.ifStatement(builder.identifier('renderBody'), [
-        builder.functionCall('renderBody', ['out'])
+
+    return builder.ifStatement(builder.identifier("renderBody"), [
+        builder.functionCall("renderBody", ["out"])
     ]);
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/macro-tag.js b/src/taglibs/core/macro-tag.js
index 0dc766bb8..7997c5a4c 100644
--- a/src/taglibs/core/macro-tag.js
+++ b/src/taglibs/core/macro-tag.js
@@ -1,10 +1,12 @@
 module.exports = function nodeFactory(elNode, context) {
-
     var attributes = elNode.attributes;
     var defAttr = attributes[0];
 
-    if(!defAttr || defAttr.value !== undefined) {
-        context.addError(elNode, 'The <macro> tag must contain a name as its first attribute, example: <macro greeting()>');
+    if (!defAttr || defAttr.value !== undefined) {
+        context.addError(
+            elNode,
+            "The <macro> tag must contain a name as its first attribute, example: <macro greeting()>"
+        );
         return elNode;
     }
 
@@ -12,7 +14,10 @@ module.exports = function nodeFactory(elNode, context) {
     var macroName = defAttr.name;
 
     if (context.isMacro(macroName)) {
-        context.addError(elNode, `<macro> tag with duplicate name of "${macroName}" found.`);
+        context.addError(
+            elNode,
+            `<macro> tag with duplicate name of "${macroName}" found.`
+        );
         return elNode;
     }
 
diff --git a/src/taglibs/core/marko-preserve-whitespace-tag.js b/src/taglibs/core/marko-preserve-whitespace-tag.js
index f4de32091..005eb517d 100644
--- a/src/taglibs/core/marko-preserve-whitespace-tag.js
+++ b/src/taglibs/core/marko-preserve-whitespace-tag.js
@@ -1,3 +1,3 @@
-module.exports = function codeGenerator(elNode, codegen) {
+module.exports = function codeGenerator(elNode) {
     return elNode.body;
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/marko-tag.js b/src/taglibs/core/marko-tag.js
index ed660f199..286ae42e3 100644
--- a/src/taglibs/core/marko-tag.js
+++ b/src/taglibs/core/marko-tag.js
@@ -1,14 +1,18 @@
-'use strict';
+"use strict";
 
 module.exports = function codeGenerator(elNode, codegen) {
     var builder = codegen.builder;
 
-    if (elNode.hasAttribute('no-browser-rerender')) {
+    if (elNode.hasAttribute("no-browser-rerender")) {
         let lhs = builder.memberExpression(
-            builder.identifier('out'),
-            builder.identifier('global'));
+            builder.identifier("out"),
+            builder.identifier("global")
+        );
 
-        lhs = builder.memberExpression(lhs, builder.identifier('noBrowserRerender'));
+        lhs = builder.memberExpression(
+            lhs,
+            builder.identifier("noBrowserRerender")
+        );
 
         let rhs = builder.literal(true);
 
diff --git a/src/taglibs/core/marko.json b/src/taglibs/core/marko.json
index 4c51e68de..9c3d55a91 100644
--- a/src/taglibs/core/marko.json
+++ b/src/taglibs/core/marko.json
@@ -13,7 +13,8 @@
         "attributes": {},
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
             }
         ]
     },
@@ -23,11 +24,13 @@
         "autocomplete": [
             {
                 "snippet": "else-if(${1:condition})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
             },
             {
                 "snippet": "else-if",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
             }
         ]
     },
@@ -37,27 +40,33 @@
         "autocomplete": [
             {
                 "snippet": "for(${1:var} in ${2:array})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#for"
             },
             {
                 "snippet": "for(${1:var} in ${2:array}) | status-var=${3:loop}",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
             },
             {
                 "snippet": "for(${1:name},${2:value} in ${3:object})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#property-looping"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#property-looping"
             },
             {
                 "snippet": "for(${1:init}; ${2:test}; ${3:update})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
             },
             {
                 "snippet": "for(${1:var} from ${2:start} to ${3:end})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#range-looping"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#range-looping"
             },
             {
                 "snippet": "for",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#for"
             }
         ]
     },
@@ -67,10 +76,12 @@
         "autocomplete": [
             {
                 "snippet": "if(${1:condition})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
             }
         ]
     },
@@ -88,10 +99,12 @@
             {
                 "displayText": "include(<template>)",
                 "snippet": "include(${1:\"./target.marko\"})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             }
         ]
     },
@@ -101,10 +114,12 @@
             {
                 "displayText": "include-html(<path>)",
                 "snippet": "include-html(${1:\"./foo.html\"})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             }
         ]
     },
@@ -114,10 +129,12 @@
             {
                 "displayText": "include-text(<path>)",
                 "snippet": "include-text(${1:\"./foo.txt\"})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#includes"
             }
         ]
     },
@@ -131,10 +148,12 @@
             {
                 "displayText": "macro <name>(<parmas>)",
                 "snippet": "macro ${1:name}(${2:param1, param2})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#macros"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#macros"
             }
         ],
         "no-output": true
@@ -143,7 +162,8 @@
         "code-generator": "./macro-body-tag",
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#macros",
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#macros",
                 "openTagOnly": true
             }
         ]
@@ -158,7 +178,8 @@
         "preserve-whitespace": true,
         "autocomplete": [
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#whitespace"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#whitespace"
             }
         ]
     },
@@ -182,10 +203,12 @@
         "autocomplete": [
             {
                 "snippet": "unless(${1:condition})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#unlesselse-ifelse"
             }
         ]
     },
@@ -198,10 +221,12 @@
         "autocomplete": [
             {
                 "snippet": "while(${1:condition})",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#looping"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#looping"
             }
         ]
     },
@@ -211,10 +236,12 @@
             "autocomplete": [
                 {
                     "snippet": "body-only-if(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#body-only-if"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#body-only-if"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#body-only-if"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#body-only-if"
                 }
             ]
         },
@@ -223,10 +250,12 @@
             "autocomplete": [
                 {
                     "snippet": "if(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
                 }
             ]
         },
@@ -235,10 +264,12 @@
             "autocomplete": [
                 {
                     "snippet": "else-if(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#ifelse-ifelse"
                 }
             ]
         },
@@ -248,26 +279,33 @@
             "autocomplete": [
                 {
                     "snippet": "for(${1:var} in ${2:array})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#for"
                 },
                 {
-                    "snippet": "for(${1:var} in ${2:array}) | status-var=${3:loop}",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
+                    "snippet":
+                        "for(${1:var} in ${2:array}) | status-var=${3:loop}",
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#loop-status-variable"
                 },
                 {
                     "snippet": "for(${1:name},${2:value} in ${3:object})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#property-looping"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#property-looping"
                 },
                 {
                     "snippet": "for(${1:init}; ${2:test}; ${3:update})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#native-javascript-for-loop"
                 },
                 {
                     "snippet": "for(${1:var} from ${2:start} to ${3:end})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#range-looping"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#range-looping"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#for"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#for"
                 }
             ]
         },
@@ -276,15 +314,18 @@
                 {
                     "displayText": "include(<template>)",
                     "snippet": "include(${1:\"./target.marko\"})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#includes"
                 },
                 {
                     "displayText": "include(data.renderBody)",
                     "snippet": "include(data.renderBody)",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#includes"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#includes"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#includes"
                 }
             ]
         },
@@ -301,10 +342,12 @@
             "autocomplete": [
                 {
                     "snippet": "while(${1:condition})",
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#looping"
                 },
                 {
-                    "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#looping"
+                    "descriptionMoreURL":
+                        "http://markojs.com/docs/marko/language-guide/#looping"
                 }
             ]
         },
diff --git a/src/taglibs/core/module-code-tag.js b/src/taglibs/core/module-code-tag.js
index d9f508b8b..456d8210d 100644
--- a/src/taglibs/core/module-code-tag.js
+++ b/src/taglibs/core/module-code-tag.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-let resolveFrom = require('resolve-from');
+let resolveFrom = require("resolve-from");
 
 module.exports = function codeGenerator(elNode, codegen) {
-    let func = eval('(' + elNode.argument + ')');
+    let func = eval("(" + elNode.argument + ")");
     let dirname = codegen.context.dirname;
 
     function req(target) {
diff --git a/src/taglibs/core/package.json b/src/taglibs/core/package.json
index d81b35bd2..d2e33cfb6 100644
--- a/src/taglibs/core/package.json
+++ b/src/taglibs/core/package.json
@@ -3,4 +3,4 @@
         "./include-text-tag.js": "./include-text-tag-browser.js",
         "./include-html-tag.js": "./include-html-tag-browser.js"
     }
-}
\ No newline at end of file
+}
diff --git a/src/taglibs/core/static-tag.js b/src/taglibs/core/static-tag.js
index 315392dce..6817495f2 100644
--- a/src/taglibs/core/static-tag.js
+++ b/src/taglibs/core/static-tag.js
@@ -1,14 +1,16 @@
 module.exports = function functionCodeGenerator(el, context) {
     var parent = el.parentNode;
-    var isTopLevel = parent.type === 'TemplateRoot';
+    var isTopLevel = parent.type === "TemplateRoot";
 
-    if(!isTopLevel) {
-        context.addError('static is a static tag and can only be declared at the template root');
+    if (!isTopLevel) {
+        context.addError(
+            "static is a static tag and can only be declared at the template root"
+        );
     }
 
-    var code = el.tagString.replace(/^static\s*/, '').trim();
+    var code = el.tagString.replace(/^static\s*/, "").trim();
 
-    if(code[0] === '{') {
+    if (code[0] === "{") {
         var statements = code.slice(1, -1);
         context.addStaticCode(context.builder.code(statements));
     } else {
diff --git a/src/taglibs/core/unless-tag.js b/src/taglibs/core/unless-tag.js
index 473a7f716..537dfe9b5 100644
--- a/src/taglibs/core/unless-tag.js
+++ b/src/taglibs/core/unless-tag.js
@@ -2,14 +2,16 @@ module.exports = function nodeFactory(elNode, context) {
     var argument = elNode.argument;
 
     if (!argument) {
-        context.addError('Invalid <unless> tag. Argument is missing. Example; <unless(foo === true)>');
+        context.addError(
+            "Invalid <unless> tag. Argument is missing. Example; <unless(foo === true)>"
+        );
         return elNode;
     }
 
     var attributes = elNode.attributes;
 
     if (attributes.length) {
-        context.addError('Invalid <unless> tag. Attributes not allowed.');
+        context.addError("Invalid <unless> tag. Attributes not allowed.");
         return;
     }
 
@@ -18,10 +20,12 @@ module.exports = function nodeFactory(elNode, context) {
     var test;
     try {
         test = builder.parseExpression(argument);
-    } catch(e) {
+    } catch (e) {
         test = builder.literalFalse();
-        context.addError('Invalid expression for unless statement:\n' + e.message);
+        context.addError(
+            "Invalid expression for unless statement:\n" + e.message
+        );
     }
 
     return context.builder.ifStatement(builder.negate(test));
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/core/util/createLoopNode.js b/src/taglibs/core/util/createLoopNode.js
index d6e7e76d6..c2864a65a 100644
--- a/src/taglibs/core/util/createLoopNode.js
+++ b/src/taglibs/core/util/createLoopNode.js
@@ -1,20 +1,20 @@
-var parseFor = require('./parseFor');
+var parseFor = require("./parseFor");
 
 function createLoopNode(str, body, builder) {
     var forDef = parseFor(str);
 
     forDef.body = body;
 
-    if (forDef.loopType === 'ForEach') {
+    if (forDef.loopType === "ForEach") {
         return builder.forEach(forDef);
-    } else if (forDef.loopType === 'ForRange') {
+    } else if (forDef.loopType === "ForRange") {
         return builder.forRange(forDef);
-    } else if (forDef.loopType === 'ForEachProp') {
+    } else if (forDef.loopType === "ForEachProp") {
         return builder.forEachProp(forDef);
-    } else if (forDef.loopType === 'For') {
+    } else if (forDef.loopType === "For") {
         return builder.forStatement(forDef);
     } else {
-        throw new Error('Unsupported loop type: ' + forDef.loopType);
+        throw new Error("Unsupported loop type: " + forDef.loopType);
     }
 }
 
diff --git a/src/taglibs/core/util/parseFor.js b/src/taglibs/core/util/parseFor.js
index 373c2efb5..e63075489 100644
--- a/src/taglibs/core/util/parseFor.js
+++ b/src/taglibs/core/util/parseFor.js
@@ -1,99 +1,98 @@
-'use strict';
-var removeComments = require('../../../compiler/util/removeComments');
-var compiler = require('../../../compiler');
+"use strict";
+var removeComments = require("../../../compiler/util/removeComments");
+var compiler = require("../../../compiler");
 
 var integerRegExp = /^-?\d+$/;
 var numberRegExp = /^-?(?:\d+|\d+\.\d*|\d*\.\d+|\d+\.\d+)$/;
 
-var tokenizer = require('../../../compiler/util/tokenizer').create([
+var tokenizer = require("../../../compiler/util/tokenizer").create([
     {
-        name: 'stringDouble',
-        pattern: /"(?:[^"]|\\")*"/,
+        name: "stringDouble",
+        pattern: /"(?:[^"]|\\")*"/
     },
     {
-        name: 'stringSingle',
+        name: "stringSingle",
         pattern: /'(?:[^']|\\')*'/
     },
     {
-        name: 'in',
-        pattern: /\s+in\s+/,
+        name: "in",
+        pattern: /\s+in\s+/
     },
     {
-        name: 'from',
+        name: "from",
         pattern: /\s+from\s+/
     },
     {
-        name: 'to',
-        pattern: /\s+to\s+/,
+        name: "to",
+        pattern: /\s+to\s+/
     },
     {
-        name: 'step',
-        pattern: /\s+step\s+/,
+        name: "step",
+        pattern: /\s+step\s+/
     },
     {
-        name: 'semicolon',
-        pattern: /[;]/,
+        name: "semicolon",
+        pattern: /[;]/
     },
     {
-        name: 'separator',
+        name: "separator",
         pattern: /separator\s?=\s?/
     },
     {
-        name: 'status-var',
-        pattern: /status\-var\s?=\s?/
+        name: "status-var",
+        pattern: /status-var\s?=\s?/
     },
     {
-        name: 'iterator',
+        name: "iterator",
         pattern: /iterator\s?=\s?/
     },
     {
-        name: 'pipe',
+        name: "pipe",
         pattern: /\s+\|\s+/
     },
     {
-        name: 'groupOpen',
-        pattern: /[\{\(\[]/
+        name: "groupOpen",
+        pattern: /[{([]/
     },
     {
-        name: 'groupClose',
-        pattern: /[\}\)\]]/
+        name: "groupClose",
+        pattern: /[})\]]/
     },
     {
-        name: 'array',
+        name: "array",
         pattern: /array/
     }
 ]);
 
 var inRegExp = /^\s*([$A-Z_][0-9A-Z_$]*)(?:\s*,\s*([$A-Z_][0-9A-Z_$]*))?\s+in\s+/i;
 
-
 function throwError(message) {
     var error = new Error(message);
-    error.code = 'INVALID_FOR';
+    error.code = "INVALID_FOR";
     throw error;
 }
 
 function buildIdentifier(name, errorMessage) {
     try {
         return compiler.builder.identifier(name);
-    } catch(e) {
-        throwError(errorMessage + ': ' + e.message);
+    } catch (e) {
+        throwError(errorMessage + ": " + e.message);
     }
 }
 
 function parseExpression(str, errorMessage) {
     try {
         return compiler.builder.parseExpression(str);
-    } catch(e) {
-        throwError(errorMessage + ': ' + e.message);
+    } catch (e) {
+        throwError(errorMessage + ": " + e.message);
     }
 }
 
 function parseStatement(str, errorMessage) {
     try {
         return compiler.builder.parseStatement(str);
-    } catch(e) {
-        throwError(errorMessage + ': ' + e.message);
+    } catch (e) {
+        throwError(errorMessage + ": " + e.message);
     }
 }
 
@@ -147,15 +146,15 @@ module.exports = function(str) {
     var inRegExpMatches = inRegExp.exec(str);
     if (inRegExpMatches) {
         if (inRegExpMatches[1] && inRegExpMatches[2]) {
-            loopType = 'ForEachProp';
+            loopType = "ForEachProp";
             nameVarName = inRegExpMatches[1];
             valueVarName = inRegExpMatches[2];
         } else {
-            loopType = 'ForEach';
+            loopType = "ForEach";
             varName = inRegExpMatches[1];
         }
 
-        str = ' in ' + str.substring(inRegExpMatches[0].length);
+        str = " in " + str.substring(inRegExpMatches[0].length);
     }
 
     function finishVarName(end) {
@@ -170,75 +169,75 @@ module.exports = function(str) {
         var start = prevToken.end;
         var part = str.substring(start, end).trim();
 
-        switch(prevToken.name) {
-            case 'from':
+        switch (prevToken.name) {
+            case "from":
                 fromExpression = part;
                 break;
-            case 'to':
+            case "to":
                 toExpression = part;
                 break;
-            case 'in':
+            case "in":
                 inExpression = part;
                 break;
-            case 'step':
+            case "step":
                 stepExpression = part;
                 break;
-            case 'status-var':
+            case "status-var":
                 statusVarName = part;
                 break;
-            case 'separator':
+            case "separator":
                 separatorExpression = part;
                 break;
-            case 'iterator':
+            case "iterator":
                 iteratorExpression = part;
                 break;
-            case 'array':
+            case "array":
                 isArray = true;
                 break;
-            case 'pipe':
+            case "pipe":
                 if (part.length !== 0) {
-                    throwError('Unexpected input: ' + part);
+                    throwError("Unexpected input: " + part);
                     return;
                 }
                 break;
         }
     }
 
-    tokenizer.forEachToken(str, (token) => {
-        switch(token.name) {
-            case 'groupOpen':
+    tokenizer.forEachToken(str, token => {
+        switch (token.name) {
+            case "groupOpen":
                 depth++;
                 break;
-            case 'groupClose':
+            case "groupClose":
                 depth--;
                 break;
-            case 'in':
+            case "in":
                 if (depth === 0) {
                     prevToken = token;
                 }
                 break;
-            case 'from':
+            case "from":
                 if (depth === 0 && !loopType) {
-                    loopType = 'ForRange';
+                    loopType = "ForRange";
                     finishVarName(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'to':
-                if (depth === 0 && prevToken && prevToken.name === 'from') {
+            case "to":
+                if (depth === 0 && prevToken && prevToken.name === "from") {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'step':
-                if (depth === 0 && prevToken && prevToken.name === 'to') {
+            case "step":
+                if (depth === 0 && prevToken && prevToken.name === "to") {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'semicolon':
+            case "semicolon":
                 if (depth === 0) {
-                    loopType = 'For';
+                    loopType = "For";
 
                     if (forInit == null) {
                         forInit = str.substring(0, token.start);
@@ -246,39 +245,57 @@ module.exports = function(str) {
                         forTest = str.substring(prevToken.end, token.start);
                         forUpdate = str.substring(token.end);
                     } else {
-                        throwError('Invalid native for loop. Expected format: <init>; <test>; <update>');
+                        throwError(
+                            "Invalid native for loop. Expected format: <init>; <test>; <update>"
+                        );
                     }
 
                     prevToken = token;
                 }
                 break;
-            case 'pipe':
+            case "pipe":
                 if (depth === 0) {
                     pipeFound = true;
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'status-var':
-                if (depth === 0 && pipeFound && str.charAt(token.start-1) === ' ') {
+            case "status-var":
+                if (
+                    depth === 0 &&
+                    pipeFound &&
+                    str.charAt(token.start - 1) === " "
+                ) {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'separator':
-                if (depth === 0 && pipeFound && str.charAt(token.start-1) === ' ') {
+            case "separator":
+                if (
+                    depth === 0 &&
+                    pipeFound &&
+                    str.charAt(token.start - 1) === " "
+                ) {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'iterator':
-                if (depth === 0 && pipeFound && str.charAt(token.start-1) === ' ') {
+            case "iterator":
+                if (
+                    depth === 0 &&
+                    pipeFound &&
+                    str.charAt(token.start - 1) === " "
+                ) {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
                 break;
-            case 'array':
-                if (depth === 0 && pipeFound && str.charAt(token.start-1) === ' ') {
+            case "array":
+                if (
+                    depth === 0 &&
+                    pipeFound &&
+                    str.charAt(token.start - 1) === " "
+                ) {
                     finishPrevPart(token.start);
                     prevToken = token;
                 }
@@ -293,97 +310,117 @@ module.exports = function(str) {
     }
 
     if (separatorExpression) {
-        separatorExpression = parseExpression(separatorExpression, 'Invalid "separator" expression');
+        separatorExpression = parseExpression(
+            separatorExpression,
+            'Invalid "separator" expression'
+        );
     }
 
     if (iteratorExpression) {
-        iteratorExpression = parseExpression(iteratorExpression, 'Invalid "iterator" expression');
+        iteratorExpression = parseExpression(
+            iteratorExpression,
+            'Invalid "iterator" expression'
+        );
     }
 
     if (fromExpression) {
-        fromExpression = createNumberExpression(fromExpression, 'Invalid "from" expression');
+        fromExpression = createNumberExpression(
+            fromExpression,
+            'Invalid "from" expression'
+        );
     }
 
     if (toExpression) {
-        toExpression = createNumberExpression(toExpression, 'Invalid "to" expression');
+        toExpression = createNumberExpression(
+            toExpression,
+            'Invalid "to" expression'
+        );
     }
 
     if (stepExpression) {
-        stepExpression = createNumberExpression(stepExpression, 'Invalid "step" expression');
+        stepExpression = createNumberExpression(
+            stepExpression,
+            'Invalid "step" expression'
+        );
     }
 
     if (varName != null) {
-        varName = buildIdentifier(varName, 'Invalid variable name');
+        varName = buildIdentifier(varName, "Invalid variable name");
     }
 
     if (nameVarName) {
-        nameVarName = buildIdentifier(nameVarName, 'Invalid name variable');
+        nameVarName = buildIdentifier(nameVarName, "Invalid name variable");
     }
 
     if (valueVarName) {
-        valueVarName = buildIdentifier(valueVarName, 'Invalid value variable');
+        valueVarName = buildIdentifier(valueVarName, "Invalid value variable");
     }
 
     if (statusVarName) {
-        statusVarName = parseExpression(statusVarName, 'Invalid status-var option');
-        if (statusVarName.type === 'Literal') {
+        statusVarName = parseExpression(
+            statusVarName,
+            "Invalid status-var option"
+        );
+        if (statusVarName.type === "Literal") {
             statusVarName = compiler.builder.identifier(statusVarName.value);
-        } else  if (statusVarName.type !== 'Identifier') {
-            throwError('Invalid status-var option');
+        } else if (statusVarName.type !== "Identifier") {
+            throwError("Invalid status-var option");
         }
     }
 
     if (forInit) {
-        forInit = parseStatement(forInit, 'Invalid for loop init');
+        forInit = parseStatement(forInit, "Invalid for loop init");
     }
 
     if (forTest) {
-        forTest = parseExpression(forTest, 'Invalid for loop test');
+        forTest = parseExpression(forTest, "Invalid for loop test");
     }
 
     if (forUpdate) {
-        forUpdate = parseExpression(forUpdate, 'Invalid for loop update');
+        forUpdate = parseExpression(forUpdate, "Invalid for loop update");
     }
 
     // No more tokens... now we need to sort out what happened
-    if (loopType === 'ForEach') {
+    if (loopType === "ForEach") {
         return {
-            'loopType': loopType,
-            'varName': varName,
-            'in': inExpression,
-            'separator': separatorExpression,
-            'statusVarName': statusVarName,
-            'iterator': iteratorExpression,
-            'isArray': isArray
+            loopType: loopType,
+            varName: varName,
+            in: inExpression,
+            separator: separatorExpression,
+            statusVarName: statusVarName,
+            iterator: iteratorExpression,
+            isArray: isArray
         };
-    } else if (loopType === 'ForEachProp') {
+    } else if (loopType === "ForEachProp") {
         return {
-            'loopType': loopType,
-            'nameVarName': nameVarName,
-            'valueVarName': valueVarName,
-            'in': inExpression,
-            'separator': separatorExpression,
-            'statusVarName': statusVarName
+            loopType: loopType,
+            nameVarName: nameVarName,
+            valueVarName: valueVarName,
+            in: inExpression,
+            separator: separatorExpression,
+            statusVarName: statusVarName
         };
-    } else if (loopType === 'ForRange') {
+    } else if (loopType === "ForRange") {
         return {
-            'loopType': loopType,
-            'varName': varName,
-            'from': fromExpression,
-            'to': toExpression,
-            'step': stepExpression
+            loopType: loopType,
+            varName: varName,
+            from: fromExpression,
+            to: toExpression,
+            step: stepExpression
         };
-    } else if (loopType === 'For') {
+    } else if (loopType === "For") {
         if (forTest == null) {
-            throwError('Invalid native for loop. Expected format: <init>; <test>; <update>');
+            throwError(
+                "Invalid native for loop. Expected format: <init>; <test>; <update>"
+            );
         }
         return {
-            'loopType': loopType,
-            'init': forInit,
-            'test': forTest,
-            'update': forUpdate
+            loopType: loopType,
+            init: forInit,
+            test: forTest,
+            update: forUpdate
         };
     } else {
-        throwError('Invalid for loop');
+        throwError("Invalid for loop");
     }
 };
diff --git a/src/taglibs/core/util/parseImport.js b/src/taglibs/core/util/parseImport.js
index 76daf8094..fce7fd2de 100644
--- a/src/taglibs/core/util/parseImport.js
+++ b/src/taglibs/core/util/parseImport.js
@@ -2,8 +2,10 @@
 
 function getSpecifiers(importDeclaration) {
     var match = /^(.+)\bfrom\s*(("|')(.*?)("|'))$/.exec(importDeclaration);
-    if(!match) {
-        return { moduleSpecifier: importDeclaration.replace(/\"|\'/g, "").trim() };
+    if (!match) {
+        return {
+            moduleSpecifier: importDeclaration.replace(/"|'/g, "").trim()
+        };
     }
 
     return {
@@ -16,9 +18,11 @@ function getImportSpecifierGroups(importSpecifierSet) {
     var defaultImport = importSpecifierSet;
     var decomposedImports = /(?:,\s*)?{(.*)}$/.exec(importSpecifierSet) || [];
 
-    if(decomposedImports.length) {
-        defaultImport = defaultImport.replace(decomposedImports[0], '');
-        decomposedImports = decomposedImports[1].split(',').map(specifier => specifier.trim());
+    if (decomposedImports.length) {
+        defaultImport = defaultImport.replace(decomposedImports[0], "");
+        decomposedImports = decomposedImports[1]
+            .split(",")
+            .map(specifier => specifier.trim());
     }
 
     return {
@@ -28,45 +32,55 @@ function getImportSpecifierGroups(importSpecifierSet) {
 }
 
 function getVariableName(moduleSpecifier) {
-    var withoutPath = /([^\/\\]+)$/.exec(moduleSpecifier)[1];
-    var withoutExtension = withoutPath.replace(/\.[a-z0-9]+$/i, '');
-    return withoutExtension.replace(/[^a-z0-9]+([a-z])/gi, (_, p1) => p1.toUpperCase())+'_module';
+    var withoutPath = /([^/\\]+)$/.exec(moduleSpecifier)[1];
+    var withoutExtension = withoutPath.replace(/\.[a-z0-9]+$/i, "");
+    return (
+        withoutExtension.replace(/[^a-z0-9]+([a-z])/gi, (_, p1) =>
+            p1.toUpperCase()
+        ) + "_module"
+    );
 }
 
 function getNames(importSpecifier) {
-       var names = importSpecifier.split(/\bas\b/);
+    var names = importSpecifier.split(/\bas\b/);
 
-       if (names.length == 1) {
-            names[1] = names[0];
-       }
+    if (names.length == 1) {
+        names[1] = names[0];
+    }
 
-       return {
-            exported: names[0].trim(),
-            local: names[1].trim()
-       };
+    return {
+        exported: names[0].trim(),
+        local: names[1].trim()
+    };
 }
 
 module.exports = function importToAssignments(tagString) {
-    var importDeclaration = tagString.replace(/^import/, '').trim();
+    var importDeclaration = tagString.replace(/^import/, "").trim();
     var specifiers = getSpecifiers(importDeclaration);
     var importSpecifierSet = specifiers.importSpecifierSet;
     var moduleSpecifier = specifiers.moduleSpecifier;
 
-    if(!importSpecifierSet) {
-        return [ { module: true, value: moduleSpecifier } ];
+    if (!importSpecifierSet) {
+        return [{ module: true, value: moduleSpecifier }];
     }
 
     var importGroups = getImportSpecifierGroups(importSpecifierSet);
-    var rootVariable = getNames(importGroups.defaultImport).local || getVariableName(moduleSpecifier);
-    var specifierList = importGroups.decomposedImports.map(getNames).map(names => {
-        return {
-            name: names.local,
-            value: {
-                object: rootVariable,
-                property: names.exported
-            }
-        };
-    });
+    var rootVariable =
+        getNames(importGroups.defaultImport).local ||
+        getVariableName(moduleSpecifier);
+    var specifierList = importGroups.decomposedImports
+        .map(getNames)
+        .map(names => {
+            return {
+                name: names.local,
+                value: {
+                    object: rootVariable,
+                    property: names.exported
+                }
+            };
+        });
 
-    return [{ name: rootVariable, value: moduleSpecifier, module: true }].concat(specifierList) ;
-};
\ No newline at end of file
+    return [
+        { name: rootVariable, value: moduleSpecifier, module: true }
+    ].concat(specifierList);
+};
diff --git a/src/taglibs/core/var-tag.js b/src/taglibs/core/var-tag.js
index 7b7337b10..fb274afbf 100644
--- a/src/taglibs/core/var-tag.js
+++ b/src/taglibs/core/var-tag.js
@@ -1,13 +1,17 @@
-var isValidJavaScriptVarName = require('../../compiler/util/isValidJavaScriptVarName');
+var isValidJavaScriptVarName = require("../../compiler/util/isValidJavaScriptVarName");
 
 module.exports = function nodeFactory(el, context) {
-    context.deprecate('The "<var>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags');
+    context.deprecate(
+        'The "<var>" tag is deprecated. Please use "$ <js_code>" for JavaScript in the template. See: https://github.com/marko-js/marko/wiki/Deprecation:-var-assign-invoke-tags'
+    );
 
     var vars;
 
     try {
         vars = context.builder.parseStatement(el.tagString);
-    } catch(e) {}
+    } catch (e) {
+        /* ignore error */
+    }
 
     if (vars) {
         return vars;
@@ -16,11 +20,14 @@ module.exports = function nodeFactory(el, context) {
     var builder = context.builder;
     var hasError = false;
 
-    var declarations = el.attributes.map((attr) => {
+    var declarations = el.attributes.map(attr => {
         var varName = attr.name;
 
         if (!isValidJavaScriptVarName(varName)) {
-            context.addError('Invalid JavaScript variable name: ' + varName, 'INVALID_VAR_NAME');
+            context.addError(
+                "Invalid JavaScript variable name: " + varName,
+                "INVALID_VAR_NAME"
+            );
             hasError = true;
             return;
         }
diff --git a/src/taglibs/core/while-tag.js b/src/taglibs/core/while-tag.js
index f2aa23a85..bf2888e01 100644
--- a/src/taglibs/core/while-tag.js
+++ b/src/taglibs/core/while-tag.js
@@ -1,11 +1,16 @@
 module.exports = function codeGenerator(elNode, codegen) {
     var argument = elNode.argument;
     if (!argument) {
-        codegen.addError('Invalid <while> tag. Argument is missing. Example: <while(i < 4)>');
+        codegen.addError(
+            "Invalid <while> tag. Argument is missing. Example: <while(i < 4)>"
+        );
         return elNode;
     }
 
     var builder = codegen.builder;
 
-    return builder.whileStatement(builder.parseExpression(argument), elNode.body);
-};
\ No newline at end of file
+    return builder.whileStatement(
+        builder.parseExpression(argument),
+        elNode.body
+    );
+};
diff --git a/src/taglibs/html/html-comment-tag.js b/src/taglibs/html/html-comment-tag.js
index f70c9413e..2da6406ce 100644
--- a/src/taglibs/html/html-comment-tag.js
+++ b/src/taglibs/html/html-comment-tag.js
@@ -1,11 +1,10 @@
-'use strict';
+"use strict";
 module.exports = function render(input, out) {
     if (out.write) {
-        out.write('<!--');
+        out.write("<!--");
         if (input.renderBody) {
             input.renderBody(out);
         }
-        out.write('-->');
+        out.write("-->");
     }
-
 };
diff --git a/src/taglibs/html/marko.json b/src/taglibs/html/marko.json
index 0fbb84080..538026aa7 100644
--- a/src/taglibs/html/marko.json
+++ b/src/taglibs/html/marko.json
@@ -2,9 +2,7 @@
     "taglib-id": "marko-html",
     "<html-comment>": {
         "renderer": "./html-comment-tag.js",
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<a>": {
         "@href": "#html-href",
@@ -25,12 +23,11 @@
             },
             {
                 "displayText": "a href=\"mailto:\"",
-                "snippet": "a href=\"mailto:${1:joe@example.com}?subject=${2:feedback}\""
+                "snippet":
+                    "a href=\"mailto:${1:joe@example.com}?subject=${2:feedback}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<abbr>": {
         "html": true,
@@ -40,15 +37,11 @@
                 "snippet": "abbr title=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<address>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<area>": {
         "@alt": "#html-alt",
@@ -65,24 +58,19 @@
             {},
             {
                 "displayText": "area shape=\"\" coords=\"\" href=\"\"",
-                "snippet": "area ${1:shape=\"${2:default}\"} coords=\"$3\" ${4:href=\"${5:#}\"}"
+                "snippet":
+                    "area ${1:shape=\"${2:default}\"} coords=\"$3\" ${4:href=\"${5:#}\"}"
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<article>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<aside>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<audio>": {
         "@autoplay": "#html-autoplay",
@@ -99,15 +87,11 @@
                 "snippet": "audio src=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<b>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<base>": {
         "@href": "#html-href",
@@ -119,9 +103,7 @@
                 "snippet": "base href=\"${1:#}\" target=\"${2:_blank}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<bdi>": {
         "html": true,
@@ -131,9 +113,7 @@
                 "snippet": "bdi dir=\"${1:auto}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<bdo>": {
         "html": true,
@@ -143,9 +123,7 @@
                 "snippet": "bdo dir=\"${1:auto}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<blockquote>": {
         "@cite": "#html-cite",
@@ -156,9 +134,7 @@
                 "snippet": "blockquote cite=\"${1:http://}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<body>": {
         "@onafterprint": "#html-onafterprint",
@@ -177,15 +153,11 @@
         "@onundo": "#html-onundo",
         "@onunload": "#html-onunload",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<br>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<button>": {
         "@autofocus": "#html-autofocus",
@@ -207,9 +179,7 @@
                 "snippet": "button type=\"${1:button}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<canvas>": {
         "@height": "#html-height",
@@ -218,44 +188,33 @@
         "autocomplete": [
             {},
             {
-                "snippet": "canvas id=\"${1:canvas}\" width=\"${2:300}\" height=\"${3:300}\""
+                "snippet":
+                    "canvas id=\"${1:canvas}\" width=\"${2:300}\" height=\"${3:300}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<caption>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<cite>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<code>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<col>": {
         "@span": "#html-span",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<colgroup>": {
         "@span": "#html-span",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<command>": {
         "@checked": "#html-checked",
@@ -265,42 +224,30 @@
         "@radiogroup": "#html-radiogroup",
         "@type": "#html-type",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<datalist>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<dd>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<del>": {
         "@cite": "#html-cite",
         "@datetime": "#html-datetime",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<details>": {
         "@open": "#html-open",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<dfn>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<div>": {
         "html": true,
@@ -310,27 +257,19 @@
                 "snippet": "div class=\"$2\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<dl>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<dt>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<em>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<embed>": {
         "@height": "#html-height",
@@ -341,39 +280,30 @@
         "autocomplete": [
             {},
             {
-                "snippet": "embed type=\"${1:video/quicktime}\" src=\"${2:#}\" width=\"${3:300}\" height=\"${4:300}\""
+                "snippet":
+                    "embed type=\"${1:video/quicktime}\" src=\"${2:#}\" width=\"${3:300}\" height=\"${4:300}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<fieldset>": {
         "@disabled": "#html-disabled",
         "@form": "#html-form",
         "@name": "#html-name",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<figcaption>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<figure>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<footer>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<form>": {
         "@accept-charset": "#html-accept-charset",
@@ -388,72 +318,51 @@
         "autocomplete": [
             {},
             {
-                "snippet": "form class=\"$1\" action=\"${2:index.html}\" method=\"${3:post}\""
+                "snippet":
+                    "form class=\"$1\" action=\"${2:index.html}\" method=\"${3:post}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h1>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h2>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h3>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h4>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h5>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<h6>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<head>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<header>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<hgroup>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<hr>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<html>": {
         "@manifest": "#html-manifest",
@@ -467,22 +376,20 @@
             },
             {
                 "displayText": "HTML page",
-                "snippet": "<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"UTF-8\">\n\t\t<title>${1:title}</title>\n\t</head>\n\t<body>\n\t\t$2\n\t</body>\n</html>\n"
+                "snippet":
+                    "<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"UTF-8\">\n\t\t<title>${1:title}</title>\n\t</head>\n\t<body>\n\t\t$2\n\t</body>\n</html>\n"
             },
             {
                 "displayText": "HTML page (concise)",
-                "snippet": "<!DOCTYPE html>\nhtml lang=\"en\"\n\thead\n\t\tmeta charset=\"UTF-8\"\n\t\t<title>${1:title}</title>\n\tbody\n\t\t$2\n"
+                "snippet":
+                    "<!DOCTYPE html>\nhtml lang=\"en\"\n\thead\n\t\tmeta charset=\"UTF-8\"\n\t\t<title>${1:title}</title>\n\tbody\n\t\t$2\n"
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<i>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<iframe>": {
         "@height": "#html-height",
@@ -499,9 +406,7 @@
                 "snippet": "iframe src=\"$1\" width=\"$2\" height=\"$3\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<img>": {
         "@alt": "#html-alt",
@@ -518,9 +423,7 @@
                 "snippet": "img src=\"$1\" alt=\"$2\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<input>": {
         "@accept": "#html-accept",
@@ -557,27 +460,22 @@
         "autocomplete": [
             {},
             {
-                "snippet": "input type=\"${1}\" name=\"${2:name}\" value=\"$3\"",
+                "snippet":
+                    "input type=\"${1}\" name=\"${2:name}\" value=\"$3\"",
                 "triggerAutocompleteAfterInsert": true
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<ins>": {
         "@cite": "#html-cite",
         "@datetime": "#html-datetime",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<kbd>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<keygen>": {
         "@autofocus": "#html-autofocus",
@@ -590,12 +488,11 @@
         "autocomplete": [
             {},
             {
-                "snippet": "keygen name=\"${1:name}\" challenge=\"${2:string}\" keytype=\"${3:RSA}\" keyparams=\"${4:medium}\""
+                "snippet":
+                    "keygen name=\"${1:name}\" challenge=\"${2:string}\" keytype=\"${3:RSA}\" keyparams=\"${4:medium}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<label>": {
         "@for": "#html-for",
@@ -607,22 +504,16 @@
                 "snippet": "label${1: for=\"$2\"}"
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<legend>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<li>": {
         "@value": "#html-value",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<link>": {
         "@disabled": "#html-disabled",
@@ -636,7 +527,8 @@
         "autocomplete": [
             {},
             {
-                "snippet": "link rel=\"${1:stylesheet}\" href=\"${2:/css/master.css}\" media=\"${3:screen}\" title=\"${4:no title}\" charset=\"${5:utf-8}\""
+                "snippet":
+                    "link rel=\"${1:stylesheet}\" href=\"${2:/css/master.css}\" media=\"${3:screen}\" title=\"${4:no title}\" charset=\"${5:utf-8}\""
             },
             {
                 "snippet": "link rel=\"icon\" href=\"$1.ico\""
@@ -645,30 +537,22 @@
                 "snippet": "link rel=\"import\" href=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<map>": {
         "@name": "#html-name",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<mark>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<menu>": {
         "@label": "#html-label",
         "@type": "#html-type",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<meta>": {
         "@charset": "#html-charset",
@@ -681,9 +565,7 @@
                 "snippet": "meta name=\"${1:name}\" content=\"${2:content}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<meter>": {
         "@form": "#html-form",
@@ -697,24 +579,19 @@
         "autocomplete": [
             {},
             {
-                "snippet": "meter min=\"${1:200}\" max=\"${2:500}\" value=\"${3:350}\""
+                "snippet":
+                    "meter min=\"${1:200}\" max=\"${2:500}\" value=\"${3:350}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<nav>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<noscript>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<object>": {
         "@archive": "#html-archive",
@@ -735,18 +612,14 @@
                 "snippet": "object data=\"${1:http://}\" type=\"${2:mimetype}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<ol>": {
         "@reversed": "#html-reversed",
         "@start": "#html-start",
         "@type": "#html-type",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<optgroup>": {
         "@disabled": "#html-disabled",
@@ -757,9 +630,7 @@
                 "snippet": "optgroup label=\"${1:Group 1}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<option>": {
         "@disabled": "#html-disabled",
@@ -767,9 +638,7 @@
         "@selected": "#html-selected",
         "@value": "#html-value",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<output>": {
         "@for": "#html-for",
@@ -781,15 +650,11 @@
                 "snippet": "output name=\"${1:result}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<p>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<param>": {
         "@name": "#html-name",
@@ -800,22 +665,16 @@
                 "snippet": "param name=\"${1:foo}\" value=\"${2:bar}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<picture>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<pre>": {
         "preserve-whitespace": true,
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<progress>": {
         "@form": "#html-form",
@@ -827,9 +686,7 @@
                 "snippet": "progress value=\"${1:50}\" max=\"${2:100}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<q>": {
         "@cite": "#html-cite",
@@ -839,38 +696,26 @@
                 "snippet": "q cite=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<rp>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<rt>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<ruby>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<s>": {
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<samp>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<script>": {
         "preserve-whitespace": true,
@@ -882,7 +727,8 @@
         "autocomplete": [
             {
                 "snippet": "script template-helpers",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/language-guide/#helpers"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/language-guide/#helpers"
             }
         ],
         "@async": "#html-async",
@@ -891,15 +737,11 @@
         "@src": "#html-src",
         "@type": "#html-type",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<section>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<select>": {
         "@autofocus": "#html-autofocus",
@@ -915,15 +757,11 @@
                 "snippet": "select class=\"$1\" name=\"$2\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<small>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<source>": {
         "@media": "#html-media",
@@ -935,21 +773,15 @@
                 "snippet": "source src=\"${1:http://}\" type=\"${2:mimetype}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<span>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<strong>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<style>": {
         "preserve-whitespace": true,
@@ -963,49 +795,35 @@
                 "snippet": "style media=\"screen\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<sub>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<summary>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<sup>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<table>": {
         "@border": "#html-border",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<tbody>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<td>": {
         "@colspan": "#html-colspan",
         "@headers": "#html-headers",
         "@rowspan": "#html-rowspan",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<textarea>": {
         "preserve-whitespace": true,
@@ -1025,18 +843,15 @@
         "html": true,
         "autocomplete": [
             {
-                "snippet": "textarea name=\"${1:name}\" rows=\"${2:8}\" cols=\"${3:40}\""
+                "snippet":
+                    "textarea name=\"${1:name}\" rows=\"${2:8}\" cols=\"${3:40}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<tfoot>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<th>": {
         "@colspan": "#html-colspan",
@@ -1044,35 +859,25 @@
         "@rowspan": "#html-rowspan",
         "@scope": "#html-scope",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<thead>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<time>": {
         "@datetime": "#html-datetime",
         "@pubdate": "#html-pubdate",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<title>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<tr>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<track>": {
         "@default": "#html-default",
@@ -1083,23 +888,18 @@
         "html": true,
         "autocomplete": [
             {
-                "snippet": "track kind=\"${1:subtitles}\" src=\"${2:sampleSubtitles_en.srt}\" srclang=\"${3:en}\""
+                "snippet":
+                    "track kind=\"${1:subtitles}\" src=\"${2:sampleSubtitles_en.srt}\" srclang=\"${3:en}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<u>": {
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<ul>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<video>": {
         "@autoplay": "#html-autoplay",
@@ -1116,18 +916,15 @@
         "autocomplete": [
             {
                 "displayText": "video src=\"\" autoplay poster=\"\"",
-                "snippet": "video src=\"${1:videofile.ogg}\" ${2:autoplay} ${3:poster=\"${4:posterimage.jpg}\"}"
+                "snippet":
+                    "video src=\"${1:videofile.ogg}\" ${2:autoplay} ${3:poster=\"${4:posterimage.jpg}\"}"
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<wbr>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ],
+        "attribute-groups": ["html-attributes"],
         "openTagOnly": true
     },
     "attribute-groups": {
@@ -1148,32 +945,19 @@
                 "html": true
             },
             "dir": {
-                "enum": [
-                    "ltr",
-                    "rtl"
-                ],
+                "enum": ["ltr", "rtl"],
                 "html": true
             },
             "draggable": {
-                "enum": [
-                    "auto",
-                    "false",
-                    "true"
-                ],
+                "enum": ["auto", "false", "true"],
                 "html": true
             },
             "dropzone": {
-                "enum": [
-                    "copy",
-                    "move",
-                    "link"
-                ],
+                "enum": ["copy", "move", "link"],
                 "html": true
             },
             "hidden": {
-                "enum": [
-                    "hidden"
-                ],
+                "enum": ["hidden"],
                 "html": true
             },
             "id": {
@@ -1633,10 +1417,7 @@
             "name": "async"
         },
         "html-autocomplete": {
-            "enum": [
-                "off",
-                "on"
-            ],
+            "enum": ["off", "on"],
             "html": true,
             "name": "autocomplete"
         },
@@ -1651,11 +1432,7 @@
             "name": "autoplay"
         },
         "html-behavior": {
-            "enum": [
-                "scroll",
-                "slide",
-                "alternate"
-            ],
+            "enum": ["scroll", "slide", "alternate"],
             "html": true,
             "name": "behavior"
         },
@@ -1783,12 +1560,7 @@
             "name": "defer"
         },
         "html-direction": {
-            "enum": [
-                "left",
-                "right",
-                "up",
-                "down"
-            ],
+            "enum": ["left", "right", "up", "down"],
             "html": true,
             "name": "direction"
         },
@@ -1832,10 +1604,7 @@
             "name": "formenctype"
         },
         "html-formmethod": {
-            "enum": [
-                "get",
-                "post"
-            ],
+            "enum": ["get", "post"],
             "html": true,
             "name": "formmethod"
         },
@@ -1845,12 +1614,7 @@
             "name": "formnovalidate"
         },
         "html-formtarget": {
-            "enum": [
-                "_blank",
-                "_parent",
-                "_self",
-                "_top"
-            ],
+            "enum": ["_blank", "_parent", "_self", "_top"],
             "html": true,
             "name": "formtarget"
         },
@@ -1879,11 +1643,7 @@
             "name": "hspace"
         },
         "html-http-equiv": {
-            "enum": [
-                "content-type",
-                "default-style",
-                "refresh"
-            ],
+            "enum": ["content-type", "default-style", "refresh"],
             "html": true,
             "name": "http-equiv"
         },
@@ -1897,11 +1657,7 @@
             "name": "ismap"
         },
         "html-keytype": {
-            "enum": [
-                "dsa",
-                "ec",
-                "rsa"
-            ],
+            "enum": ["dsa", "ec", "rsa"],
             "html": true,
             "name": "keytype"
         },
@@ -2004,10 +1760,7 @@
             "name": "mediagroup"
         },
         "html-method": {
-            "enum": [
-                "get",
-                "post"
-            ],
+            "enum": ["get", "post"],
             "html": true,
             "name": "method"
         },
@@ -2056,11 +1809,7 @@
             "name": "poster"
         },
         "html-preload": {
-            "enum": [
-                "auto",
-                "metadata",
-                "none"
-            ],
+            "enum": ["auto", "metadata", "none"],
             "html": true,
             "name": "preload"
         },
@@ -2136,12 +1885,7 @@
             "name": "selected"
         },
         "html-scope": {
-            "enum": [
-                "col",
-                "colgroup",
-                "row",
-                "rowgroup"
-            ],
+            "enum": ["col", "colgroup", "row", "rowgroup"],
             "html": true,
             "name": "scope"
         },
@@ -2159,12 +1903,7 @@
             "name": "scrolldelay"
         },
         "html-shape": {
-            "enum": [
-                "circle",
-                "default",
-                "poly",
-                "rect"
-            ],
+            "enum": ["circle", "default", "poly", "rect"],
             "html": true,
             "name": "shape"
         },
@@ -2173,9 +1912,7 @@
             "name": "size"
         },
         "html-sizes": {
-            "enum": [
-                "any"
-            ],
+            "enum": ["any"],
             "html": true,
             "name": "sizes"
         },
@@ -2208,12 +1945,7 @@
             "name": "step"
         },
         "html-target": {
-            "enum": [
-                "_blank",
-                "_parent",
-                "_self",
-                "_top"
-            ],
+            "enum": ["_blank", "_parent", "_self", "_top"],
             "html": true,
             "name": "target"
         },
@@ -2243,10 +1975,7 @@
             "name": "width"
         },
         "html-wrap": {
-            "enum": [
-                "hard",
-                "soft"
-            ],
+            "enum": ["hard", "soft"],
             "html": true,
             "name": "wrap"
         },
@@ -2261,28 +1990,20 @@
     },
     "<big>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<dialog>": {
         "@open": "#html-open",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<ilayer>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<main>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<marquee>": {
         "@align": "#html-align",
@@ -2298,21 +2019,15 @@
         "@vspace": "#html-vspace",
         "@width": "#html-width",
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<tt>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<var>": {
         "html": true,
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<content>": {
         "html": true,
@@ -2322,9 +2037,7 @@
                 "snippet": "content select=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<data>": {
         "html": true,
@@ -2334,9 +2047,7 @@
                 "snippet": "data value=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<menuitem>": {
         "html": true,
@@ -2346,9 +2057,7 @@
                 "snippet": "menuitem type=\"${1:command}\" label=\"${2:Save}\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<opt>": {
         "html": true,
@@ -2357,9 +2066,7 @@
                 "snippet": "option${1: value=\"${2:option}\"}"
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     },
     "<template>": {
         "html": true,
@@ -2368,8 +2075,6 @@
                 "snippet": "template id=\"$1\""
             }
         ],
-        "attribute-groups": [
-            "html-attributes"
-        ]
+        "attribute-groups": ["html-attributes"]
     }
 }
diff --git a/src/taglibs/layout/marko.json b/src/taglibs/layout/marko.json
index f8decd89d..6ad5002dd 100644
--- a/src/taglibs/layout/marko.json
+++ b/src/taglibs/layout/marko.json
@@ -10,10 +10,12 @@
         "autocomplete": [
             {
                 "snippet": "layout-use(\"${1:./path/to/template.marko}\")",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-use><code>"
             }
         ]
     },
@@ -24,10 +26,12 @@
         "autocomplete": [
             {
                 "snippet": "layout-put into=\"${1:name}\"",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-put><code>"
             }
         ]
     },
@@ -37,11 +41,13 @@
         "autocomplete": [
             {
                 "snippet": "layout-placeholder name=\"${1:name}\"",
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
             },
             {
-                "descriptionMoreURL": "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
+                "descriptionMoreURL":
+                    "http://markojs.com/docs/marko/layout-taglib/#<code>&ltlayout-placeholder><code>"
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/src/taglibs/layout/placeholder-tag.js b/src/taglibs/layout/placeholder-tag.js
index 5e19b05bf..670350709 100644
--- a/src/taglibs/layout/placeholder-tag.js
+++ b/src/taglibs/layout/placeholder-tag.js
@@ -1,20 +1,22 @@
-var removeDashes = require('../../compiler/util/removeDashes');
+var removeDashes = require("../../compiler/util/removeDashes");
 
 module.exports = function render(oldNode, context) {
-    context.deprecate('The <layout-placeholder> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452');
+    context.deprecate(
+        "The <layout-placeholder> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452"
+    );
 
-    var name = oldNode.getAttributeValue('name');
+    var name = oldNode.getAttributeValue("name");
     var builder = context.builder;
     var content;
 
-    if (name.type === 'Literal' && typeof name.value === 'string') {
-        content = builder.memberExpression('input', removeDashes(name.value));
+    if (name.type === "Literal" && typeof name.value === "string") {
+        content = builder.memberExpression("input", removeDashes(name.value));
     } else {
-        content = builder.memberExpression('input', name, true);
+        content = builder.memberExpression("input", name, true);
     }
 
-    var newNode = context.createNodeForEl('include');
-    newNode.addProps({ _target:content });
+    var newNode = context.createNodeForEl("include");
+    newNode.addProps({ _target: content });
 
     if (oldNode.firstChild) {
         var ifNode = builder.ifStatement(content, [newNode]);
@@ -26,4 +28,4 @@ module.exports = function render(oldNode, context) {
     } else {
         oldNode.replaceWith(newNode);
     }
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/layout/put-tag.js b/src/taglibs/layout/put-tag.js
index 0e5c3b23d..7d8df7f0f 100644
--- a/src/taglibs/layout/put-tag.js
+++ b/src/taglibs/layout/put-tag.js
@@ -1,13 +1,15 @@
 module.exports = function render(oldNode, context) {
-    context.deprecate('The <layout-put> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452');
+    context.deprecate(
+        "The <layout-put> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452"
+    );
 
-    var name = oldNode.getAttributeValue('into').value;
-    var value = oldNode.getAttributeValue('value');
+    var name = oldNode.getAttributeValue("into").value;
+    var value = oldNode.getAttributeValue("value");
 
-    oldNode.removeAttribute('into');
-    oldNode.removeAttribute('value');
+    oldNode.removeAttribute("into");
+    oldNode.removeAttribute("value");
 
-    var newNode = context.createNodeForEl('@'+name, oldNode.getAttributes());
+    var newNode = context.createNodeForEl("@" + name, oldNode.getAttributes());
 
     if (value) {
         newNode.appendChild(context.builder.text(value));
@@ -15,4 +17,4 @@ module.exports = function render(oldNode, context) {
 
     oldNode.moveChildrenTo(newNode);
     oldNode.replaceWith(newNode);
-};
\ No newline at end of file
+};
diff --git a/src/taglibs/layout/use-tag.js b/src/taglibs/layout/use-tag.js
index 0f2f8d598..9ccf91185 100644
--- a/src/taglibs/layout/use-tag.js
+++ b/src/taglibs/layout/use-tag.js
@@ -1,15 +1,23 @@
-'use strict';
+"use strict";
 
 module.exports = function transform(oldNode, context) {
     var argument = oldNode.argument;
     if (!argument) {
-        context.addError('Invalid <layout-use> tag. Expected: <layout-use(template[, data]) ...>');
+        context.addError(
+            "Invalid <layout-use> tag. Expected: <layout-use(template[, data]) ...>"
+        );
         return;
     }
 
-    context.deprecate('The <layout-use> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452');
+    context.deprecate(
+        "The <layout-use> tag is deprecated. Please use <include> instead. See: https://github.com/marko-js/marko/issues/452"
+    );
 
-    var newNode = context.createNodeForEl('include', oldNode.getAttributes(), argument);
+    var newNode = context.createNodeForEl(
+        "include",
+        oldNode.getAttributes(),
+        argument
+    );
     oldNode.moveChildrenTo(newNode);
 
     oldNode.replaceWith(newNode);
diff --git a/src/vdom.js b/src/vdom.js
index 046e37f81..8a3e654fa 100644
--- a/src/vdom.js
+++ b/src/vdom.js
@@ -1 +1 @@
-module.exports = require('./runtime/vdom');
+module.exports = require("./runtime/vdom");
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 000000000..e18549e42
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "env": {
+        "mocha":true,
+        "browser":true
+    }
+}
\ No newline at end of file
diff --git a/test/.jshintrc b/test/.jshintrc
deleted file mode 100644
index 2bb32699e..000000000
--- a/test/.jshintrc
+++ /dev/null
@@ -1,44 +0,0 @@
-
-{
-  "predef": [
-      "it",
-      "xit",
-      "console",
-      "describe",
-      "xdescribe",
-      "beforeEach",
-      "before",
-      "after",
-      "waits",
-      "waitsFor",
-      "runs"
-  ],
-  "node" : true,
-  "es5" : false,
-  "esnext": true,
-  "browser" : true,
-  "boss" : false,
-  "curly": false,
-  "debug": false,
-  "devel": false,
-  "eqeqeq": true,
-  "evil": true,
-  "forin": false,
-  "immed": true,
-  "laxbreak": false,
-  "newcap": true,
-  "noarg": true,
-  "noempty": false,
-  "nonew": true,
-  "nomen": false,
-  "onevar": false,
-  "plusplus": false,
-  "regexp": false,
-  "undef": true,
-  "sub": false,
-  "white": false,
-  "eqeqeq": false,
-  "latedef": true,
-  "unused": "vars",
-  "eqnull": true
-}
diff --git a/test/__util__/BrowserHelpers.js b/test/__util__/BrowserHelpers.js
index 581fd16d7..41bee56ac 100644
--- a/test/__util__/BrowserHelpers.js
+++ b/test/__util__/BrowserHelpers.js
@@ -1,8 +1,7 @@
-var expect = require('chai').expect;
-var path = require('path');
-var assert = require('assert');
-var markoComponents = require('marko/components');
-var getComponentsFromMeta = require('./components-from-meta');
+var expect = require("chai").expect;
+var assert = require("assert");
+var markoComponents = require("marko/components");
+var getComponentsFromMeta = require("./components-from-meta");
 
 function BrowserHelpers() {
     this.logOutput = [];
@@ -11,39 +10,52 @@ function BrowserHelpers() {
 }
 
 BrowserHelpers.prototype = {
-    triggerEvent: function (el, type) {
+    triggerEvent: function(el, type) {
         var ev = document.createEvent("Event");
         ev.initEvent(type, true, true);
         el.dispatchEvent(ev);
     },
 
-    triggerMouseEvent: function (el, type) {
+    triggerMouseEvent: function(el, type) {
         var ev = document.createEvent("MouseEvent");
-        ev.initMouseEvent(type, true /* bubble */, true /* cancelable */
-        , window, null, 0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null);
+        ev.initMouseEvent(
+            type,
+            true /* bubble */,
+            true /* cancelable */,
+            window,
+            null,
+            0,
+            0,
+            0,
+            0 /* coordinates */,
+            false,
+            false,
+            false,
+            false /* modifier keys */,
+            0 /*left*/,
+            null
+        );
         el.dispatchEvent(ev);
     },
 
-    triggerClick: function (el) {
-        this.triggerMouseEvent(el, 'click');
+    triggerClick: function(el) {
+        this.triggerMouseEvent(el, "click");
     },
 
-    triggerMouseMove: function (el) {
-        this.triggerMouseEvent(el, 'mousemove');
+    triggerMouseMove: function(el) {
+        this.triggerMouseEvent(el, "mousemove");
     },
 
-    mount: function (templatePath, input) {
+    mount: function(templatePath, input) {
         var $global = input && input.$global;
         var template = require(templatePath);
         var renderResult = template.renderSync(input).appendTo(this.targetEl);
         var instance;
-        
+
         try {
             instance = renderResult.getComponent();
         } catch (e) {
-            if (e.toString().indexOf('No component') === -1) {
+            if (e.toString().indexOf("No component") === -1) {
                 throw e;
             }
         }
@@ -62,19 +74,19 @@ BrowserHelpers.prototype = {
         return instance;
     },
 
-    log: function (data) {
+    log: function(data) {
         this.logOutput.push(data);
     },
 
-    getComponentForEl: function (el) {
+    getComponentForEl: function(el) {
         return markoComponents.getComponentForEl(el);
     },
 
     get targetEl() {
-        return document.getElementById('testsTarget');
+        return document.getElementById("testsTarget");
     },
 
-    nodeListToArray: function (nodes) {
+    nodeListToArray: function(nodes) {
         var nodeArray = new Array(nodes.length);
         for (var i = 0; i < nodes.length; i++) {
             nodeArray[i] = nodes[i];
@@ -82,18 +94,26 @@ BrowserHelpers.prototype = {
         return nodeArray;
     },
 
-    checkChildrenMatch: function (children1, children2) {
+    checkChildrenMatch: function(children1, children2) {
         expect(children1.length).to.equal(children2.length);
 
         for (var i = 0; i < children1.length; i++) {
             var child1 = children1[i];
             var child2 = children2[i];
-            assert.ok(child1 === child2, 'Children at index ' + i + ' do not match. child 1: ' + child1 + ' child 2: ' + child2);
+            assert.ok(
+                child1 === child2,
+                "Children at index " +
+                    i +
+                    " do not match. child 1: " +
+                    child1 +
+                    " child 2: " +
+                    child2
+            );
         }
     },
 
-    cleanPath: function (path) {
-        return path.replace(/\.\d+\.in-module-context$/, '');
+    cleanPath: function(path) {
+        return path.replace(/\.\d+\.in-module-context$/, "");
     }
 };
 
diff --git a/test/__util__/async-test-suite.js b/test/__util__/async-test-suite.js
index 6ef342894..9aae90c00 100644
--- a/test/__util__/async-test-suite.js
+++ b/test/__util__/async-test-suite.js
@@ -1,39 +1,38 @@
 module.exports = function addAsyncTestSuites(fn) {
-  // Trick mocha into running the before hook without any tests.
-  var runner = it('').parent; 
-  var originalDescribe = global.describe;
+    // Trick mocha into running the before hook without any tests.
+    var runner = it("").parent;
+    var originalDescribe = global.describe;
 
-  before(function () {
-    // Test init can take a while. (This does not change the timeout of the actual tests, just the lasso compile time).
-    this.timeout(20000);
+    before(function() {
+        // Test init can take a while. (This does not change the timeout of the actual tests, just the lasso compile time).
+        this.timeout(20000);
 
-    // Remove empty test inserted above.
-    runner.tests.splice(0, 1);
-    
-    // patch describe to add to the current suite
-    var patchedDescribe = global.describe = function(name, fn) {
-      return moveSuite(originalDescribe(name, fn), runner);
-    };
-    patchedDescribe.only = function(name, fn) {
-      return moveSuite(originalDescribe.only(name, fn), runner);
-    }
-    patchedDescribe.skip = function(name, fn) {
-      return moveSuite(originalDescribe.skip(name, fn), runner);
-    }
+        // Remove empty test inserted above.
+        runner.tests.splice(0, 1);
 
-    return fn();
-  });
+        // patch describe to add to the current suite
+        var patchedDescribe = (global.describe = function(name, fn) {
+            return moveSuite(originalDescribe(name, fn), runner);
+        });
+        patchedDescribe.only = function(name, fn) {
+            return moveSuite(originalDescribe.only(name, fn), runner);
+        };
+        patchedDescribe.skip = function(name, fn) {
+            return moveSuite(originalDescribe.skip(name, fn), runner);
+        };
 
-  after(function () {
-    // restore the previous describe
-    global.describe = originalDescribe;
-  });
-}
+        return fn();
+    });
+
+    after(function() {
+        // restore the previous describe
+        global.describe = originalDescribe;
+    });
+};
 
 function moveSuite(suite, newParent) {
-  var oldSuites = suite.parent.suites;
-  newParent.addSuite(suite);
-  oldSuites.splice(oldSuites.indexOf(suite), 1);
-  return suite;
+    var oldSuites = suite.parent.suites;
+    newParent.addSuite(suite);
+    oldSuites.splice(oldSuites.indexOf(suite), 1);
+    return suite;
 }
-
diff --git a/test/__util__/components-from-meta.js b/test/__util__/components-from-meta.js
index 534322afc..f232698e8 100644
--- a/test/__util__/components-from-meta.js
+++ b/test/__util__/components-from-meta.js
@@ -1,23 +1,30 @@
-const path = require('path');
+const path = require("path");
 
-const getComponents = module.exports = (template, components) => {
+const getComponents = (module.exports = (template, components) => {
     var meta = template.meta;
     components = components || {};
     if (meta) {
         if (!components[meta.id]) {
             if (meta.id && meta.component) {
-                components[meta.id] = path.resolve(path.dirname(template.path), meta.component)
+                components[meta.id] = path.resolve(
+                    path.dirname(template.path),
+                    meta.component
+                );
             }
             if (meta.tags) {
                 meta.tags.forEach(tagRelativePath => {
-                    var tagPath = ('.' === tagRelativePath[0])
-                        ? path.resolve(path.dirname(template.path), tagRelativePath)
-                        : tagRelativePath;
+                    var tagPath =
+                        "." === tagRelativePath[0]
+                            ? path.resolve(
+                                  path.dirname(template.path),
+                                  tagRelativePath
+                              )
+                            : tagRelativePath;
                     var tagTemplate = require(tagPath);
                     components = getComponents(tagTemplate, components);
-                })
+                });
             }
         }
     }
     return components;
-}
\ No newline at end of file
+});
diff --git a/test/__util__/create-context-module.js b/test/__util__/create-context-module.js
index a40612c9c..6f5ed3ce9 100644
--- a/test/__util__/create-context-module.js
+++ b/test/__util__/create-context-module.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 // Someday this will become a separate package.
 const vm = require("vm");
@@ -15,21 +15,21 @@ const EXT_NAME = ".in-module-context";
 let moduleId = 0;
 
 class ContextModule extends Module {
-  /**
-   * Custom nodejs Module implementation which uses a provided
-   * resolver, require hooks, and context. 
-   */
-  constructor(options) {
-    const postfix = "." + (moduleId++) + EXT_NAME;
-    const filename = path.join(options.dir, "index" + postfix);
-    super(filename);
+    /**
+     * Custom nodejs Module implementation which uses a provided
+     * resolver, require hooks, and context.
+     */
+    constructor(options) {
+        const postfix = "." + moduleId++ + EXT_NAME;
+        const filename = path.join(options.dir, "index" + postfix);
+        super(filename);
 
-    this.filename = filename;
-    this[S_POSTFIX] = postfix;
-    this[S_CONTEXT] = options.context;
-    this[S_RESOLVE] = options.resolve;
-    this[S_HOOKS] = options.extensions;
-  }
+        this.filename = filename;
+        this[S_POSTFIX] = postfix;
+        this[S_CONTEXT] = options.context;
+        this[S_RESOLVE] = options.resolve;
+        this[S_HOOKS] = options.extensions;
+    }
 }
 
 /**
@@ -53,8 +53,8 @@ exports.createModule = createContextModule;
  * @param {Object.<string,function>} [config.extensions] An object containing any context specific require hooks to be used in this module.
  * @return {ContextModule}
  */
-function createContextModule (options) {
-  return new ContextModule(options);
+function createContextModule(options) {
+    return new ContextModule(options);
 }
 
 /**
@@ -64,48 +64,52 @@ function createContextModule (options) {
  * @param {Module} parentModule The module requiring this file.
  * @return {string}
  */
-function resolveFileHook (request, parentModule) {
-  const isNotBuiltin = builtinModules.indexOf(request) === -1;
-  const contextModule = isNotBuiltin && findNearestContextModule(parentModule);
+function resolveFileHook(request, parentModule) {
+    const isNotBuiltin = builtinModules.indexOf(request) === -1;
+    const contextModule =
+        isNotBuiltin && findNearestContextModule(parentModule);
 
-  if (contextModule) {
-    const resolver = contextModule[S_RESOLVE];
-    if (resolver) {      
-      const dir = path.dirname(parentModule.filename);
-      const postfix = contextModule[S_POSTFIX];
-    
-      if (request.endsWith(postfix)) {
-        return request;
-      }
-    
-      if (path.isAbsolute(request)) {
-        request = path.relative(dir, request);
-        if (request[0] !== ".") {
-          request = "./" + request; 
+    if (contextModule) {
+        const resolver = contextModule[S_RESOLVE];
+        if (resolver) {
+            const dir = path.dirname(parentModule.filename);
+            const postfix = contextModule[S_POSTFIX];
+
+            if (request.endsWith(postfix)) {
+                return request;
+            }
+
+            if (path.isAbsolute(request)) {
+                request = path.relative(dir, request);
+                if (request[0] !== ".") {
+                    request = "./" + request;
+                }
+            }
+
+            return resolver(dir, request) + postfix;
         }
-      }
-
-      return resolver(dir, request) + postfix;
     }
-  }
 
-  return originalResolve(request, parentModule);
+    return originalResolve(request, parentModule);
 }
 
 /**
  * Require hook which removes module postfix and uses custom extensions if provided.
  *
  * @param {Module} module
- * @param {string} filename 
+ * @param {string} filename
  */
-function requireHook (module, filename) {
-  const contextModule = findNearestContextModule(module);
-  const postfix = contextModule[S_POSTFIX];
-  const extensions = contextModule[S_HOOKS];
-  filename = filename.slice(0, -postfix.length);
-  const ext = path.extname(filename);
-  const compiler = (extensions && extensions[ext]) || require.extensions[ext] || require.extensions[".js"];
-  return compiler(module, filename);
+function requireHook(module, filename) {
+    const contextModule = findNearestContextModule(module);
+    const postfix = contextModule[S_POSTFIX];
+    const extensions = contextModule[S_HOOKS];
+    filename = filename.slice(0, -postfix.length);
+    const ext = path.extname(filename);
+    const compiler =
+        (extensions && extensions[ext]) ||
+        require.extensions[ext] ||
+        require.extensions[".js"];
+    return compiler(module, filename);
 }
 
 /**
@@ -114,28 +118,28 @@ function requireHook (module, filename) {
  * @param {string} content The file contents of the script.
  * @param {string} filename The filename for the script.
  */
-function compileHook (content, filename) {
-  const contextModule = findNearestContextModule(this);
-  
-  if (contextModule) {
-    const context = contextModule[S_CONTEXT];
-    const script = new vm.Script(Module.wrap(content), {
-      filename: filename,
-      lineOffset: 0,
-      displayErrors: true
-    });
+function compileHook(content, filename) {
+    const contextModule = findNearestContextModule(this);
 
-    return runScript(context, script).call(
-      this.exports,
-      this.exports,
-      createRequire(this),
-      this,
-      filename,
-      path.dirname(filename)
-    );
-  }
+    if (contextModule) {
+        const context = contextModule[S_CONTEXT];
+        const script = new vm.Script(Module.wrap(content), {
+            filename: filename,
+            lineOffset: 0,
+            displayErrors: true
+        });
 
-  return originalCompile.apply(this, arguments);
+        return runScript(context, script).call(
+            this.exports,
+            this.exports,
+            createRequire(this),
+            this,
+            filename,
+            path.dirname(filename)
+        );
+    }
+
+    return originalCompile.apply(this, arguments);
 }
 
 /**
@@ -144,12 +148,12 @@ function compileHook (content, filename) {
  * @param {Module} cur The starting module.
  * @return {Module?}
  */
-function findNearestContextModule (cur) {
-  do {
-    if (cur instanceof ContextModule) {
-      return cur;
-    }
-  } while (cur = cur.parent);
+function findNearestContextModule(cur) {
+    do {
+        if (cur instanceof ContextModule) {
+            return cur;
+        }
+    } while ((cur = cur.parent));
 }
 
 /**
@@ -160,10 +164,10 @@ function findNearestContextModule (cur) {
  * @param {Script} script The vm script to run.
  * @return {object}
  */
-function runScript (context, script) {
-  return context.runVMScript
-    ? context.runVMScript(script)
-    : script.runInContext(context);
+function runScript(context, script) {
+    return context.runVMScript
+        ? context.runVMScript(script)
+        : script.runInContext(context);
 }
 
 /**
@@ -173,11 +177,11 @@ function runScript (context, script) {
  * @param {Module} module The module to create a require function for.
  * @return {function}
  */
-function createRequire (module) {
-  const require = module.require.bind(module);
-  require.resolve = function (request) {
-    return resolveFileHook(request, module);
-  }
+function createRequire(module) {
+    const require = module.require.bind(module);
+    require.resolve = function(request) {
+        return resolveFileHook(request, module);
+    };
 
-  return require;
+    return require;
 }
diff --git a/test/__util__/create-jsdom-module.js b/test/__util__/create-jsdom-module.js
index 49fce1a38..a49c0ef68 100644
--- a/test/__util__/create-jsdom-module.js
+++ b/test/__util__/create-jsdom-module.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
 // Someday this will become a separate package.
-const fs = require('fs');
-const path = require('path');
-const jsdom = require('jsdom');
+const fs = require("fs");
+const path = require("path");
+const jsdom = require("jsdom");
 // const JSDOM = require('jsdom').JSDOM; // JSDOM 10+
-const browserResolve = require('lasso-resolve-from');
-const createContextModule = require('./create-context-module').createModule;
+const browserResolve = require("lasso-resolve-from");
+const createContextModule = require("./create-context-module").createModule;
 const remapCache = Object.create(null);
 
 /**
@@ -20,61 +20,63 @@ const remapCache = Object.create(null);
  * @param {Object.<string,function>} [config.extensions] An object containing any browser specific require hooks to be used in this module.
  * @return {JSDOM}
  */
-module.exports = function (options) {
-  const html = options.html;
-  const dir = options.dir;
-  const extensions = options.extensions;
-  const beforeParse = options.beforeParse;
-  options.html = options.dir = options.extensions = options.beforeParse = undefined;
-  const window = jsdom.jsdom('', options).defaultView;
-  const context = {
-    window: window,
-    runVMScript(script) {
-      return jsdom.evalVMScript(window, script);
+module.exports = function(options) {
+    const html = options.html;
+    const dir = options.dir;
+    const extensions = options.extensions;
+    const beforeParse = options.beforeParse;
+    options.html = options.dir = options.extensions = options.beforeParse = undefined;
+    const window = jsdom.jsdom("", options).defaultView;
+    const context = {
+        window: window,
+        runVMScript(script) {
+            return jsdom.evalVMScript(window, script);
+        }
+    };
+
+    // const context = new JSDOM('', options); // JSDOM 10+
+    // const window = context.window; // JSDOM 10+
+
+    const resolveConfig = {
+        remaps: loadRemaps,
+        extensions:
+            extensions &&
+            []
+                .concat(Object.keys(require.extensions))
+                .concat(Object.keys(extensions))
+                .filter(unique)
+    };
+    const module = createContextModule({
+        dir: dir,
+        context: context,
+        resolve: resolve,
+        extensions: extensions
+    });
+
+    context.require = module.require.bind(module);
+    beforeParse && beforeParse(window, context);
+    window.document.open();
+    window.document.write(html);
+
+    return context;
+
+    /**
+     * A function to resolve modules in the browser using the provided config.
+     *
+     * @param {string} from The file being resolved from.
+     * @param {string} request The requested path to resolve.
+     * @return {string}
+     */
+    function resolve(from, request) {
+        return browserResolve(from, request, resolveConfig).path;
     }
-  }
-
-  // const context = new JSDOM('', options); // JSDOM 10+
-  // const window = context.window; // JSDOM 10+  
-
-  const resolveConfig = {
-    remaps: loadRemaps,
-    extensions: extensions && []
-      .concat(Object.keys(require.extensions))
-      .concat(Object.keys(extensions))
-      .filter(unique)
-  }
-  const module = createContextModule({
-    dir: dir,
-    context: context,
-    resolve: resolve,
-    extensions: extensions
-  });
-
-  context.require = module.require.bind(module);
-  beforeParse && beforeParse(window, context);
-  window.document.open();
-  window.document.write(html);
-
-  return context;
-
-  /**
-   * A function to resolve modules in the browser using the provided config.
-   *
-   * @param {string} from The file being resolved from.
-   * @param {string} request The requested path to resolve.
-   * @return {string}
-   */
-  function resolve (from, request) {
-    return browserResolve(from, request, resolveConfig).path;
-  }
-}
+};
 
 /**
  * Array filter for uniqueness.
  */
-function unique (item, i, list) {
-  return list.indexOf(item) === i;
+function unique(item, i, list) {
+    return list.indexOf(item) === i;
 }
 
 /**
@@ -83,23 +85,23 @@ function unique (item, i, list) {
  * @param {string} dir
  * @return {object|void}
  */
-function loadRemaps (dir) {
-  const file = path.join(dir, "browser.json");
+function loadRemaps(dir) {
+    const file = path.join(dir, "browser.json");
 
-  if (file in remapCache) {
-    return remapCache[file];
-  } 
-
-  let result;
-  const remaps = fs.existsSync(file) && require(file).requireRemap;
-
-  if (remaps) {
-    result = {};
-    for (const remap of remaps) {
-      result[path.join(dir, remap.from)] = path.join(dir, remap.to);
+    if (file in remapCache) {
+        return remapCache[file];
     }
-  }
 
-  remapCache[file] = result;
-  return result;
+    let result;
+    const remaps = fs.existsSync(file) && require(file).requireRemap;
+
+    if (remaps) {
+        result = {};
+        for (const remap of remaps) {
+            result[path.join(dir, remap.from)] = path.join(dir, remap.to);
+        }
+    }
+
+    remapCache[file] = result;
+    return result;
 }
diff --git a/test/__util__/create-marko-jsdom-module.js b/test/__util__/create-marko-jsdom-module.js
index 2a837c742..cab6dae38 100644
--- a/test/__util__/create-marko-jsdom-module.js
+++ b/test/__util__/create-marko-jsdom-module.js
@@ -1,46 +1,51 @@
-'use strict';
+"use strict";
 
-const jQuery = require('jquery');
-const createJSDOMModule = require('./create-jsdom-module');
-const compiler = require('../../compiler');
-const noop = function () {};
+const jQuery = require("jquery");
+const createJSDOMModule = require("./create-jsdom-module");
+const compiler = require("../../compiler");
+const noop = function() {};
 const globals = [
-  'console',
-  '__coverage__',
-  'Error',
-  'describe',
-  'before',
-  'after',
-  'beforeEach',
-  'afterEach',
-  'it'
+    "console",
+    "__coverage__",
+    "Error",
+    "describe",
+    "before",
+    "after",
+    "beforeEach",
+    "afterEach",
+    "it"
 ];
 
 const browserExtensions = {
-    '.marko': function (module, filename) {
-        return module._compile(compiler.compileFile(filename, {
-            writeToDisk: false,
-            output: 'vdom',
-            browser: true,
-            meta: true
-        }), filename);
+    ".marko": function(module, filename) {
+        return module._compile(
+            compiler.compileFile(filename, {
+                writeToDisk: false,
+                output: "vdom",
+                browser: true,
+                meta: true
+            }),
+            filename
+        );
     }
 };
 
-module.exports = function (dir, html, options) {
-  options = options || {};
-  return createJSDOMModule({
-    dir: dir,
-    html: html,
-    extensions: browserExtensions,
-    // runScripts: 'dangerously', // JSDOM 10+
-    beforeParse(window, browser) {
-      jQuery(window);
-      browser.require('complain').log = noop;
-      globals.forEach(function (k) { window[k] = global[k]; });
-      if (options.beforeParse) {
-        options.beforeParse(window, browser);
-      }
-    }
-  });
-}
+module.exports = function(dir, html, options) {
+    options = options || {};
+    return createJSDOMModule({
+        dir: dir,
+        html: html,
+        extensions: browserExtensions,
+        // runScripts: 'dangerously', // JSDOM 10+
+        beforeParse(window, browser) {
+            jQuery(window);
+            browser.require("complain").log = noop;
+            globals.forEach(function(k) {
+                window[k] = global[k];
+            });
+            if (options.beforeParse) {
+                options.beforeParse(window, browser);
+            }
+        }
+    });
+};
diff --git a/test/__util__/domToHTML.js b/test/__util__/domToHTML.js
index 473f34a8a..3a0d0375b 100644
--- a/test/__util__/domToHTML.js
+++ b/test/__util__/domToHTML.js
@@ -1,12 +1,27 @@
-'use strict';
+"use strict";
 
-var runtimeHtmlHelpers = require('marko/runtime/html/helpers');
+var runtimeHtmlHelpers = require("marko/runtime/html/helpers");
 var escapeXml = runtimeHtmlHelpers.x;
 var escapeXmlAttr = runtimeHtmlHelpers.xa;
 
 var openTagOnly = {};
 
-['base', 'br', 'col', 'hr', 'embed', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'].forEach(function (tagName) {
+[
+    "base",
+    "br",
+    "col",
+    "hr",
+    "embed",
+    "img",
+    "input",
+    "keygen",
+    "link",
+    "meta",
+    "param",
+    "source",
+    "track",
+    "wbr"
+].forEach(function(tagName) {
     openTagOnly[tagName] = true;
 });
 
@@ -23,10 +38,9 @@ function getNextSibling(node) {
 }
 
 function vdomToHTML(node, options) {
-
     // NOTE: We don't use XMLSerializer because we need to sort the attributes to correctly compare output HTML strings
     // BAD: return (new XMLSerializer()).serializeToString(node);
-    var html = '';
+    var html = "";
     function serializeHelper(node) {
         var nodeType = node.nodeType || node.___nodeType;
 
@@ -37,7 +51,6 @@ function vdomToHTML(node, options) {
         } else if (nodeType === 8) {
             serializeCommentHelper(node);
         } else {
-            console.log('Invalid node:', node);
             html += `INVALID NODE TYPE ${nodeType}\n`;
         }
     }
@@ -45,52 +58,56 @@ function vdomToHTML(node, options) {
     function serializeElHelper(el) {
         var tagName = el.nodeName;
 
-        html += '<' + tagName;
+        html += "<" + tagName;
 
         var attributes = el.attributes;
         var attributesArray = [];
         var attrName;
 
-        if (typeof attributes.length === 'number') {
+        if (typeof attributes.length === "number") {
             for (var i = 0; i < attributes.length; i++) {
                 var attr = attributes[i];
                 attrName = attr.name;
 
-                if (attrName === 'data-marko-const') {
+                if (attrName === "data-marko-const") {
                     continue;
                 }
-                attributesArray.push(' ' + attrName + '="' + escapeXmlAttr(attr.value) + '"');
+                attributesArray.push(
+                    " " + attrName + '="' + escapeXmlAttr(attr.value) + '"'
+                );
             }
         } else {
             for (attrName in attributes) {
-                if (attrName === 'data-marko-const') {
+                if (attrName === "data-marko-const") {
                     continue;
                 }
 
                 var attrValue = attributes[attrName];
-                if (typeof attrValue !== 'string') {
+                if (typeof attrValue !== "string") {
                     if (attrValue === true) {
-                        attrValue = '';
+                        attrValue = "";
                     } else if (!attrValue) {
                         continue;
                     }
                 }
 
-                if (attrName === 'xlink:href') {
-                    attrName = 'http://www.w3.org/1999/xlink:href';
+                if (attrName === "xlink:href") {
+                    attrName = "http://www.w3.org/1999/xlink:href";
                 }
-                attributesArray.push(' ' + attrName + '="' + escapeXmlAttr(attrValue) + '"');
+                attributesArray.push(
+                    " " + attrName + '="' + escapeXmlAttr(attrValue) + '"'
+                );
             }
         }
 
         attributesArray.sort();
 
-        html += attributesArray.join('');
+        html += attributesArray.join("");
 
-        html += '>';
+        html += ">";
 
         var hasEndTag = true;
-        if (tagName.toUpperCase() === 'TEXTAREA') {
+        if (tagName.toUpperCase() === "TEXTAREA") {
             html += el.value;
         } else {
             var curChild = getFirstChild(el);
@@ -98,7 +115,7 @@ function vdomToHTML(node, options) {
                 while (curChild) {
                     let nodeType = curChild.nodeType || curChild.___nodeType;
                     if (nodeType === 3) {
-                        let escapeText = tagName.toUpperCase() !== 'SCRIPT';
+                        let escapeText = tagName.toUpperCase() !== "SCRIPT";
                         serializeTextHelper(curChild, escapeText);
                     } else {
                         serializeHelper(curChild);
@@ -112,21 +129,27 @@ function vdomToHTML(node, options) {
         }
 
         if (hasEndTag) {
-            html += '</' + tagName + '>';
+            html += "</" + tagName + ">";
         }
     }
 
     function serializeTextHelper(node, escape) {
-        html += escape !== false ? escapeXml(getNodeValue(node)) : getNodeValue(node);
+        html +=
+            escape !== false
+                ? escapeXml(getNodeValue(node))
+                : getNodeValue(node);
     }
 
     function serializeCommentHelper(node) {
-        html += '<!--' + getNodeValue(node) + '-->';
+        html += "<!--" + getNodeValue(node) + "-->";
     }
 
     let nodeType = node.nodeType || node.___nodeType;
 
-    if (nodeType === 11 /* DocumentFragment */ || options && options.childrenOnly) {
+    if (
+        nodeType === 11 /* DocumentFragment */ ||
+        (options && options.childrenOnly)
+    ) {
         var curChild = getFirstChild(node);
         while (curChild) {
             serializeHelper(curChild);
@@ -139,4 +162,4 @@ function vdomToHTML(node, options) {
     return html;
 }
 
-module.exports = vdomToHTML;
\ No newline at end of file
+module.exports = vdomToHTML;
diff --git a/test/__util__/domToString.js b/test/__util__/domToString.js
index 7284877c4..ee3ecd147 100644
--- a/test/__util__/domToString.js
+++ b/test/__util__/domToString.js
@@ -1,5 +1,5 @@
 function ltrim(s) {
-    return s ? s.replace(/^\s\s*/, '') : '';
+    return s ? s.replace(/^\s\s*/, "") : "";
 }
 
 function getNodeType(node) {
@@ -19,10 +19,9 @@ function getNextSibling(node) {
 }
 
 function vdomToHTML(node, options) {
-
     // NOTE: We don't use XMLSerializer because we need to sort the attributes to correctly compare output HTML strings
     // BAD: return (new XMLSerializer()).serializeToString(node);
-    var html = '';
+    var html = "";
     function serializeHelper(node, indent) {
         var nodeType = getNodeType(node);
 
@@ -33,7 +32,6 @@ function vdomToHTML(node, options) {
         } else if (nodeType === 8) {
             serializeCommentHelper(node, indent);
         } else {
-            console.log('Invalid node:', node);
             html += indent + `INVALID NODE TYPE ${nodeType}\n`;
             // throw new Error('Unexpected node type');
         }
@@ -44,92 +42,98 @@ function vdomToHTML(node, options) {
 
         var elNamespaceURI = el.namespaceURI || el.___namespaceURI;
 
-        if (elNamespaceURI === 'http://www.w3.org/2000/svg') {
-            tagName = 'svg:' + tagName;
-        } else if (elNamespaceURI === 'http://www.w3.org/1998/Math/MathML') {
-            tagName = 'math:' + tagName;
+        if (elNamespaceURI === "http://www.w3.org/2000/svg") {
+            tagName = "svg:" + tagName;
+        } else if (elNamespaceURI === "http://www.w3.org/1998/Math/MathML") {
+            tagName = "math:" + tagName;
         }
 
-        html += indent + '<' + tagName;
+        html += indent + "<" + tagName;
 
         var attributes = el.attributes || el.___attributes;
         var attributesArray = [];
         var attrName;
 
-        if (typeof attributes.length === 'number') {
+        if (typeof attributes.length === "number") {
             for (var i = 0; i < attributes.length; i++) {
                 var attr = attributes[i];
                 if (attr.namespaceURI) {
-                    attrName = attr.namespaceURI + ':' + attr.localName;
+                    attrName = attr.namespaceURI + ":" + attr.localName;
                 } else {
                     attrName = attr.name;
                 }
 
-                if (attrName === 'data-marko-const') {
+                if (attrName === "data-marko-const") {
                     continue;
                 }
-                attributesArray.push(' ' + attrName + '="' + attr.value + '"');
+                attributesArray.push(" " + attrName + '="' + attr.value + '"');
             }
         } else {
             for (attrName in attributes) {
-                if (attrName === 'data-marko-const') {
+                if (attrName === "data-marko-const") {
                     continue;
                 }
 
                 var attrValue = attributes[attrName];
-                if (typeof attrValue !== 'string') {
+                if (typeof attrValue !== "string") {
                     if (attrValue === true) {
-                        attrValue = '';
+                        attrValue = "";
                     } else if (attrValue == null || attrValue === false) {
                         continue;
                     }
                 }
 
-                if (attrName === 'xlink:href') {
-                    attrName = 'http://www.w3.org/1999/xlink:href';
+                if (attrName === "xlink:href") {
+                    attrName = "http://www.w3.org/1999/xlink:href";
                 }
-                attributesArray.push(' ' + attrName + '="' + attrValue + '"');
+                attributesArray.push(" " + attrName + '="' + attrValue + '"');
             }
         }
 
         attributesArray.sort();
 
-        html += attributesArray.join('');
+        html += attributesArray.join("");
 
-        html += '>\n';
+        html += ">\n";
 
-        if (tagName.toUpperCase() === 'TEXTAREA') {
-            html += indent + '  VALUE: ' + JSON.stringify(ltrim(el.value || el.___value)) + '\n';
+        if (tagName.toUpperCase() === "TEXTAREA") {
+            html +=
+                indent +
+                "  VALUE: " +
+                JSON.stringify(ltrim(el.value || el.___value)) +
+                "\n";
         } else {
             var curChild = getFirstChild(el);
             while (curChild) {
-                serializeHelper(curChild, indent + '  ');
+                serializeHelper(curChild, indent + "  ");
                 curChild = getNextSibling(curChild);
             }
         }
     }
 
     function serializeTextHelper(node, indent) {
-        html += indent + JSON.stringify(getNodeValue(node)) + '\n';
+        html += indent + JSON.stringify(getNodeValue(node)) + "\n";
     }
 
     function serializeCommentHelper(node, indent) {
-        html += indent + '<!--' + JSON.stringify(getNodeValue(node)) + '-->\n';
+        html += indent + "<!--" + JSON.stringify(getNodeValue(node)) + "-->\n";
     }
 
-    if (getNodeType(node) === 11 /* DocumentFragment */ || options && options.childrenOnly) {
+    if (
+        getNodeType(node) === 11 /* DocumentFragment */ ||
+        (options && options.childrenOnly)
+    ) {
         var curChild = getFirstChild(node);
 
         while (curChild) {
-            serializeHelper(curChild, '');
+            serializeHelper(curChild, "");
             curChild = getNextSibling(curChild);
         }
     } else {
-
-        serializeHelper(node, '');
+        serializeHelper(node, "");
     }
 
     return html;
 }
 
-module.exports = vdomToHTML;
\ No newline at end of file
+module.exports = vdomToHTML;
diff --git a/test/__util__/patch-module.js b/test/__util__/patch-module.js
index 525a52003..daec464aa 100644
--- a/test/__util__/patch-module.js
+++ b/test/__util__/patch-module.js
@@ -1,33 +1,54 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-var Module = require('module').Module;
+var Module = require("module").Module;
 var oldResolveFilename = Module._resolveFilename;
 
-var isDebug = require('../../env').isDebug;
+var isDebug = require("../../env").isDebug;
 
-var rootDir = nodePath.join(__dirname, '../../');
-var markoDir = isDebug ? nodePath.join(rootDir, 'src') : nodePath.join(rootDir, 'dist');
+var rootDir = nodePath.join(__dirname, "../../");
+var markoDir = isDebug
+    ? nodePath.join(rootDir, "src")
+    : nodePath.join(rootDir, "dist");
 
-var markoInstalledDir = nodePath.join(rootDir, 'node_modules/marko');
+var markoInstalledDir = nodePath.join(rootDir, "node_modules/marko");
 if (fs.existsSync(markoInstalledDir)) {
-    fs.renameSync(markoInstalledDir, nodePath.join(rootDir, 'node_modules/~marko'));
+    fs.renameSync(
+        markoInstalledDir,
+        nodePath.join(rootDir, "node_modules/~marko")
+    );
 }
 
-Module._resolveFilename = function (request, parent, isMain) {
-
-    if (request.charAt(0) !== '.') {
-        if (request === 'marko/components' || request === 'marko/jquery' || request === 'marko/legacy-components' || request === 'marko/ready') {
-            request = nodePath.join(rootDir, request.substring('marko/'.length));
-        } else if (request.startsWith('marko/dist/') || request.startsWith('marko/src/') || request.startsWith('marko/helpers/')) {
-
-            request = nodePath.join(rootDir, request.substring('marko/'.length));
-        } else if (request === 'marko') {
+Module._resolveFilename = function(request, parent, isMain) {
+    if (request.charAt(0) !== ".") {
+        if (
+            request === "marko/components" ||
+            request === "marko/jquery" ||
+            request === "marko/legacy-components" ||
+            request === "marko/ready"
+        ) {
+            request = nodePath.join(
+                rootDir,
+                request.substring("marko/".length)
+            );
+        } else if (
+            request.startsWith("marko/dist/") ||
+            request.startsWith("marko/src/") ||
+            request.startsWith("marko/helpers/")
+        ) {
+            request = nodePath.join(
+                rootDir,
+                request.substring("marko/".length)
+            );
+        } else if (request === "marko") {
             request = rootDir;
-        } else if (request.startsWith('marko/')) {
-            request = nodePath.join(markoDir, request.substring('marko/'.length));
+        } else if (request.startsWith("marko/")) {
+            request = nodePath.join(
+                markoDir,
+                request.substring("marko/".length)
+            );
         }
     }
 
     return oldResolveFilename.call(this, request, parent, isMain);
-};
\ No newline at end of file
+};
diff --git a/test/__util__/pubsub.js b/test/__util__/pubsub.js
index 7db8e131f..4a93e2973 100644
--- a/test/__util__/pubsub.js
+++ b/test/__util__/pubsub.js
@@ -1,9 +1,9 @@
-var EventEmitter = require('events').EventEmitter;
+var EventEmitter = require("events").EventEmitter;
 
 var channels = {};
 
 module.exports = exports = new EventEmitter();
 
-exports.channel = function (name) {
+exports.channel = function(name) {
     return channels[name] || (channels[name] = new EventEmitter());
-};
\ No newline at end of file
+};
diff --git a/test/__util__/runRenderTest.js b/test/__util__/runRenderTest.js
index 1b64108f3..55f0f8532 100644
--- a/test/__util__/runRenderTest.js
+++ b/test/__util__/runRenderTest.js
@@ -1,23 +1,26 @@
-'use strict';
+"use strict";
 
-const createJSDOMModule = require('../__util__/create-jsdom-module');
-const defaultDocument = createJSDOMModule({ dir: __dirname, html: '<html><body></body></html>' }).window.document;
+const createJSDOMModule = require("../__util__/create-jsdom-module");
+const defaultDocument = createJSDOMModule({
+    dir: __dirname,
+    html: "<html><body></body></html>"
+}).window.document;
 
-const path = require('path');
-const fs = require('fs');
-const marko = require('marko');
-const fsExtra = require('fs-extra');
-const domToHTML = require('./domToHTML');
-const domToString = require('./domToString');
-const expect = require('chai').expect;
-const toDiffableHtml = require('diffable-html');
+const path = require("path");
+const fs = require("fs");
+const marko = require("marko");
+const fsExtra = require("fs-extra");
+const domToHTML = require("./domToHTML");
+const domToString = require("./domToString");
+const expect = require("chai").expect;
+const toDiffableHtml = require("diffable-html");
 
 function createAsyncVerifier(main, helpers, out) {
     var events = [];
     var eventsByAwaitInstance = {};
 
-    var addEventListener = function (event) {
-        out.on(event, function (arg) {
+    var addEventListener = function(event) {
+        out.on(event, function(arg) {
             var name = arg.name;
 
             if (!eventsByAwaitInstance[name]) {
@@ -33,9 +36,9 @@ function createAsyncVerifier(main, helpers, out) {
         });
     };
 
-    addEventListener('await:begin');
-    addEventListener('await:beforeRender');
-    addEventListener('await:finish');
+    addEventListener("await:begin");
+    addEventListener("await:beforeRender");
+    addEventListener("await:finish");
 
     return {
         verify() {
@@ -44,37 +47,44 @@ function createAsyncVerifier(main, helpers, out) {
             }
 
             // Make sure all of the await instances were correctly ended
-            Object.keys(eventsByAwaitInstance).forEach(function (name) {
+            Object.keys(eventsByAwaitInstance).forEach(function(name) {
                 var events = eventsByAwaitInstance[name];
-                expect(events).to.deep.equal(['await:begin', 'await:beforeRender', 'await:finish']);
+                expect(events).to.deep.equal([
+                    "await:begin",
+                    "await:beforeRender",
+                    "await:finish"
+                ]);
             });
         }
     };
 }
 
 module.exports = function runRenderTest(dir, helpers, done, options) {
-    let output = options.output || 'html';
+    let output = options.output || "html";
 
     global.document = defaultDocument;
 
-    let isVDOM = output === 'vdom';
+    let isVDOM = output === "vdom";
     let checkAsyncEvents = options.checkAsyncEvents === true;
 
     let actualDir;
 
-    require('marko/compiler').configure({
+    require("marko/compiler").configure({
         output,
         autoKeyEnabled: !isVDOM
     });
 
     if (isVDOM) {
-        actualDir = path.join(dir, '../~vdom.skip/' + path.basename(dir));
+        actualDir = path.join(dir, "../~vdom.skip/" + path.basename(dir));
 
         fsExtra.removeSync(actualDir);
 
         fsExtra.copySync(dir, actualDir, {
-            filter: function (file) {
-                if (file.endsWith('.marko.js') || file.indexOf('.generated.') !== -1) {
+            filter: function(file) {
+                if (
+                    file.endsWith(".marko.js") ||
+                    file.indexOf(".generated.") !== -1
+                ) {
                     return false;
                 }
                 return true;
@@ -84,14 +94,14 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
         actualDir = dir;
     }
 
-    let templatePath = path.join(actualDir, 'template.marko');
-    let mainPath = path.join(actualDir, 'test.js');
+    let templatePath = path.join(actualDir, "template.marko");
+    let mainPath = path.join(actualDir, "test.js");
     let main = fs.existsSync(mainPath) ? require(mainPath) : {};
     let loadOptions = main && main.loadOptions;
 
     var oldDone = done;
-    done = function (err) {
-        require('marko/compiler').configure();
+    done = function(err) {
+        require("marko/compiler").configure();
 
         if (err) {
             return oldDone(err);
@@ -113,7 +123,7 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
         autoKeyEnabled: !isVDOM
     };
 
-    require('marko/compiler').configure(compilerOptions);
+    require("marko/compiler").configure(compilerOptions);
 
     try {
         if (main.checkError) {
@@ -123,12 +133,14 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
                 marko.load(templatePath, loadOptions);
             } catch (_e) {
                 e = _e;
-                let errorFile = path.join(actualDir, 'error.txt');
-                fs.writeFileSync(errorFile, e.stack.toString(), { encoding: 'utf8' });
+                let errorFile = path.join(actualDir, "error.txt");
+                fs.writeFileSync(errorFile, e.stack.toString(), {
+                    encoding: "utf8"
+                });
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
@@ -144,50 +156,75 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
                 asyncEventsVerifier = createAsyncVerifier(main, helpers, out);
             }
 
-            var verifyOutput = function (result) {
+            var verifyOutput = function(result) {
                 var renderOutput = result.getOutput();
 
                 if (isVDOM) {
-                    var getExpectedHtml = function (callback) {
+                    var getExpectedHtml = function(callback) {
                         var expectedHtml;
                         try {
-                            expectedHtml = fs.readFileSync(path.join(dir, 'vdom-expected.html'), { encoding: 'utf8' });
-                        } catch (e) {}
+                            expectedHtml = fs.readFileSync(
+                                path.join(dir, "vdom-expected.html"),
+                                { encoding: "utf8" }
+                            );
+                        } catch (e) {
+                            /* ignore error */
+                        }
 
                         if (expectedHtml) {
                             return callback(null, expectedHtml);
                         }
 
-                        require('marko/compiler').configure(Object.assign({}, compilerOptions, { output: 'html' }));
+                        require("marko/compiler").configure(
+                            Object.assign({}, compilerOptions, {
+                                output: "html"
+                            })
+                        );
 
-                        require('marko/runtime/vdom/AsyncVDOMBuilder').prototype.___document = defaultDocument;
+                        require("marko/runtime/vdom/AsyncVDOMBuilder").prototype.___document = defaultDocument;
                         global.document = defaultDocument;
 
-                        let htmlTemplatePath = path.join(dir, 'template.marko');
+                        let htmlTemplatePath = path.join(dir, "template.marko");
                         let htmlTemplate = marko.load(htmlTemplatePath);
-                        let htmlMainPath = path.join(dir, 'test.js');
-                        let htmlMain = fs.existsSync(htmlMainPath) ? require(htmlMainPath) : {};
+                        let htmlMainPath = path.join(dir, "test.js");
+                        let htmlMain = fs.existsSync(htmlMainPath)
+                            ? require(htmlMainPath)
+                            : {};
 
-                        htmlTemplate.render(htmlMain.templateData || {}, function (err, html) {
-                            if (err) {
-                                return callback(err);
+                        htmlTemplate.render(
+                            htmlMain.templateData || {},
+                            function(err, html) {
+                                if (err) {
+                                    return callback(err);
+                                }
+
+                                let browser = createJSDOMModule({
+                                    dir: __dirname,
+                                    html:
+                                        "<html><body>" + html + "</body></html>"
+                                });
+                                let expectedHtml = domToString(
+                                    browser.window.document.body,
+                                    { childrenOnly: true }
+                                );
+
+                                process.nextTick(function() {
+                                    callback(null, expectedHtml);
+                                });
                             }
-
-                            let browser = createJSDOMModule({ dir: __dirname, html: '<html><body>' + html + '</body></html>' });
-                            let expectedHtml = domToString(browser.window.document.body, { childrenOnly: true });
-
-                            process.nextTick(function () {
-                                callback(null, expectedHtml);
-                            });
-                        });
+                        );
                     };
 
-                    getExpectedHtml(function (err, expectedHtml) {
+                    getExpectedHtml(function(err, expectedHtml) {
                         if (err) {
                             return done(err);
                         }
 
-                        fs.writeFileSync(path.join(dir, 'vdom-expected.generated.html'), expectedHtml, { encoding: 'utf8' });
+                        fs.writeFileSync(
+                            path.join(dir, "vdom-expected.generated.html"),
+                            expectedHtml,
+                            { encoding: "utf8" }
+                        );
 
                         // let actualizedDom = vdomTree.actualize(defaultDocument);
 
@@ -197,9 +234,15 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
 
                         let vdomHtml = domToHTML(actualNode);
 
-                        let browser = createJSDOMModule({ dir: __dirname, html: '<html><body>' + vdomHtml + '</body></html>' });
-                        let vdomString = domToString(browser.window.document.body, { childrenOnly: true });
-                        helpers.compare(vdomString, 'vdom-', '.generated.html');
+                        let browser = createJSDOMModule({
+                            dir: __dirname,
+                            html: "<html><body>" + vdomHtml + "</body></html>"
+                        });
+                        let vdomString = domToString(
+                            browser.window.document.body,
+                            { childrenOnly: true }
+                        );
+                        helpers.compare(vdomString, "vdom-", ".generated.html");
 
                         if (checkAsyncEvents) {
                             asyncEventsVerifier.verify();
@@ -210,10 +253,12 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
                 } else {
                     let html = renderOutput;
                     if (main.checkHtml) {
-                        fs.writeFileSync(path.join(dir, 'actual.html'), html, { encoding: 'utf8' });
+                        fs.writeFileSync(path.join(dir, "actual.html"), html, {
+                            encoding: "utf8"
+                        });
                         main.checkHtml(html);
                     } else {
-                        helpers.compare(html, '', '.html', toDiffableHtml);
+                        helpers.compare(html, "", ".html", toDiffableHtml);
                     }
 
                     if (checkAsyncEvents) {
@@ -224,19 +269,22 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
                 }
             };
 
-            out.then(function onFulfilled(result) {
-                process.nextTick(function () {
-                    verifyOutput(result);
-                });
-            }, function onRejected(err) {
-                process.nextTick(function () {
-                    done(err);
-                });
-            });
+            out.then(
+                function onFulfilled(result) {
+                    process.nextTick(function() {
+                        verifyOutput(result);
+                    });
+                },
+                function onRejected(err) {
+                    process.nextTick(function() {
+                        done(err);
+                    });
+                }
+            );
 
             template.render(templateData, out).end();
         }
     } finally {
-        require('marko/compiler').configure();
+        require("marko/compiler").configure();
     }
 };
diff --git a/test/__util__/test-init.js b/test/__util__/test-init.js
index c50f59c4a..923ebb890 100644
--- a/test/__util__/test-init.js
+++ b/test/__util__/test-init.js
@@ -1,4 +1,6 @@
-require('./patch-module');
-require('complain').log = function () {};
-require('../../node-require').install({ compilerOptions: { writeToDisk: false } });
-require('it-fails');
\ No newline at end of file
+require("./patch-module");
+require("complain").log = function() {};
+require("../../node-require").install({
+    compilerOptions: { writeToDisk: false }
+});
+require("it-fails");
diff --git a/test/__util__/toHTML.js b/test/__util__/toHTML.js
index f871fd7e9..ba06aa319 100644
--- a/test/__util__/toHTML.js
+++ b/test/__util__/toHTML.js
@@ -15,10 +15,9 @@ function getNextSibling(node) {
 }
 
 function toHTML(node) {
-
     // NOTE: We don't use XMLSerializer because we need to sort the attributes to correctly compare output HTML strings
     // BAD: return (new XMLSerializer()).serializeToString(node);
-    var html = '';
+    var html = "";
     function serializeHelper(node, indent) {
         var nodeType = getNodeType(node);
 
@@ -29,7 +28,6 @@ function toHTML(node) {
         } else if (nodeType === 8) {
             serializeCommentHelper(node, indent);
         } else {
-            console.log('Invalid node:', node);
             html += indent + `INVALID NODE TYPE ${nodeType}\n`;
             // throw new Error('Unexpected node type');
         }
@@ -40,58 +38,58 @@ function toHTML(node) {
 
         var elNamespaceURI = el.namespaceURI || el.___namespaceURI;
 
-        if (elNamespaceURI === 'http://www.w3.org/2000/svg') {
-            tagName = 'svg:' + tagName;
-        } else if (elNamespaceURI === 'http://www.w3.org/1998/Math/MathML') {
-            tagName = 'math:' + tagName;
+        if (elNamespaceURI === "http://www.w3.org/2000/svg") {
+            tagName = "svg:" + tagName;
+        } else if (elNamespaceURI === "http://www.w3.org/1998/Math/MathML") {
+            tagName = "math:" + tagName;
         }
 
-        html += indent + '<' + tagName;
+        html += indent + "<" + tagName;
 
         var attributes = el.attributes || el.___attributes;
         var attributesArray = [];
         var attrName;
 
-        if (typeof attributes.length === 'number') {
+        if (typeof attributes.length === "number") {
             for (var i = 0; i < attributes.length; i++) {
                 var attr = attributes[i];
                 if (attr.namespaceURI) {
-                    attrName = attr.namespaceURI + ':' + attr.localName;
+                    attrName = attr.namespaceURI + ":" + attr.localName;
                 } else {
                     attrName = attr.name;
                 }
-                attributesArray.push(' ' + attrName + '="' + attr.value + '"');
+                attributesArray.push(" " + attrName + '="' + attr.value + '"');
             }
         } else {
             for (attrName in attributes) {
                 var attrValue = attributes[attrName];
-                if (typeof attrValue !== 'string') {
+                if (typeof attrValue !== "string") {
                     if (attrValue === true) {
-                        attrValue = '';
+                        attrValue = "";
                     } else if (!attrValue) {
                         continue;
                     }
                 }
 
-                if (attrName === 'xlink:href') {
-                    attrName = 'http://www.w3.org/1999/xlink:href';
+                if (attrName === "xlink:href") {
+                    attrName = "http://www.w3.org/1999/xlink:href";
                 }
-                attributesArray.push(' ' + attrName + '="' + attrValue + '"');
+                attributesArray.push(" " + attrName + '="' + attrValue + '"');
             }
         }
 
         attributesArray.sort();
 
-        html += attributesArray.join('');
+        html += attributesArray.join("");
 
-        html += '>\n';
+        html += ">\n";
 
-        if (tagName.toUpperCase() === 'TEXTAREA') {
-            html += indent + '  VALUE: ' + JSON.stringify(el.value) + '\n';
+        if (tagName.toUpperCase() === "TEXTAREA") {
+            html += indent + "  VALUE: " + JSON.stringify(el.value) + "\n";
         } else {
             var curChild = getFirstChild(el);
             while (curChild) {
-                serializeHelper(curChild, indent + '  ');
+                serializeHelper(curChild, indent + "  ");
                 curChild = getNextSibling(curChild);
             }
         }
@@ -106,24 +104,24 @@ function toHTML(node) {
     }
 
     function serializeTextHelper(node, indent) {
-        html += indent + JSON.stringify(getNodeValue(node)) + '\n';
+        html += indent + JSON.stringify(getNodeValue(node)) + "\n";
     }
 
     function serializeCommentHelper(node, indent) {
-        html += indent + '<!--' + JSON.stringify(getNodeValue(node)) + '-->\n';
+        html += indent + "<!--" + JSON.stringify(getNodeValue(node)) + "-->\n";
     }
 
     if (getNodeType(node) === 11 /* DocumentFragment */) {
-            var curChild = getFirstChild(node);
-            while (curChild) {
-                serializeHelper(curChild, '');
-                curChild = getNextSibling(curChild);
-            }
-        } else {
-        serializeHelper(node, '');
+        var curChild = getFirstChild(node);
+        while (curChild) {
+            serializeHelper(curChild, "");
+            curChild = getNextSibling(curChild);
+        }
+    } else {
+        serializeHelper(node, "");
     }
 
     return html;
 }
 
-module.exports = toHTML;
\ No newline at end of file
+module.exports = toHTML;
diff --git a/test/adjustIndent/fixtures/bad-indent/test.js b/test/adjustIndent/fixtures/bad-indent/test.js
index 1174036bb..92271055c 100644
--- a/test/adjustIndent/fixtures/bad-indent/test.js
+++ b/test/adjustIndent/fixtures/bad-indent/test.js
@@ -1 +1 @@
-exports.newIndentation = '    ';
\ No newline at end of file
+exports.newIndentation = "    ";
diff --git a/test/adjustIndent/fixtures/empty/test.js b/test/adjustIndent/fixtures/empty/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/empty/test.js
+++ b/test/adjustIndent/fixtures/empty/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/fixtures/increase-indent/test.js b/test/adjustIndent/fixtures/increase-indent/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/increase-indent/test.js
+++ b/test/adjustIndent/fixtures/increase-indent/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/fixtures/initial-empty-lines/test.js b/test/adjustIndent/fixtures/initial-empty-lines/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/initial-empty-lines/test.js
+++ b/test/adjustIndent/fixtures/initial-empty-lines/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/fixtures/no-indent/test.js b/test/adjustIndent/fixtures/no-indent/test.js
index 1174036bb..92271055c 100644
--- a/test/adjustIndent/fixtures/no-indent/test.js
+++ b/test/adjustIndent/fixtures/no-indent/test.js
@@ -1 +1 @@
-exports.newIndentation = '    ';
\ No newline at end of file
+exports.newIndentation = "    ";
diff --git a/test/adjustIndent/fixtures/remove-indent/test.js b/test/adjustIndent/fixtures/remove-indent/test.js
index 971ed64a6..9ca0ada5e 100644
--- a/test/adjustIndent/fixtures/remove-indent/test.js
+++ b/test/adjustIndent/fixtures/remove-indent/test.js
@@ -1 +1 @@
-exports.newIndentation = '';
\ No newline at end of file
+exports.newIndentation = "";
diff --git a/test/adjustIndent/fixtures/surrounding-empty-lines/test.js b/test/adjustIndent/fixtures/surrounding-empty-lines/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/surrounding-empty-lines/test.js
+++ b/test/adjustIndent/fixtures/surrounding-empty-lines/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/fixtures/tab-indent/test.js b/test/adjustIndent/fixtures/tab-indent/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/tab-indent/test.js
+++ b/test/adjustIndent/fixtures/tab-indent/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/fixtures/trailing-empty-lines/test.js b/test/adjustIndent/fixtures/trailing-empty-lines/test.js
index 91f4d398e..26fd6cd5e 100644
--- a/test/adjustIndent/fixtures/trailing-empty-lines/test.js
+++ b/test/adjustIndent/fixtures/trailing-empty-lines/test.js
@@ -1 +1 @@
-exports.newIndentation = '        ';
\ No newline at end of file
+exports.newIndentation = "        ";
diff --git a/test/adjustIndent/index.test.js b/test/adjustIndent/index.test.js
index 851faa4fb..ec0b46a08 100644
--- a/test/adjustIndent/index.test.js
+++ b/test/adjustIndent/index.test.js
@@ -1,24 +1,24 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var adjustIndent = require('marko/compiler/util/adjustIndent');
-var autotest = require('../autotest');
-var fs = require('fs');
+var path = require("path");
+var adjustIndent = require("marko/compiler/util/adjustIndent");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('adjustIndent', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("adjustIndent", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var inputPath = path.join(dir, 'input.txt');
-        var testSettings = require(path.join(dir, 'test.js'));
-        var input = fs.readFileSync(inputPath, { encoding: 'utf8' });
+        var inputPath = path.join(dir, "input.txt");
+        var testSettings = require(path.join(dir, "test.js"));
+        var input = fs.readFileSync(inputPath, { encoding: "utf8" });
         var newIndentation = testSettings.newIndentation;
         var output = adjustIndent(input, newIndentation);
-        helpers.compare(output, '.txt');
+        helpers.compare(output, ".txt");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js b/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js
index ef319e9e2..768a8ebd0 100644
--- a/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js
+++ b/test/api-compiler/fixtures/compileFileForBrowser-callback.js/test.js
@@ -1,15 +1,19 @@
-var path = require('path');
+var path = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
-    var templatePath = path.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
+    var templatePath = path.join(__dirname, "template.marko");
 
-    compiler.compileFileForBrowser(templatePath, {
-        writeVersionComment: false
-    }, function (err, compiledTemplate) {
-        var code = compiledTemplate.code;
-        code = code.replace(/marko\/dist\//g, 'marko/src/');
-        helpers.compare(code, '.js');
-        done();
-    });
-};
\ No newline at end of file
+    compiler.compileFileForBrowser(
+        templatePath,
+        {
+            writeVersionComment: false
+        },
+        function(err, compiledTemplate) {
+            var code = compiledTemplate.code;
+            code = code.replace(/marko\/dist\//g, "marko/src/");
+            helpers.compare(code, ".js");
+            done();
+        }
+    );
+};
diff --git a/test/api-compiler/fixtures/compileFileForBrowser.js/test.js b/test/api-compiler/fixtures/compileFileForBrowser.js/test.js
index 91aae81ad..d83ba3b5a 100644
--- a/test/api-compiler/fixtures/compileFileForBrowser.js/test.js
+++ b/test/api-compiler/fixtures/compileFileForBrowser.js/test.js
@@ -1,17 +1,16 @@
-var fs = require('fs');
-var path = require('path');
+var path = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
-    var templatePath = path.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
+    var templatePath = path.join(__dirname, "template.marko");
 
     var compiledTemplate = compiler.compileFileForBrowser(templatePath, {
         writeVersionComment: false
     });
 
     var code = compiledTemplate.code;
-    code = code.replace(/marko\/dist\//g, 'marko/src/');
-    helpers.compare(code, '.js');
+    code = code.replace(/marko\/dist\//g, "marko/src/");
+    helpers.compare(code, ".js");
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js b/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js
index 0b1991c5e..315a62666 100644
--- a/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js
+++ b/test/api-compiler/fixtures/compileForBrowser-callback.js/test.js
@@ -1,19 +1,24 @@
-var fs = require('fs');
-var path = require('path');
+var fs = require("fs");
+var path = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
-    var templatePath = path.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
+    var templatePath = path.join(__dirname, "template.marko");
 
-    var templateSrc = fs.readFileSync(templatePath, { encoding: 'utf8' });
+    var templateSrc = fs.readFileSync(templatePath, { encoding: "utf8" });
 
-    compiler.compileForBrowser(templateSrc, templatePath, {
-        writeVersionComment: false
-    }, function (err, compiledTemplate) {
-        var code = compiledTemplate.code;
-        code = code.replace(/marko\/dist\//g, 'marko/src/');
-        helpers.compare(code, '.js');
+    compiler.compileForBrowser(
+        templateSrc,
+        templatePath,
+        {
+            writeVersionComment: false
+        },
+        function(err, compiledTemplate) {
+            var code = compiledTemplate.code;
+            code = code.replace(/marko\/dist\//g, "marko/src/");
+            helpers.compare(code, ".js");
 
-        done();
-    });
-};
\ No newline at end of file
+            done();
+        }
+    );
+};
diff --git a/test/api-compiler/fixtures/compileForBrowser-write-version-comment.js/test.js b/test/api-compiler/fixtures/compileForBrowser-write-version-comment.js/test.js
index 954753fc8..71b328a71 100644
--- a/test/api-compiler/fixtures/compileForBrowser-write-version-comment.js/test.js
+++ b/test/api-compiler/fixtures/compileForBrowser-write-version-comment.js/test.js
@@ -1,20 +1,23 @@
-var fs = require('fs');
-var path = require('path');
-var markoVersion = require('../../../../package.json').version;
+var fs = require("fs");
+var path = require("path");
+var markoVersion = require("../../../../package.json").version;
 
 function getMarkoVersionComment() {
-    return '// Compiled using marko@' + markoVersion + ' - DO NOT EDIT\n';
+    return "// Compiled using marko@" + markoVersion + " - DO NOT EDIT\n";
 }
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
-    var templatePath = path.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
+    var templatePath = path.join(__dirname, "template.marko");
 
-    var templateSrc = fs.readFileSync(templatePath, { encoding: 'utf8' });
+    var templateSrc = fs.readFileSync(templatePath, { encoding: "utf8" });
 
-    var compiledTemplate = compiler.compileForBrowser(templateSrc, templatePath);
+    var compiledTemplate = compiler.compileForBrowser(
+        templateSrc,
+        templatePath
+    );
 
     expect(compiledTemplate.code).to.include(getMarkoVersionComment());
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/compileForBrowser.js/test.js b/test/api-compiler/fixtures/compileForBrowser.js/test.js
index c7747e17b..974755421 100644
--- a/test/api-compiler/fixtures/compileForBrowser.js/test.js
+++ b/test/api-compiler/fixtures/compileForBrowser.js/test.js
@@ -1,19 +1,23 @@
-var fs = require('fs');
-var path = require('path');
+var fs = require("fs");
+var path = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
-    var templatePath = path.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
+    var templatePath = path.join(__dirname, "template.marko");
 
-    var templateSrc = fs.readFileSync(templatePath, { encoding: 'utf8' });
-    var compiledTemplate = compiler.compileForBrowser(templateSrc, templatePath, {
-        writeVersionComment: false
-    });
+    var templateSrc = fs.readFileSync(templatePath, { encoding: "utf8" });
+    var compiledTemplate = compiler.compileForBrowser(
+        templateSrc,
+        templatePath,
+        {
+            writeVersionComment: false
+        }
+    );
 
     var code = compiledTemplate.code;
-    code = code.replace(/marko\/dist\//g, 'marko/src/');
+    code = code.replace(/marko\/dist\//g, "marko/src/");
 
-    helpers.compare(code, '.js');
+    helpers.compare(code, ".js");
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/configure-singleton/test.js b/test/api-compiler/fixtures/configure-singleton/test.js
index 8c025aa61..e544f4ec1 100644
--- a/test/api-compiler/fixtures/configure-singleton/test.js
+++ b/test/api-compiler/fixtures/configure-singleton/test.js
@@ -1,6 +1,5 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-
-    var configModulePath = require.resolve('marko/compiler/config');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var configModulePath = require.resolve("marko/compiler/config");
     var config = require(configModulePath);
 
     var globalConfig = global.__MARKO_CONFIG;
@@ -12,4 +11,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     expect(config).to.equal(globalConfig);
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/configure/test.js b/test/api-compiler/fixtures/configure/test.js
index 5fad40493..e4fd11973 100644
--- a/test/api-compiler/fixtures/configure/test.js
+++ b/test/api-compiler/fixtures/configure/test.js
@@ -1,5 +1,5 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var compiler = require('marko/compiler');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var compiler = require("marko/compiler");
     compiler.configure(); // Use defaults
     expect(compiler.config.writeToDisk).to.equal(true);
     expect(compiler.config.preserveWhitespace).to.equal(false);
@@ -16,4 +16,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     expect(compiler.config.writeToDisk).to.equal(true);
     expect(compiler.config.preserveWhitespace).to.equal(false);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/util-UniqueVars-different-value-objects/test.js b/test/api-compiler/fixtures/util-UniqueVars-different-value-objects/test.js
index b68f683a3..528987e54 100644
--- a/test/api-compiler/fixtures/util-UniqueVars-different-value-objects/test.js
+++ b/test/api-compiler/fixtures/util-UniqueVars-different-value-objects/test.js
@@ -1,9 +1,9 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var UniqueVars = require('marko/src/compiler/util/UniqueVars');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var UniqueVars = require("marko/src/compiler/util/UniqueVars");
 
     var uniqueVars = new UniqueVars();
-    var var1 = uniqueVars.addVar('foo', { name: 'Frank' });
-    var var2 = uniqueVars.addVar('foo', { name: 'Jane' });
+    var var1 = uniqueVars.addVar("foo", { name: "Frank" });
+    var var2 = uniqueVars.addVar("foo", { name: "Jane" });
     expect(var1).to.not.equal(var2);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/util-UniqueVars-different-values/test.js b/test/api-compiler/fixtures/util-UniqueVars-different-values/test.js
index e052d3761..23c7dda02 100644
--- a/test/api-compiler/fixtures/util-UniqueVars-different-values/test.js
+++ b/test/api-compiler/fixtures/util-UniqueVars-different-values/test.js
@@ -1,9 +1,9 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var UniqueVars = require('marko/src/compiler/util/UniqueVars');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var UniqueVars = require("marko/src/compiler/util/UniqueVars");
 
     var uniqueVars = new UniqueVars();
-    var var1 = uniqueVars.addVar('foo', 'abc');
-    var var2 = uniqueVars.addVar('foo', '123');
+    var var1 = uniqueVars.addVar("foo", "abc");
+    var var2 = uniqueVars.addVar("foo", "123");
     expect(var1).to.not.equal(var2);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/util-UniqueVars-value-objects/test.js b/test/api-compiler/fixtures/util-UniqueVars-value-objects/test.js
index bc107c2c3..da0604e67 100644
--- a/test/api-compiler/fixtures/util-UniqueVars-value-objects/test.js
+++ b/test/api-compiler/fixtures/util-UniqueVars-value-objects/test.js
@@ -1,9 +1,9 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var UniqueVars = require('marko/src/compiler/util/UniqueVars');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var UniqueVars = require("marko/src/compiler/util/UniqueVars");
 
     var uniqueVars = new UniqueVars();
-    var var1 = uniqueVars.addVar('foo', { name: 'Frank' });
-    var var2 = uniqueVars.addVar('foo', { name: 'Frank' });
+    var var1 = uniqueVars.addVar("foo", { name: "Frank" });
+    var var2 = uniqueVars.addVar("foo", { name: "Frank" });
     expect(var1).to.equal(var2);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/fixtures/util-UniqueVars/test.js b/test/api-compiler/fixtures/util-UniqueVars/test.js
index e0d9f29a8..df7b74562 100644
--- a/test/api-compiler/fixtures/util-UniqueVars/test.js
+++ b/test/api-compiler/fixtures/util-UniqueVars/test.js
@@ -1,9 +1,9 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var UniqueVars = require('marko/src/compiler/util/UniqueVars');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var UniqueVars = require("marko/src/compiler/util/UniqueVars");
 
     var uniqueVars = new UniqueVars();
-    var var1 = uniqueVars.addVar('foo', 'abc');
-    var var2 = uniqueVars.addVar('foo', 'abc');
+    var var1 = uniqueVars.addVar("foo", "abc");
+    var var2 = uniqueVars.addVar("foo", "abc");
     expect(var1).to.equal(var2);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api-compiler/index.test.js b/test/api-compiler/index.test.js
index 8e83ad005..7db2103e5 100644
--- a/test/api-compiler/index.test.js
+++ b/test/api-compiler/index.test.js
@@ -1,22 +1,26 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
-require('../../compiler');
-var autotest = require('../autotest');
-var marko = require('../../');
-var markoCompiler = require('../../compiler');
+var expect = require("chai").expect;
+var nodePath = require("path");
+require("../../compiler");
+var autotest = require("../autotest");
+var marko = require("../../");
+var markoCompiler = require("../../compiler");
 
-describe('api-compiler', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("api-compiler", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
-    autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
-        test.check(marko, markoCompiler, expect, helpers, done);
-    }, { timeout: 10000 });
+    autotest.scanDir(
+        autoTestDir,
+        function run(dir, helpers, done) {
+            var test = require(nodePath.join(dir, "test.js"));
+            test.check(marko, markoCompiler, expect, helpers, done);
+        },
+        { timeout: 10000 }
+    );
 });
diff --git a/test/api/fixtures-deprecated/legacy-helpers/test.js b/test/api/fixtures-deprecated/legacy-helpers/test.js
index 5d61fb3b8..ef959ed43 100644
--- a/test/api/fixtures-deprecated/legacy-helpers/test.js
+++ b/test/api/fixtures-deprecated/legacy-helpers/test.js
@@ -1,25 +1,25 @@
-exports.check = function (marko, markoCompiler, expect, done) {
-    var notEmpty = require('../../../../helpers/notEmpty');
+exports.check = function(marko, markoCompiler, expect, done) {
+    var notEmpty = require("../../../../helpers/notEmpty");
     expect(notEmpty(null)).to.equal(false);
     expect(notEmpty(undefined)).to.equal(false);
     expect(notEmpty([])).to.equal(false);
-    expect(notEmpty('')).to.equal(false);
+    expect(notEmpty("")).to.equal(false);
 
     expect(notEmpty(1)).to.equal(true);
     expect(notEmpty(0)).to.equal(true);
-    expect(notEmpty(['foo'])).to.equal(true);
-    expect(notEmpty('foo')).to.equal(true);
+    expect(notEmpty(["foo"])).to.equal(true);
+    expect(notEmpty("foo")).to.equal(true);
 
-    var empty = require('../../../../helpers/empty');
+    var empty = require("../../../../helpers/empty");
     expect(empty(null)).to.equal(true);
     expect(empty(undefined)).to.equal(true);
     expect(empty([])).to.equal(true);
-    expect(empty('')).to.equal(true);
+    expect(empty("")).to.equal(true);
 
     expect(empty(1)).to.equal(false);
     expect(empty(0)).to.equal(false);
-    expect(empty(['foo'])).to.equal(false);
-    expect(empty('foo')).to.equal(false);
+    expect(empty(["foo"])).to.equal(false);
+    expect(empty("foo")).to.equal(false);
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/compiler-configure/test.js b/test/api/fixtures/compiler-configure/test.js
index a134177fc..2c8c2c832 100644
--- a/test/api/fixtures/compiler-configure/test.js
+++ b/test/api/fixtures/compiler-configure/test.js
@@ -1,4 +1,4 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     markoCompiler.configure(); // Use defaults
     expect(markoCompiler.config.writeToDisk).to.equal(true);
     expect(markoCompiler.config.preserveWhitespace).to.equal(false);
@@ -13,4 +13,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     expect(markoCompiler.config.writeToDisk).to.equal(true);
     expect(markoCompiler.config.preserveWhitespace).to.equal(false);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/defineRenderer/test.js b/test/api/fixtures/defineRenderer/test.js
index 585e02d5c..e05b55117 100644
--- a/test/api/fixtures/defineRenderer/test.js
+++ b/test/api/fixtures/defineRenderer/test.js
@@ -1,16 +1,15 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-
-    var defineRenderer = require('marko/defineRenderer');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var defineRenderer = require("marko/defineRenderer");
     var renderer = defineRenderer({
-        template: require('./template.marko'),
-        getTemplateData: function (input) {
+        template: require("./template.marko"),
+        getTemplateData: function(input) {
             return {
-                fullName: input.firstName + ' ' + input.lastName
+                fullName: input.firstName + " " + input.lastName
             };
         }
     });
 
-    var renderResult = renderer.render({ firstName: 'John', lastName: 'Doe' });
+    var renderResult = renderer.render({ firstName: "John", lastName: "Doe" });
     helpers.compare(renderResult.getOutput());
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/error-renderSync-beginAsync/test.js b/test/api/fixtures/error-renderSync-beginAsync/test.js
index 3c9c0d3bc..ef32f899f 100644
--- a/test/api/fixtures/error-renderSync-beginAsync/test.js
+++ b/test/api/fixtures/error-renderSync-beginAsync/test.js
@@ -1,15 +1,15 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var output;
     var e;
 
     try {
         output = template.renderSync({
-            nameDataProvider: function (arg, callback) {
-                setTimeout(function () {
-                    callback(null, 'John');
+            nameDataProvider: function(arg, callback) {
+                setTimeout(function() {
+                    callback(null, "John");
                 }, 100);
             }
         });
@@ -20,4 +20,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     expect(output).to.equal(undefined);
     expect(e).to.not.equal(undefined);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/error-renderSync/test.js b/test/api/fixtures/error-renderSync/test.js
index 9bade0f40..9b0db75e6 100644
--- a/test/api/fixtures/error-renderSync/test.js
+++ b/test/api/fixtures/error-renderSync/test.js
@@ -1,7 +1,7 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var output;
     var e;
 
@@ -14,4 +14,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     expect(output).to.equal(undefined);
     expect(e).to.not.equal(undefined);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/load-prefer-precompiled/dummy.js b/test/api/fixtures/load-prefer-precompiled/dummy.js
index 572c11d52..0aaf2c86d 100644
--- a/test/api/fixtures/load-prefer-precompiled/dummy.js
+++ b/test/api/fixtures/load-prefer-precompiled/dummy.js
@@ -1 +1 @@
-module.exports = "SHOULD LOAD";
\ No newline at end of file
+module.exports = "SHOULD LOAD";
diff --git a/test/api/fixtures/load-prefer-precompiled/test.js b/test/api/fixtures/load-prefer-precompiled/test.js
index f50d2d202..ea673babe 100644
--- a/test/api/fixtures/load-prefer-precompiled/test.js
+++ b/test/api/fixtures/load-prefer-precompiled/test.js
@@ -1,9 +1,8 @@
-var nodePath = require('path');
-var fs = require('fs');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var templatePath = nodePath.join(__dirname, 'dummy.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var templatePath = nodePath.join(__dirname, "dummy.marko");
     var template = marko.load(templatePath);
-    expect(template).to.equal('SHOULD LOAD');
+    expect(template).to.equal("SHOULD LOAD");
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/load-render-callback/test.js b/test/api/fixtures/load-render-callback/test.js
index 40d27962e..1bfbcddab 100644
--- a/test/api/fixtures/load-render-callback/test.js
+++ b/test/api/fixtures/load-render-callback/test.js
@@ -1,16 +1,19 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.renderToString({
-        name: 'John'
-    }, function (err, html, out) {
-        if (err) {
-            return done(err);
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template.renderToString(
+        {
+            name: "John"
+        },
+        function(err, html) {
+            if (err) {
+                return done(err);
+            }
+
+            helpers.compare(html);
+            helpers.compare(html);
+            done();
         }
-
-        helpers.compare(html);
-        helpers.compare(html);
-        done();
-    });
-};
\ No newline at end of file
+    );
+};
diff --git a/test/api/fixtures/load-render-promise/test.js b/test/api/fixtures/load-render-promise/test.js
index 70db67121..0e1fb0723 100644
--- a/test/api/fixtures/load-render-promise/test.js
+++ b/test/api/fixtures/load-render-promise/test.js
@@ -1,16 +1,19 @@
-'use strict';
+"use strict";
 
-const nodePath = require('path');
+const nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    let template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    let template = marko.load(nodePath.join(__dirname, "template.marko"));
 
-    template.render({
-        name: 'John'
-    }).then(result => {
-        helpers.compare(result.toString());
-        done();
-    }).catch(err => {
-        done(err);
-    });
-};
\ No newline at end of file
+    template
+        .render({
+            name: "John"
+        })
+        .then(result => {
+            helpers.compare(result.toString());
+            done();
+        })
+        .catch(err => {
+            done(err);
+        });
+};
diff --git a/test/api/fixtures/load-source/test.js b/test/api/fixtures/load-source/test.js
index 4934ff97e..8028091b9 100644
--- a/test/api/fixtures/load-source/test.js
+++ b/test/api/fixtures/load-source/test.js
@@ -1,25 +1,25 @@
-var nodePath = require('path');
-var fs = require('fs');
+var nodePath = require("path");
+var fs = require("fs");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     var template;
     var templatePath;
 
     // Make sure calling load with templatePath:String, templateSrc:String arguments works
-    templatePath = nodePath.join(__dirname, 'dummy.marko');
-    template = marko.load(templatePath, '-- Hello $!{data.name}!');
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    templatePath = nodePath.join(__dirname, "dummy.marko");
+    template = marko.load(templatePath, "-- Hello $!{data.name}!");
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
 
     // Make sure calling load with templatePath:String, templateSrc:String, options:Object arguments works
-    templatePath = nodePath.join(__dirname, 'dummy.marko');
-    template = marko.load(templatePath, '-- Hello $!{data.name}!', {});
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    templatePath = nodePath.join(__dirname, "dummy.marko");
+    template = marko.load(templatePath, "-- Hello $!{data.name}!", {});
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
 
     // Make sure calling load with templatePath:String, options:Object arguments works
     delete markoCompiler.defaultOptions.writeToDisk;
 
-    templatePath = nodePath.join(__dirname, 'template.marko');
-    var compiledPath = nodePath.join(__dirname, 'template.marko.js');
+    templatePath = nodePath.join(__dirname, "template.marko");
+    var compiledPath = nodePath.join(__dirname, "template.marko.js");
 
     try {
         fs.unlinkSync(compiledPath);
@@ -29,7 +29,7 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
 
     template = marko.load(templatePath, { writeToDisk: false });
     expect(fs.existsSync(compiledPath)).to.equal(false);
-    expect(template.render).to.be.a('function');
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    expect(template.render).to.be.a("function");
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/load-writer-wrapping-stream/test.js b/test/api/fixtures/load-writer-wrapping-stream/test.js
index d7431992a..bbacf532f 100644
--- a/test/api/fixtures/load-writer-wrapping-stream/test.js
+++ b/test/api/fixtures/load-writer-wrapping-stream/test.js
@@ -1,26 +1,33 @@
-var nodePath = require('path');
-var through = require('through');
+var nodePath = require("path");
+var through = require("through");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var output = '';
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var output = "";
 
     var stream = through(function write(data) {
         output += data;
     });
 
-    var runtimeHtml = require('marko/src/html');
+    var runtimeHtml = require("marko/src/html");
 
     var out = runtimeHtml.createWriter(stream);
-    out.on('end', function () {
-        helpers.compare(output);
-        done();
-    }).on('error', function (e) {
-        done(e);
-    });
+    out
+        .on("end", function() {
+            helpers.compare(output);
+            done();
+        })
+        .on("error", function(e) {
+            done(e);
+        });
 
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
 
-    template.render({
-        name: 'John'
-    }, out).end();
-};
\ No newline at end of file
+    template
+        .render(
+            {
+                name: "John"
+            },
+            out
+        )
+        .end();
+};
diff --git a/test/api/fixtures/load-writer-wrapping-string-builder/test.js b/test/api/fixtures/load-writer-wrapping-string-builder/test.js
index 35f1c54bb..2596decb1 100644
--- a/test/api/fixtures/load-writer-wrapping-string-builder/test.js
+++ b/test/api/fixtures/load-writer-wrapping-string-builder/test.js
@@ -1,20 +1,25 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var runtimeHtml = require('marko/html');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var runtimeHtml = require("marko/html");
 
     var out = runtimeHtml.createWriter();
-    out.on('finish', function (result) {
-        helpers.compare(result.getOutput());
-        done();
-    }).on('error', function (e) {
-        done(e);
-    });
+    out
+        .on("finish", function(result) {
+            helpers.compare(result.getOutput());
+            done();
+        })
+        .on("error", function(e) {
+            done(e);
+        });
 
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.render({
-        name: 'John'
-    }, out);
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template.render(
+        {
+            name: "John"
+        },
+        out
+    );
 
     out.end();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/no-write-to-disk-load/test.js b/test/api/fixtures/no-write-to-disk-load/test.js
index a54b3e682..df069d0f6 100644
--- a/test/api/fixtures/no-write-to-disk-load/test.js
+++ b/test/api/fixtures/no-write-to-disk-load/test.js
@@ -1,18 +1,18 @@
-var nodePath = require('path');
-var fs = require('fs');
+var nodePath = require("path");
+var fs = require("fs");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     markoCompiler.defaultOptions.writeToDisk = false;
     try {
-        var templatePath = nodePath.join(__dirname, 'template.marko');
-        var compiledPath = nodePath.join(__dirname, 'template.marko.js');
+        var templatePath = nodePath.join(__dirname, "template.marko");
+        var compiledPath = nodePath.join(__dirname, "template.marko.js");
         var template = marko.load(templatePath);
         expect(fs.existsSync(compiledPath)).to.equal(false);
-        expect(template.render).to.be.a('function');
-        helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+        expect(template.render).to.be.a("function");
+        helpers.compare(template.renderSync({ name: "Frank" }).toString());
     } finally {
         markoCompiler.defaultOptions.writeToDisk = true;
     }
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/no-write-to-disk-require/test.js b/test/api/fixtures/no-write-to-disk-require/test.js
index cf469087b..de928ee17 100644
--- a/test/api/fixtures/no-write-to-disk-require/test.js
+++ b/test/api/fixtures/no-write-to-disk-require/test.js
@@ -1,18 +1,18 @@
-var nodePath = require('path');
-var fs = require('fs');
+var nodePath = require("path");
+var fs = require("fs");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     markoCompiler.defaultOptions.writeToDisk = false;
     try {
-        var templatePath = nodePath.join(__dirname, 'template.marko');
-        var compiledPath = nodePath.join(__dirname, 'template.marko.js');
+        var templatePath = nodePath.join(__dirname, "template.marko");
+        var compiledPath = nodePath.join(__dirname, "template.marko.js");
         var template = require(templatePath);
         expect(fs.existsSync(compiledPath)).to.equal(false);
-        expect(template.render).to.be.a('function');
-        helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+        expect(template.render).to.be.a("function");
+        helpers.compare(template.renderSync({ name: "Frank" }).toString());
     } finally {
         markoCompiler.defaultOptions.writeToDisk = true;
     }
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/render-await-promise-toString/test.js b/test/api/fixtures/render-await-promise-toString/test.js
index f7c3ca310..d989172f2 100644
--- a/test/api/fixtures/render-await-promise-toString/test.js
+++ b/test/api/fixtures/render-await-promise-toString/test.js
@@ -1,18 +1,20 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
 
-    template.render({
-        userPromise: new Promise((resolve, reject) => {
-            setTimeout(function () {
-                resolve({ name: 'John' });
-            }, 10);
+    template
+        .render({
+            userPromise: new Promise(resolve => {
+                setTimeout(function() {
+                    resolve({ name: "John" });
+                }, 10);
+            })
         })
-    }).then(result => {
-        process.nextTick(() => {
-            helpers.compare(result.toString());
-            done();
+        .then(result => {
+            process.nextTick(() => {
+                helpers.compare(result.toString());
+                done();
+            });
         });
-    });
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/render-callback-args/test.js b/test/api/fixtures/render-callback-args/test.js
index 45597e2e4..23058e535 100644
--- a/test/api/fixtures/render-callback-args/test.js
+++ b/test/api/fixtures/render-callback-args/test.js
@@ -1,11 +1,11 @@
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = require('./template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = require("./template.marko");
     var data = {
-        name: 'John'
+        name: "John"
     };
-    template.renderToString(data, function (error, html, out) {
+    template.renderToString(data, function(error, html, out) {
         helpers.compare(html);
         expect(out != null).to.equal(true);
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/render-callback-global-data/test.js b/test/api/fixtures/render-callback-global-data/test.js
index 4d2098849..bc929d24e 100644
--- a/test/api/fixtures/render-callback-global-data/test.js
+++ b/test/api/fixtures/render-callback-global-data/test.js
@@ -1,15 +1,15 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var data = {
-        name: 'John',
+        name: "John",
         $global: {
-            greeting: 'Greetings'
+            greeting: "Greetings"
         }
     };
-    template.render(data, function (error, result) {
+    template.render(data, function(error, result) {
         helpers.compare(result.toString());
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/render-readable-stream-global-data/test.js b/test/api/fixtures/render-readable-stream-global-data/test.js
index dbdb160ed..772aed4a0 100644
--- a/test/api/fixtures/render-readable-stream-global-data/test.js
+++ b/test/api/fixtures/render-readable-stream-global-data/test.js
@@ -1,24 +1,28 @@
-var nodePath = require('path');
-var through = require('through');
+var nodePath = require("path");
+var through = require("through");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var output = '';
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var output = "";
 
     var stream = through(function write(data) {
         output += data;
     });
 
-    stream.on('end', function () {
-        helpers.compare(output);
-        done();
-    }).on('error', function (e) {
-        done(e);
-    });
+    stream
+        .on("end", function() {
+            helpers.compare(output);
+            done();
+        })
+        .on("error", function(e) {
+            done(e);
+        });
 
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.stream({
-        $global: {
-            foo: 'bar'
-        }
-    }).pipe(stream);
-};
\ No newline at end of file
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template
+        .stream({
+            $global: {
+                foo: "bar"
+            }
+        })
+        .pipe(stream);
+};
diff --git a/test/api/fixtures/render-to-out-error/test.js b/test/api/fixtures/render-to-out-error/test.js
index 47ab11112..3d31b6b1b 100644
--- a/test/api/fixtures/render-to-out-error/test.js
+++ b/test/api/fixtures/render-to-out-error/test.js
@@ -1,22 +1,24 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var out = template.createOut();
     var events = [];
     var error;
 
-    out.on('error', function (_error) {
-        events.push('error');
-        error = _error;
-    }).on('finish', function () {
-        events.push('finish');
+    out
+        .on("error", function(_error) {
+            events.push("error");
+            error = _error;
+        })
+        .on("finish", function() {
+            events.push("finish");
 
-        expect(events).to.deep.equal(['error', 'finish']);
-        expect(error != null).to.equal(true);
-        expect(error.toString()).to.contain('invalid');
+            expect(events).to.deep.equal(["error", "finish"]);
+            expect(error != null).to.equal(true);
+            expect(error.toString()).to.contain("invalid");
 
-        done();
-    });
-    template.render({ name: 'John' }, out);
-};
\ No newline at end of file
+            done();
+        });
+    template.render({ name: "John" }, out);
+};
diff --git a/test/api/fixtures/render-writable-stream-global-data/test.js b/test/api/fixtures/render-writable-stream-global-data/test.js
index eb74872f7..11d31cae7 100644
--- a/test/api/fixtures/render-writable-stream-global-data/test.js
+++ b/test/api/fixtures/render-writable-stream-global-data/test.js
@@ -1,24 +1,29 @@
-var nodePath = require('path');
-var through = require('through');
+var nodePath = require("path");
+var through = require("through");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var output = '';
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var output = "";
 
     var stream = through(function write(data) {
         output += data;
     });
 
-    stream.on('end', function () {
-        helpers.compare(output);
-        done();
-    }).on('error', function (e) {
-        done(e);
-    });
+    stream
+        .on("end", function() {
+            helpers.compare(output);
+            done();
+        })
+        .on("error", function(e) {
+            done(e);
+        });
 
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.render({
-        $global: {
-            foo: 'bar'
-        }
-    }, stream);
-};
\ No newline at end of file
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template.render(
+        {
+            $global: {
+                foo: "bar"
+            }
+        },
+        stream
+    );
+};
diff --git a/test/api/fixtures/renderSync-global-data/test.js b/test/api/fixtures/renderSync-global-data/test.js
index 2a544ba34..0f8b31b27 100644
--- a/test/api/fixtures/renderSync-global-data/test.js
+++ b/test/api/fixtures/renderSync-global-data/test.js
@@ -1,14 +1,14 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var data = {
-        name: 'John',
+        name: "John",
         $global: {
-            greeting: 'Greetings'
+            greeting: "Greetings"
         }
     };
     var result = template.renderSync(data);
     helpers.compare(result.toString());
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderSync-no-data/test.js b/test/api/fixtures/renderSync-no-data/test.js
index cd2f92bb1..146797f3b 100644
--- a/test/api/fixtures/renderSync-no-data/test.js
+++ b/test/api/fixtures/renderSync-no-data/test.js
@@ -1,8 +1,8 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
     var result = template.renderSync();
     helpers.compare(result.toString());
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderSync/test.js b/test/api/fixtures/renderSync/test.js
index 4f52a61e1..0e73952fa 100644
--- a/test/api/fixtures/renderSync/test.js
+++ b/test/api/fixtures/renderSync/test.js
@@ -1,8 +1,8 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    var result = template.renderSync({ name: 'John' });
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    var result = template.renderSync({ name: "John" });
     helpers.compare(result.toString());
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString-callback-async/components/test-async/renderer.js b/test/api/fixtures/renderToString-callback-async/components/test-async/renderer.js
index 909ca95b0..33bfa1902 100644
--- a/test/api/fixtures/renderToString-callback-async/components/test-async/renderer.js
+++ b/test/api/fixtures/renderToString-callback-async/components/test-async/renderer.js
@@ -1,7 +1,7 @@
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
-    setTimeout(function () {
-        asyncOut.write('[async]');
+    setTimeout(function() {
+        asyncOut.write("[async]");
         asyncOut.end();
     }, 10);
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString-callback-async/test.js b/test/api/fixtures/renderToString-callback-async/test.js
index 30c8395e7..5eaef1a65 100644
--- a/test/api/fixtures/renderToString-callback-async/test.js
+++ b/test/api/fixtures/renderToString-callback-async/test.js
@@ -1,9 +1,9 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.renderToString({ name: 'John' }, function (err, html) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template.renderToString({ name: "John" }, function(err, html) {
         helpers.compare(html);
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString-callback-sync/test.js b/test/api/fixtures/renderToString-callback-sync/test.js
index 30c8395e7..5eaef1a65 100644
--- a/test/api/fixtures/renderToString-callback-sync/test.js
+++ b/test/api/fixtures/renderToString-callback-sync/test.js
@@ -1,9 +1,9 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    template.renderToString({ name: 'John' }, function (err, html) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    template.renderToString({ name: "John" }, function(err, html) {
         helpers.compare(html);
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString-no-callback-async/components/test-async/renderer.js b/test/api/fixtures/renderToString-no-callback-async/components/test-async/renderer.js
index 909ca95b0..33bfa1902 100644
--- a/test/api/fixtures/renderToString-no-callback-async/components/test-async/renderer.js
+++ b/test/api/fixtures/renderToString-no-callback-async/components/test-async/renderer.js
@@ -1,7 +1,7 @@
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
-    setTimeout(function () {
-        asyncOut.write('[async]');
+    setTimeout(function() {
+        asyncOut.write("[async]");
         asyncOut.end();
     }, 10);
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString-no-callback-async/test.js b/test/api/fixtures/renderToString-no-callback-async/test.js
index 355c99ca6..3f5c4ae1f 100644
--- a/test/api/fixtures/renderToString-no-callback-async/test.js
+++ b/test/api/fixtures/renderToString-no-callback-async/test.js
@@ -1,9 +1,9 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    expect(function () {
-        template.renderToString({ name: 'John' });
-    }).to.throw('beginAsync() not allowed when using renderSync()');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    expect(function() {
+        template.renderToString({ name: "John" });
+    }).to.throw("beginAsync() not allowed when using renderSync()");
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/renderToString/test.js b/test/api/fixtures/renderToString/test.js
index 429a13bd9..dd58fdd97 100644
--- a/test/api/fixtures/renderToString/test.js
+++ b/test/api/fixtures/renderToString/test.js
@@ -1,8 +1,8 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var template = marko.load(nodePath.join(__dirname, 'template.marko'));
-    var result = template.renderToString({ name: 'John' });
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var template = marko.load(nodePath.join(__dirname, "template.marko"));
+    var result = template.renderToString({ name: "John" });
     helpers.compare(result);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/require-compiled-template/test.js b/test/api/fixtures/require-compiled-template/test.js
index 778cec334..cd61e4dbd 100644
--- a/test/api/fixtures/require-compiled-template/test.js
+++ b/test/api/fixtures/require-compiled-template/test.js
@@ -1,20 +1,23 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     // Load the JS file to ensure the hello.marko.js file is created
-    marko.load(nodePath.join(__dirname, 'template.marko'));
+    marko.load(nodePath.join(__dirname, "template.marko"));
 
-    var templateModule = require(nodePath.join(__dirname, 'template.marko.js'));
+    var templateModule = require(nodePath.join(__dirname, "template.marko.js"));
 
     var template = marko.load(templateModule);
-    template.render({
-        name: 'John'
-    }, function (err, result) {
-        if (err) {
-            return done(err);
-        }
+    template.render(
+        {
+            name: "John"
+        },
+        function(err, result) {
+            if (err) {
+                return done(err);
+            }
 
-        helpers.compare(result.toString());
-        done();
-    });
-};
\ No newline at end of file
+            helpers.compare(result.toString());
+            done();
+        }
+    );
+};
diff --git a/test/api/fixtures/require-hook-compiler-options/test.js b/test/api/fixtures/require-hook-compiler-options/test.js
index 952cdd7d9..1a85c0082 100644
--- a/test/api/fixtures/require-hook-compiler-options/test.js
+++ b/test/api/fixtures/require-hook-compiler-options/test.js
@@ -1,21 +1,23 @@
-var expect = require('chai').expect;
-var fs = require('fs');
-var requireHook = require('../../../../node-require');
+var expect = require("chai").expect;
+var fs = require("fs");
+var requireHook = require("../../../../node-require");
 
 function compileAndCheck(path, shouldWriteToDisk) {
     var resolved = require.resolve(path);
-    var compiledFile = resolved + '.js';
+    var compiledFile = resolved + ".js";
 
     try {
         fs.unlinkSync(compiledFile);
-    } catch (e) {}
+    } catch (e) {
+        /* ignore error */
+    }
 
     require(resolved);
 
     expect(fs.existsSync(compiledFile)).to.equal(shouldWriteToDisk);
 }
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     try {
         requireHook.install({
             compilerOptions: {
@@ -27,8 +29,8 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
         expect(markoCompiler.config.writeToDisk).to.equal(true);
         expect(markoCompiler.config.preserveWhitespace).to.equal(true);
 
-        compileAndCheck('./a.marko', true /* should write to disk */);
-        compileAndCheck('./e.xml.marko', true /* should write to disk */);
+        compileAndCheck("./a.marko", true /* should write to disk */);
+        compileAndCheck("./e.xml.marko", true /* should write to disk */);
 
         requireHook.install({
             compilerOptions: {
@@ -48,7 +50,7 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
         expect(markoCompiler.config.writeToDisk).to.equal(true);
         expect(markoCompiler.config.preserveWhitespace).to.equal(true);
 
-        compileAndCheck('./b.marko', false /* should write to disk */);
+        compileAndCheck("./b.marko", false /* should write to disk */);
 
         markoCompiler.configure(); // Reset to defaults
         expect(markoCompiler.config.writeToDisk).to.equal(true);
@@ -61,7 +63,7 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
             }
         });
 
-        compileAndCheck('./c.marko', true /* should write to disk */);
+        compileAndCheck("./c.marko", true /* should write to disk */);
 
         requireHook.install({
             compilerOptions: {
@@ -74,7 +76,7 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
             preserveWhitespace: true
         });
 
-        compileAndCheck('./d.marko', false /* should write to disk */);
+        compileAndCheck("./d.marko", false /* should write to disk */);
 
         done();
     } finally {
@@ -83,6 +85,6 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
             compilerOptions: {
                 writeToDisk: false
             }
-        })
+        });
     }
 };
diff --git a/test/api/fixtures/require-render-callback/test.js b/test/api/fixtures/require-render-callback/test.js
index 2312f9d38..d5d9562b4 100644
--- a/test/api/fixtures/require-render-callback/test.js
+++ b/test/api/fixtures/require-render-callback/test.js
@@ -1,16 +1,19 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var templatePath = nodePath.join(__dirname, 'template.marko');
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var templatePath = nodePath.join(__dirname, "template.marko");
     var template = require(templatePath);
-    template.render({
-        name: 'John'
-    }, function (err, result) {
-        if (err) {
-            return done(err);
-        }
+    template.render(
+        {
+            name: "John"
+        },
+        function(err, result) {
+            if (err) {
+                return done(err);
+            }
 
-        helpers.compare(result.toString());
-        done();
-    });
-};
\ No newline at end of file
+            helpers.compare(result.toString());
+            done();
+        }
+    );
+};
diff --git a/test/api/fixtures/require-render-to-stream/test.js b/test/api/fixtures/require-render-to-stream/test.js
index b3b75a93f..5714c75c3 100644
--- a/test/api/fixtures/require-render-to-stream/test.js
+++ b/test/api/fixtures/require-render-to-stream/test.js
@@ -1,21 +1,24 @@
-var nodePath = require('path');
-var through = require('through');
+var nodePath = require("path");
+var through = require("through");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    var output = '';
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    var output = "";
     var outStream = through(function write(data) {
         output += data;
     });
 
-    outStream.on('end', function () {
+    outStream.on("end", function() {
         helpers.compare(output);
         done();
     });
 
-    var template = require(nodePath.join(__dirname, 'template.marko'));
-    template.stream({
-        name: 'John'
-    }).pipe(outStream).on('error', function (e) {
-        done(e);
-    });
-};
\ No newline at end of file
+    var template = require(nodePath.join(__dirname, "template.marko"));
+    template
+        .stream({
+            name: "John"
+        })
+        .pipe(outStream)
+        .on("error", function(e) {
+            done(e);
+        });
+};
diff --git a/test/api/fixtures/write-to-disk-load/test.js b/test/api/fixtures/write-to-disk-load/test.js
index 19013a732..c47450af3 100644
--- a/test/api/fixtures/write-to-disk-load/test.js
+++ b/test/api/fixtures/write-to-disk-load/test.js
@@ -1,18 +1,18 @@
-var nodePath = require('path');
-var fs = require('fs');
+var nodePath = require("path");
+var fs = require("fs");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
-    require('marko/compiler').configure({
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
+    require("marko/compiler").configure({
         writeToDisk: true
     });
 
     var compiledPath;
 
-    var templatePath = nodePath.join(__dirname, 'template.marko');
-    compiledPath = nodePath.join(__dirname, 'template.marko.js');
+    var templatePath = nodePath.join(__dirname, "template.marko");
+    compiledPath = nodePath.join(__dirname, "template.marko.js");
     var template = marko.load(templatePath);
     expect(fs.existsSync(compiledPath)).to.equal(true);
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/write-to-disk-require/test.js b/test/api/fixtures/write-to-disk-require/test.js
index 870c37226..34afdb53b 100644
--- a/test/api/fixtures/write-to-disk-require/test.js
+++ b/test/api/fixtures/write-to-disk-require/test.js
@@ -1,8 +1,8 @@
-var nodePath = require('path');
-var fs = require('fs');
-var requireHook = require('../../../../node-require');
+var nodePath = require("path");
+var fs = require("fs");
+var requireHook = require("../../../../node-require");
 
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     var compiledPath;
 
     requireHook.install({
@@ -12,12 +12,12 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     });
 
     try {
-        var templatePath = nodePath.join(__dirname, 'template.marko');
-        compiledPath = nodePath.join(__dirname, 'template.marko.js');
+        var templatePath = nodePath.join(__dirname, "template.marko");
+        compiledPath = nodePath.join(__dirname, "template.marko.js");
         var template = require(templatePath);
         delete require.cache[templatePath];
         expect(fs.existsSync(compiledPath)).to.equal(true);
-        helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+        helpers.compare(template.renderSync({ name: "Frank" }).toString());
     } finally {
         fs.unlinkSync(compiledPath);
         requireHook.install({
diff --git a/test/api/fixtures/writeToDisk-false-include/test.js b/test/api/fixtures/writeToDisk-false-include/test.js
index 352dbbcc4..e88f02a1c 100644
--- a/test/api/fixtures/writeToDisk-false-include/test.js
+++ b/test/api/fixtures/writeToDisk-false-include/test.js
@@ -1,22 +1,24 @@
-var nodePath = require('path');
-var fs = require('fs');
-
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+var nodePath = require("path");
+var fs = require("fs");
 
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     markoCompiler.configure({
         writeToDisk: false
     });
 
-    var templatePath = nodePath.join(__dirname, 'template.marko');
+    var templatePath = nodePath.join(__dirname, "template.marko");
     var template = marko.load(templatePath);
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
 
     markoCompiler.configure({
         writeToDisk: false
     });
 
-    var compiledTemplatePath = nodePath.join(__dirname, 'template.marko.js');
-    var compiledIncludeTemplatePath = nodePath.join(__dirname, 'include-target.marko.js');
+    var compiledTemplatePath = nodePath.join(__dirname, "template.marko.js");
+    var compiledIncludeTemplatePath = nodePath.join(
+        __dirname,
+        "include-target.marko.js"
+    );
 
     expect(fs.existsSync(compiledTemplatePath)).to.equal(false);
     expect(fs.existsSync(compiledIncludeTemplatePath)).to.equal(false);
@@ -25,4 +27,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     markoCompiler.configure();
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/fixtures/writeToDisk-false-layout/test.js b/test/api/fixtures/writeToDisk-false-layout/test.js
index c57ea66c1..9e665b1dc 100644
--- a/test/api/fixtures/writeToDisk-false-layout/test.js
+++ b/test/api/fixtures/writeToDisk-false-layout/test.js
@@ -1,22 +1,24 @@
-var nodePath = require('path');
-var fs = require('fs');
-
-exports.check = function (marko, markoCompiler, expect, helpers, done) {
+var nodePath = require("path");
+var fs = require("fs");
 
+exports.check = function(marko, markoCompiler, expect, helpers, done) {
     markoCompiler.configure({
         writeToDisk: false
     });
 
-    var templatePath = nodePath.join(__dirname, 'template.marko');
+    var templatePath = nodePath.join(__dirname, "template.marko");
     var template = marko.load(templatePath);
-    helpers.compare(template.renderSync({ name: 'Frank' }).toString());
+    helpers.compare(template.renderSync({ name: "Frank" }).toString());
 
     markoCompiler.configure({
         writeToDisk: false
     });
 
-    var compiledTemplatePath = nodePath.join(__dirname, 'template.marko.js');
-    var compiledIncludeTemplatePath = nodePath.join(__dirname, 'layout.marko.js');
+    var compiledTemplatePath = nodePath.join(__dirname, "template.marko.js");
+    var compiledIncludeTemplatePath = nodePath.join(
+        __dirname,
+        "layout.marko.js"
+    );
 
     expect(fs.existsSync(compiledTemplatePath)).to.equal(false);
     expect(fs.existsSync(compiledIncludeTemplatePath)).to.equal(false);
@@ -25,4 +27,4 @@ exports.check = function (marko, markoCompiler, expect, helpers, done) {
     markoCompiler.configure();
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/api/index.test.js b/test/api/index.test.js
index 18f8f096c..9a285bfe5 100644
--- a/test/api/index.test.js
+++ b/test/api/index.test.js
@@ -1,28 +1,34 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
-require('../../compiler');
-var autotest = require('../autotest');
-var marko = require('../../');
-var markoCompiler = require('../../compiler');
+var expect = require("chai").expect;
+var nodePath = require("path");
+require("../../compiler");
+var autotest = require("../autotest");
+var marko = require("../../");
+var markoCompiler = require("../../compiler");
 
-describe('api', function () {
-    autotest.scanDir(nodePath.join(__dirname, './fixtures'), function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
+describe("api", function() {
+    autotest.scanDir(nodePath.join(__dirname, "./fixtures"), function run(
+        dir,
+        helpers,
+        done
+    ) {
+        var test = require(nodePath.join(dir, "test.js"));
         test.check(marko, markoCompiler, expect, helpers, done);
     });
 
-    describe('deprecated', function () {
-        autotest.scanDir(nodePath.join(__dirname, './fixtures-deprecated'), function run(dir, helpers, done) {
-            var test = require(nodePath.join(dir, 'test.js'));
-            test.check(marko, markoCompiler, expect, done);
-        });
-    })
+    describe("deprecated", function() {
+        autotest.scanDir(
+            nodePath.join(__dirname, "./fixtures-deprecated"),
+            function run(dir, helpers, done) {
+                var test = require(nodePath.join(dir, "test.js"));
+                test.check(marko, markoCompiler, expect, done);
+            }
+        );
+    });
 });
-
diff --git a/test/async-render/fixtures/await-args-merge/test.js b/test/async-render/fixtures/await-args-merge/test.js
index 8f41827a6..3b7f40c9e 100644
--- a/test/async-render/fixtures/await-args-merge/test.js
+++ b/test/async-render/fixtures/await-args-merge/test.js
@@ -22,9 +22,9 @@ var users = {
 };
 
 exports.templateData = {
-    userInfo: function (arg, done) {
-        setTimeout(function () {
+    userInfo: function(arg, done) {
+        setTimeout(function() {
             done(null, users[arg.userId][arg.property]);
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-args/test.js b/test/async-render/fixtures/await-args/test.js
index d75a7aeb9..7c7ef5748 100644
--- a/test/async-render/fixtures/await-args/test.js
+++ b/test/async-render/fixtures/await-args/test.js
@@ -22,9 +22,9 @@ var users = {
 };
 
 exports.templateData = {
-    userInfo: function (arg, done) {
-        setTimeout(function () {
+    userInfo: function(arg, done) {
+        setTimeout(function() {
             done(null, users[arg.userId]);
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-client-reorder-invoked-once/test.js b/test/async-render/fixtures/await-client-reorder-invoked-once/test.js
index 9327d8bb8..6a4cfffc5 100644
--- a/test/async-render/fixtures/await-client-reorder-invoked-once/test.js
+++ b/test/async-render/fixtures/await-client-reorder-invoked-once/test.js
@@ -1,30 +1,30 @@
-const extend = require('raptor-util/extend');
-const expect = require('chai').expect;
+const extend = require("raptor-util/extend");
+const expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     },
-    inner2: function (callback) {
-        setTimeout(function () {
+    inner2: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 600);
     }
 };
 
-exports.checkEvents = function (events, helpers, out) {
+exports.checkEvents = function(events, helpers, out) {
     // Expect that we invoked the await reorderer. If true, it was only able to
     // be invoked once.
     expect(out.global.__awaitReordererInvoked).to.equal(true);
 
-    events = events.map(function (eventInfo) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -37,5 +37,5 @@ exports.checkEvents = function (events, helpers, out) {
         };
     });
 
-    helpers.compare(events, out.isVDOM ? '-events-vdom.json' : '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, out.isVDOM ? "-events-vdom.json" : "-events.json");
+};
diff --git a/test/async-render/fixtures/await-client-reorder-mixed/test.js b/test/async-render/fixtures/await-client-reorder-mixed/test.js
index e3c2153fc..1f01ac6ad 100644
--- a/test/async-render/fixtures/await-client-reorder-mixed/test.js
+++ b/test/async-render/fixtures/await-client-reorder-mixed/test.js
@@ -1,21 +1,21 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     }
 };
 
-exports.checkEvents = function (events, helpers, out) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers, out) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -28,5 +28,5 @@ exports.checkEvents = function (events, helpers, out) {
         };
     });
 
-    helpers.compare(events, out.isVDOM ? '-events-vdom.json' : '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, out.isVDOM ? "-events-vdom.json" : "-events.json");
+};
diff --git a/test/async-render/fixtures/await-client-reorder-nested/test.js b/test/async-render/fixtures/await-client-reorder-nested/test.js
index 6d36a728d..6d2cc7a8a 100644
--- a/test/async-render/fixtures/await-client-reorder-nested/test.js
+++ b/test/async-render/fixtures/await-client-reorder-nested/test.js
@@ -1,27 +1,27 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 100);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 200);
     },
-    inner2: function (callback) {
-        setTimeout(function () {
+    inner2: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 300);
     }
 };
 
-exports.checkHtml = function () {};
-exports.checkEvents = function (events, helpers, out) {
-    events = events.map(function (eventInfo) {
+exports.checkHtml = function() {};
+exports.checkEvents = function(events, helpers, out) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -34,5 +34,5 @@ exports.checkEvents = function (events, helpers, out) {
         };
     });
 
-    helpers.compare(events, out.isVDOM ? '-events-vdom.json' : '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, out.isVDOM ? "-events-vdom.json" : "-events.json");
+};
diff --git a/test/async-render/fixtures/await-client-reorder-sync/test.js b/test/async-render/fixtures/await-client-reorder-sync/test.js
index faa9185db..5d9e4cd6b 100644
--- a/test/async-render/fixtures/await-client-reorder-sync/test.js
+++ b/test/async-render/fixtures/await-client-reorder-sync/test.js
@@ -1,14 +1,14 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    userDataProvider: function (callback) {
-        callback(null, { name: 'Frank' });
+    userDataProvider: function(callback) {
+        callback(null, { name: "Frank" });
     }
 };
 
-exports.checkEvents = function (events, helpers, out) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -21,5 +21,5 @@ exports.checkEvents = function (events, helpers, out) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/async-render/fixtures/await-client-reorder/test.js b/test/async-render/fixtures/await-client-reorder/test.js
index d33546bc3..6f2a9c88c 100644
--- a/test/async-render/fixtures/await-client-reorder/test.js
+++ b/test/async-render/fixtures/await-client-reorder/test.js
@@ -1,26 +1,26 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     },
-    inner2: function (callback) {
-        setTimeout(function () {
+    inner2: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 600);
     }
 };
 
-exports.checkEvents = function (events, helpers, out) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers, out) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -33,5 +33,5 @@ exports.checkEvents = function (events, helpers, out) {
         };
     });
 
-    helpers.compare(events, out.isVDOM ? '-events-vdom.json' : '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, out.isVDOM ? "-events-vdom.json" : "-events.json");
+};
diff --git a/test/async-render/fixtures/await-data-providers/test.js b/test/async-render/fixtures/await-data-providers/test.js
index 937075126..354dd1995 100644
--- a/test/async-render/fixtures/await-data-providers/test.js
+++ b/test/async-render/fixtures/await-data-providers/test.js
@@ -1,18 +1,18 @@
 exports.templateData = {
-    sharedData: function (args, done) {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
+    sharedData: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
                 resolve({
-                    name: 'testSharedData'
+                    name: "testSharedData"
                 });
             }, 100);
         });
     },
-    contextData: function (args, done) {
-        setTimeout(function () {
+    contextData: function(args, done) {
+        setTimeout(function() {
             done(null, {
                 name: "testContextData"
             });
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-error-message-attr/test.js b/test/async-render/fixtures/await-error-message-attr/test.js
index cb46aa567..191ba8500 100644
--- a/test/async-render/fixtures/await-error-message-attr/test.js
+++ b/test/async-render/fixtures/await-error-message-attr/test.js
@@ -1,8 +1,8 @@
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            var err = new Error('Something went wrong!');
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            var err = new Error("Something went wrong!");
             done(err, null);
         }, 200);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-error/test.js b/test/async-render/fixtures/await-error/test.js
index cb46aa567..191ba8500 100644
--- a/test/async-render/fixtures/await-error/test.js
+++ b/test/async-render/fixtures/await-error/test.js
@@ -1,8 +1,8 @@
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            var err = new Error('Something went wrong!');
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            var err = new Error("Something went wrong!");
             done(err, null);
         }, 200);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-function-data-provider-callback/test.js b/test/async-render/fixtures/await-function-data-provider-callback/test.js
index 97402b44a..6cb7bf385 100644
--- a/test/async-render/fixtures/await-function-data-provider-callback/test.js
+++ b/test/async-render/fixtures/await-function-data-provider-callback/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    userInfo: function (arg, done) {
+    userInfo: function(arg, done) {
         done(null, {
-            name: 'John'
+            name: "John"
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-function-data-provider-return-promise/test.js b/test/async-render/fixtures/await-function-data-provider-return-promise/test.js
index d1e2b4a7b..163e5510d 100644
--- a/test/async-render/fixtures/await-function-data-provider-return-promise/test.js
+++ b/test/async-render/fixtures/await-function-data-provider-return-promise/test.js
@@ -1,11 +1,11 @@
 exports.templateData = {
-    userInfo: function () {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
+    userInfo: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
                 resolve({
-                    name: 'John'
+                    name: "John"
                 });
             }, 100);
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-function-data-provider-sync/test.js b/test/async-render/fixtures/await-function-data-provider-sync/test.js
index 4062acd20..2aabe33aa 100644
--- a/test/async-render/fixtures/await-function-data-provider-sync/test.js
+++ b/test/async-render/fixtures/await-function-data-provider-sync/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    userInfo: function () {
+    userInfo: function() {
         return {
-            name: 'John'
+            name: "John"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-macros/test.js b/test/async-render/fixtures/await-macros/test.js
index 0d865df0a..9268ab1a8 100644
--- a/test/async-render/fixtures/await-macros/test.js
+++ b/test/async-render/fixtures/await-macros/test.js
@@ -1,14 +1,16 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/async-render/fixtures/await-ordering/test.js b/test/async-render/fixtures/await-ordering/test.js
index f07cf151d..0a4989ace 100644
--- a/test/async-render/fixtures/await-ordering/test.js
+++ b/test/async-render/fixtures/await-ordering/test.js
@@ -1,41 +1,46 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800)
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(200),
-        'D3': delayedDataProvider(300),
-        'D4': delayedDataProvider(150)
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(200),
+            D3: delayedDataProvider(300),
+            D4: delayedDataProvider(150)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(800),
-        'D2': delayedDataProvider(200),
-        'D3': delayedDataProvider(300),
-        'D4': delayedDataProvider(100)
+    {
+        templateData: {
+            D1: delayedDataProvider(800),
+            D2: delayedDataProvider(200),
+            D3: delayedDataProvider(300),
+            D4: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(800),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(100)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+    {
+        templateData: {
+            D1: delayedDataProvider(800),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/async-render/fixtures/await-ordering2/test.js b/test/async-render/fixtures/await-ordering2/test.js
index a047d469c..64af9719d 100644
--- a/test/async-render/fixtures/await-ordering2/test.js
+++ b/test/async-render/fixtures/await-ordering2/test.js
@@ -1,42 +1,46 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(900),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(50)
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(900),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(50)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(900),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(200)
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(900),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(200)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(900),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(100),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(200)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+    {
+        templateData: {
+            D1: delayedDataProvider(900),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(100),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(200)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/async-render/fixtures/await-placeholder-message-attr/test.js b/test/async-render/fixtures/await-placeholder-message-attr/test.js
index d4b967eff..b8a574e83 100644
--- a/test/async-render/fixtures/await-placeholder-message-attr/test.js
+++ b/test/async-render/fixtures/await-placeholder-message-attr/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            done(null, { name: 'Frank' });
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            done(null, { name: "Frank" });
         }, 200);
     }
 };
 
-exports.checkHtml = function (html) {
-    expect(html).to.contain('Loading main...');
-    expect(html).to.contain('Hello Frank');
-};
\ No newline at end of file
+exports.checkHtml = function(html) {
+    expect(html).to.contain("Loading main...");
+    expect(html).to.contain("Hello Frank");
+};
diff --git a/test/async-render/fixtures/await-placeholder/test.js b/test/async-render/fixtures/await-placeholder/test.js
index d4b967eff..b8a574e83 100644
--- a/test/async-render/fixtures/await-placeholder/test.js
+++ b/test/async-render/fixtures/await-placeholder/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            done(null, { name: 'Frank' });
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            done(null, { name: "Frank" });
         }, 200);
     }
 };
 
-exports.checkHtml = function (html) {
-    expect(html).to.contain('Loading main...');
-    expect(html).to.contain('Hello Frank');
-};
\ No newline at end of file
+exports.checkHtml = function(html) {
+    expect(html).to.contain("Loading main...");
+    expect(html).to.contain("Hello Frank");
+};
diff --git a/test/async-render/fixtures/await-promise-error-bluebird/test.js b/test/async-render/fixtures/await-promise-error-bluebird/test.js
index e6ae568bf..1dac74909 100644
--- a/test/async-render/fixtures/await-promise-error-bluebird/test.js
+++ b/test/async-render/fixtures/await-promise-error-bluebird/test.js
@@ -1,9 +1,9 @@
-var deferred = require('bluebird').defer();
+var deferred = require("bluebird").defer();
 
-setTimeout(function () {
+setTimeout(function() {
     deferred.resolve({});
 }, 200);
 
 exports.templateData = {
     promiseData: deferred.promise
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-promise-error-q/test.js b/test/async-render/fixtures/await-promise-error-q/test.js
index 9ae6efcdf..616494b11 100644
--- a/test/async-render/fixtures/await-promise-error-q/test.js
+++ b/test/async-render/fixtures/await-promise-error-q/test.js
@@ -1,9 +1,9 @@
-var promise = new Promise(function (resolve, reject) {
-    setTimeout(function () {
+var promise = new Promise(function(resolve) {
+    setTimeout(function() {
         resolve({});
     }, 100);
 });
 
 exports.templateData = {
     promiseData: promise
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-promise/test.js b/test/async-render/fixtures/await-promise/test.js
index a55997af4..0fdf89ced 100644
--- a/test/async-render/fixtures/await-promise/test.js
+++ b/test/async-render/fixtures/await-promise/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    promiseData: function (arg, done) {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
-                resolve('Test promise');
+    promiseData: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
+                resolve("Test promise");
             }, 100);
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/await-timeout/test.js b/test/async-render/fixtures/await-timeout/test.js
index 1cc2306ad..22d85183b 100644
--- a/test/async-render/fixtures/await-timeout/test.js
+++ b/test/async-render/fixtures/await-timeout/test.js
@@ -1,21 +1,21 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    userInfoShort: function (done) {
-        setTimeout(function () {
+    userInfoShort: function(done) {
+        setTimeout(function() {
             done(null, {});
         }, 600);
     },
-    userInfoLong: function (done) {
-        setTimeout(function () {
+    userInfoLong: function(done) {
+        setTimeout(function() {
             done(null, {});
         }, 1000);
     }
 };
 
-exports.checkEvents = function (events, helpers) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -28,5 +28,5 @@ exports.checkEvents = function (events, helpers) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/async-render/fixtures/beginAsync/test.js b/test/async-render/fixtures/beginAsync/test.js
index f5a902d13..1ad75f0b8 100644
--- a/test/async-render/fixtures/beginAsync/test.js
+++ b/test/async-render/fixtures/beginAsync/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    beginAsync: function (out) {
+    beginAsync: function(out) {
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('B');
+        setTimeout(function() {
+            asyncOut.write("B");
             asyncOut.end();
         }, 20);
     }
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/cached-fragment-cache-manager-attr/test.js b/test/async-render/fixtures/cached-fragment-cache-manager-attr/test.js
index 638170b53..df0d85d6e 100644
--- a/test/async-render/fixtures/cached-fragment-cache-manager-attr/test.js
+++ b/test/async-render/fixtures/cached-fragment-cache-manager-attr/test.js
@@ -4,15 +4,15 @@ function createCache() {
     var cache = {};
 
     return {
-        get: function (cacheKey, options, callback) {
-            setTimeout(function () {
+        get: function(cacheKey, options, callback) {
+            setTimeout(function() {
                 var value = cache[cacheKey];
                 if (value !== undefined) {
                     return callback(null, value);
                 }
 
                 var builder = options.builder;
-                builder(function (err, value) {
+                builder(function(err, value) {
                     if (err) {
                         return callback(err);
                     }
@@ -31,11 +31,11 @@ function createCache() {
 }
 
 var myCacheManager = {
-    getCache: function (cacheName) {
+    getCache: function(cacheName) {
         return caches[cacheName] || (caches[cacheName] = createCache());
     }
 };
 
 exports.templateData = {
     myCacheManager: myCacheManager
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/cached-fragment/test.js b/test/async-render/fixtures/cached-fragment/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/async-render/fixtures/cached-fragment/test.js
+++ b/test/async-render/fixtures/cached-fragment/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/async-render/fixtures/components-await-beginAsync/components/beginAsync/renderer.js b/test/async-render/fixtures/components-await-beginAsync/components/beginAsync/renderer.js
index 5a5bd8de5..b02685799 100644
--- a/test/async-render/fixtures/components-await-beginAsync/components/beginAsync/renderer.js
+++ b/test/async-render/fixtures/components-await-beginAsync/components/beginAsync/renderer.js
@@ -1,7 +1,7 @@
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
-    setTimeout(function () {
+    setTimeout(function() {
         input.renderBody(asyncOut);
         asyncOut.end();
     }, 10);
-};
\ No newline at end of file
+};
diff --git a/test/async-render/fixtures/components-await-beginAsync/test.js b/test/async-render/fixtures/components-await-beginAsync/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/async-render/fixtures/components-await-beginAsync/test.js
+++ b/test/async-render/fixtures/components-await-beginAsync/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/async-render/fixtures/components-await-title/test.js b/test/async-render/fixtures/components-await-title/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/async-render/fixtures/components-await-title/test.js
+++ b/test/async-render/fixtures/components-await-title/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/async-render/fixtures/components-await/test.js b/test/async-render/fixtures/components-await/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/async-render/fixtures/components-await/test.js
+++ b/test/async-render/fixtures/components-await/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/async-render/html.test.js b/test/async-render/html.test.js
index e178751cf..f5cab213e 100644
--- a/test/async-render/html.test.js
+++ b/test/async-render/html.test.js
@@ -1,19 +1,19 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var autotest = require('../autotest');
-var runRenderTest = require('../__util__/runRenderTest');
+var path = require("path");
+var autotest = require("../autotest");
+var runRenderTest = require("../__util__/runRenderTest");
 
-describe('async-render', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("async-render", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
         runRenderTest(dir, helpers, done, {
-            output: 'html',
+            output: "html",
             checkAsyncEvents: true
         });
     });
diff --git a/test/async-render/vdom.test.js b/test/async-render/vdom.test.js
index a18b95b84..88939a37b 100644
--- a/test/async-render/vdom.test.js
+++ b/test/async-render/vdom.test.js
@@ -1,20 +1,20 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var autotest = require('../autotest');
-var runRenderTest = require('../__util__/runRenderTest');
+var path = require("path");
+var autotest = require("../autotest");
+var runRenderTest = require("../__util__/runRenderTest");
 
-describe('async render (vdom)', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("async render (vdom)", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     this.timeout(4000);
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
         runRenderTest(dir, helpers, done, {
-            output: 'vdom',
+            output: "vdom",
             checkAsyncEvents: true
         });
     });
diff --git a/test/async-stream/index.test.js b/test/async-stream/index.test.js
index 979e715d8..b56e45075 100644
--- a/test/async-stream/index.test.js
+++ b/test/async-stream/index.test.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
-var chai = require('chai');
+require("../__util__/test-init");
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
-var fs = require('fs');
-var fsReadOptions = { encoding: 'utf8' };
-var AsyncStream = require('marko/runtime/html/AsyncStream');
+var expect = require("chai").expect;
+var nodePath = require("path");
+var fs = require("fs");
+var fsReadOptions = { encoding: "utf8" };
+var AsyncStream = require("marko/runtime/html/AsyncStream");
 
 /* DEBUG INFO:
    ===========
@@ -18,9 +18,9 @@ var AsyncStream = require('marko/runtime/html/AsyncStream');
 // var asyncWriter = require('../debug');
 
 function createAsyncStream(options) {
-    if (typeof options.write === 'function') {
+    if (typeof options.write === "function") {
         return new AsyncStream(null, options);
-    } else if (typeof options === 'object') {
+    } else if (typeof options === "object") {
         var name = options.name;
         var globalData = options.global;
         var out = new AsyncStream(globalData);
@@ -33,9 +33,8 @@ function createAsyncStream(options) {
     }
 }
 
-describe('AsyncStream', function () {
-
-    beforeEach(function (done) {
+describe("AsyncStream", function() {
+    beforeEach(function(done) {
         // for (var k in require.cache) {
         //     if (require.cache.hasOwnProperty(k)) {
         //         delete require.cache[k];
@@ -45,495 +44,514 @@ describe('AsyncStream', function () {
         done();
     });
 
-    it('should render a series of sync calls correctly', function (done) {
+    it("should render a series of sync calls correctly", function(done) {
         var out = new AsyncStream();
-        out.write('1');
-        out.write('2');
-        out.write('3');
-        out.write('4');
+        out.write("1");
+        out.write("2");
+        out.write("3");
+        out.write("4");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('1234');
+            expect(output).to.equal("1234");
             done();
         });
     });
 
-    it('should resolve promise upon finish', function () {
+    it("should resolve promise upon finish", function() {
         var out = new AsyncStream();
 
-        out.write('1');
-        out.write('2');
+        out.write("1");
+        out.write("2");
 
         return out.end().then(result => {
             const output = result.getOutput();
-            expect(output).to.equal('12');
-            expect(result.toString()).to.equal('12');
+            expect(output).to.equal("12");
+            expect(result.toString()).to.equal("12");
         });
     });
 
-    it('should render a series of sync and async calls correctly', function (done) {
+    it("should render a series of sync and async calls correctly", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync();
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 100);
 
-        out.write('3');
+        out.write("3");
 
         var asyncOut2 = out.beginAsync();
-        setTimeout(function () {
-            asyncOut2.write('4');
+        setTimeout(function() {
+            asyncOut2.write("4");
             asyncOut2.end();
         }, 10);
 
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('1234');
+            expect(output).to.equal("1234");
             done();
         });
     });
 
-    it('should allow an async fragment to complete synchronously', function (done) {
+    it("should allow an async fragment to complete synchronously", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('2');
+        setTimeout(function() {
+            asyncOut.write("2");
             asyncOut.end();
         }, 10);
 
-        out.write('3');
+        out.write("3");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
     });
 
-    it('should allow the async callback to provide data', function (done) {
+    it("should allow the async callback to provide data", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.end('2');
+        setTimeout(function() {
+            asyncOut.end("2");
         }, 10);
 
-        out.write('3');
+        out.write("3");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
     });
 
-    it('should handle timeouts correctly', function (done) {
+    it("should handle timeouts correctly", function(done) {
         var out = new AsyncStream();
         var errors = [];
-        out.on('error', function (e) {
+        out.on("error", function(e) {
             errors.push(e);
         });
 
-        out.write('1');
+        out.write("1");
 
-        var asyncOut = out.beginAsync({ timeout: 100, name: 'test' });
-        setTimeout(function () {
-            asyncOut.write('2');
+        var asyncOut = out.beginAsync({ timeout: 100, name: "test" });
+        setTimeout(function() {
+            asyncOut.write("2");
             asyncOut.end();
         }, 200);
 
-        out.write('3');
+        out.write("3");
         out.end();
 
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             expect(errors.length).to.equal(1);
-            expect(result.getOutput()).to.equal('13');
+            expect(result.getOutput()).to.equal("13");
             done();
         });
     });
 
-    it('should render nested async calls correctly', function (done) {
+    it("should render nested async calls correctly", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('2a');
+        setTimeout(function() {
+            asyncOut.write("2a");
 
             var nestedAsyncContext = asyncOut.beginAsync();
-            setTimeout(function () {
-                nestedAsyncContext.write('2b');
+            setTimeout(function() {
+                nestedAsyncContext.write("2b");
                 nestedAsyncContext.end();
             }, 10);
 
-            asyncOut.write('2c');
+            asyncOut.write("2c");
             asyncOut.end();
         }, 10);
 
-        out.write('3');
+        out.write("3");
 
         var asyncOut2 = out.beginAsync();
-        setTimeout(function () {
+        setTimeout(function() {
             var nestedAsyncContext = asyncOut2.beginAsync();
-            setTimeout(function () {
-                nestedAsyncContext.write('4a');
+            setTimeout(function() {
+                nestedAsyncContext.write("4a");
                 nestedAsyncContext.end();
             }, 10);
 
             var nestedAsyncContext2 = asyncOut2.beginAsync();
-            setTimeout(function () {
-                nestedAsyncContext2.write('4b');
+            setTimeout(function() {
+                nestedAsyncContext2.write("4b");
                 nestedAsyncContext2.end();
             }, 10);
 
-            asyncOut2.write('4c');
+            asyncOut2.write("4c");
             asyncOut2.end();
         }, 10);
 
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('12a2b2c34a4b4c');
+            expect(output).to.equal("12a2b2c34a4b4c");
             done();
         });
     });
 
-    it('should handle odd execution ordering', function (done) {
-        var outA = createAsyncStream({ name: 'outA' });
+    it("should handle odd execution ordering", function(done) {
+        var outA = createAsyncStream({ name: "outA" });
 
-        outA.on('finish', function (result) {
+        outA.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('1234567');
+            expect(output).to.equal("1234567");
             done();
         });
 
-        outA.write('1');
+        outA.write("1");
 
-        var outB = outA.beginAsync({ name: 'outB' });
+        var outB = outA.beginAsync({ name: "outB" });
 
-        outA.write('3');
+        outA.write("3");
 
-        var outC = outA.beginAsync({ name: 'outC' });
-        var outD = outC.beginAsync({ name: 'outD' });
+        var outC = outA.beginAsync({ name: "outC" });
+        var outD = outC.beginAsync({ name: "outD" });
 
-        outB.write('2');
+        outB.write("2");
         outB.end();
 
-        outA.write('7');
+        outA.write("7");
 
-        outC.write('5');
+        outC.write("5");
 
-        outD.write('4');
+        outD.write("4");
         outD.end();
 
-        outC.write('6');
+        outC.write("6");
         outC.end();
 
         outA.end();
     });
 
-    it('should handle sync errors correctly', function (done) {
+    it("should handle sync errors correctly", function(done) {
         var out = new AsyncStream();
         var errors = [];
-        out.on('error', function (e) {
+        out.on("error", function(e) {
             errors.push(e);
         });
 
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.error(new Error('test'));
+        setTimeout(function() {
+            asyncOut.error(new Error("test"));
         }, 10);
-        out.write('3');
+        out.write("3");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
             expect(errors.length).to.equal(1);
-            expect(output).to.equal('13');
+            expect(output).to.equal("13");
             done();
         });
     });
 
-    it('should catch error in promise catch', function (done) {
+    it("should catch error in promise catch", function(done) {
         const out = new AsyncStream();
 
         let errors = [];
 
-        out.on('error', function (e) {
+        out.on("error", function(e) {
             errors.push(e);
         });
 
-        out.write('1');
+        out.write("1");
 
         let asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.error(new Error('test'));
+        setTimeout(function() {
+            asyncOut.error(new Error("test"));
         }, 10);
 
-        out.write('3');
+        out.write("3");
         out.end().catch(err => {
             expect(errors.length).to.equal(1);
-            expect(err).to.be.an('error');
+            expect(err).to.be.an("error");
             done();
         });
     });
 
-    it('should catch error in promise catch if `error` listener only set inside mixin', function (done) {
+    it("should catch error in promise catch if `error` listener only set inside mixin", function(done) {
         const out = new AsyncStream();
 
-        out.catch(err => {
-            expect(err).to.be.an('error');
-            expect(out.getOutput()).to.equal('1');
-            done();
-        }).then(data => {
-            throw new Error('Should not get here!');
-        });
+        out
+            .catch(err => {
+                expect(err).to.be.an("error");
+                expect(out.getOutput()).to.equal("1");
+                done();
+            })
+            .then(() => {
+                throw new Error("Should not get here!");
+            });
 
-        out.write('1');
-        out.error(new Error('test'));
-        out.write('2');
+        out.write("1");
+        out.error(new Error("test"));
+        out.write("2");
     });
 
-    it('should support chaining', function (done) {
+    it("should support chaining", function(done) {
         var errors = [];
-        var out = new AsyncStream().on('error', function (e) {
-            errors.push(e);
-        }).on('finish', function (result) {
-            var output = result.getOutput();
-            expect(errors.length).to.equal(1);
-            expect(output).to.equal('13');
-            done();
-        }).write('1');
+        var out = new AsyncStream()
+            .on("error", function(e) {
+                errors.push(e);
+            })
+            .on("finish", function(result) {
+                var output = result.getOutput();
+                expect(errors.length).to.equal(1);
+                expect(output).to.equal("13");
+                done();
+            })
+            .write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.error(new Error('test'));
+        setTimeout(function() {
+            asyncOut.error(new Error("test"));
         }, 10);
 
-        out.write('3').end();
+        out.write("3").end();
     });
 
-    it('should support writing to a through2 stream', function (done) {
-
-        var output = '';
-        var through2 = require('through2')(function write(data, encoding, callback) {
+    it("should support writing to a through2 stream", function(done) {
+        var output = "";
+        var through2 = require("through2")(function write(
+            data,
+            encoding,
+            callback
+        ) {
             output += data;
             callback(null, data);
         });
 
         var errors = [];
-        var out = createAsyncStream(through2).on('error', function (e) {
-            errors.push(e);
-        }).on('finish', function () {
-            expect(errors.length).to.equal(0);
-            expect(output).to.equal('123');
-            done();
-        }).write('1');
+        var out = createAsyncStream(through2)
+            .on("error", function(e) {
+                errors.push(e);
+            })
+            .on("finish", function() {
+                expect(errors.length).to.equal(0);
+                expect(output).to.equal("123");
+                done();
+            })
+            .write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('2');
+        setTimeout(function() {
+            asyncOut.write("2");
             asyncOut.end();
         }, 10);
 
-        out.write('3').end();
+        out.write("3").end();
     });
 
-    it('should support writing to a through stream', function (done) {
-
-        var output = '';
-        var through = require('through')(function write(data) {
+    it("should support writing to a through stream", function(done) {
+        var output = "";
+        var through = require("through")(function write(data) {
             output += data;
             this.queue(data);
         });
 
         var errors = [];
-        var out = createAsyncStream(through).on('error', function (e) {
-            errors.push(e);
-        }).on('end', function () {
-            expect(errors.length).to.equal(0);
-            expect(output).to.equal('123');
-            done();
-        }).write('1');
+        var out = createAsyncStream(through)
+            .on("error", function(e) {
+                errors.push(e);
+            })
+            .on("end", function() {
+                expect(errors.length).to.equal(0);
+                expect(output).to.equal("123");
+                done();
+            })
+            .write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('2');
+        setTimeout(function() {
+            asyncOut.write("2");
             asyncOut.end();
         }, 10);
 
-        out.write('3').end();
+        out.write("3").end();
     });
 
-    it('should support writing to a file output stream', function (done) {
-
-        var outFile = nodePath.join(__dirname, 'test.out');
+    it("should support writing to a file output stream", function(done) {
+        var outFile = nodePath.join(__dirname, "test.out");
         var out = fs.createWriteStream(outFile, fsReadOptions);
         var errors = [];
 
-        out.on('close', function () {
+        out.on("close", function() {
             var output = fs.readFileSync(outFile, fsReadOptions);
             expect(errors.length).to.equal(0);
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             fs.unlinkSync(outFile);
             done();
         });
 
-        out = createAsyncStream(out).on('error', function (e) {
-            errors.push(e);
-        }).on('finish', function () {}).write('1');
+        out = createAsyncStream(out)
+            .on("error", function(e) {
+                errors.push(e);
+            })
+            .on("finish", function() {})
+            .write("1");
 
         var asyncOut = out.beginAsync();
-        setTimeout(function () {
-            asyncOut.write('2');
+        setTimeout(function() {
+            asyncOut.write("2");
             asyncOut.end();
         }, 10);
 
-        out.write('3').end();
+        out.write("3").end();
     });
 
-    it('should support piping to an async writer', function (done) {
-
+    it("should support piping to an async writer", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
 
-        var helloReadStream = fs.createReadStream(nodePath.join(__dirname, 'fixtures/hello.txt'), fsReadOptions);
+        var helloReadStream = fs.createReadStream(
+            nodePath.join(__dirname, "fixtures/hello.txt"),
+            fsReadOptions
+        );
         helloReadStream.pipe(asyncOut);
 
-        out.write('2');
+        out.write("2");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('1Hello World2');
+            expect(output).to.equal("1Hello World2");
             done();
         });
     });
 
-    it('should support a writer being piped to another stream', function (done) {
+    it("should support a writer being piped to another stream", function(done) {
+        var through = require("through")();
+        var outStr = "";
 
-        var through = require('through')();
-        var outStr = '';
-
-        var out = require('through')(function write(str) {
+        var out = require("through")(function write(str) {
             outStr += str;
         });
 
-        through.pipe(out).on('error', function (e) {
+        through.pipe(out).on("error", function(e) {
             done(e);
         });
 
         out = createAsyncStream(through);
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync();
 
-        var helloReadStream = fs.createReadStream(nodePath.join(__dirname, 'fixtures/hello.txt'), fsReadOptions);
+        var helloReadStream = fs.createReadStream(
+            nodePath.join(__dirname, "fixtures/hello.txt"),
+            fsReadOptions
+        );
         helloReadStream.pipe(asyncOut);
 
-        out.write('2');
+        out.write("2");
 
-        out.on('end', function () {
-            expect(outStr).to.equal('1Hello World2');
+        out.on("end", function() {
+            expect(outStr).to.equal("1Hello World2");
             done();
         });
 
         out.end();
     });
 
-    it('should allow an async fragment to flush last', function (done) {
+    it("should allow an async fragment to flush last", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync({ last: true });
-        out.once('last', function () {
-            asyncOut.write('2');
+        out.once("last", function() {
+            asyncOut.write("2");
             asyncOut.end();
         });
 
-        out.write('3');
+        out.write("3");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
     });
 
-    it('should allow an async fragment to flush last asynchronously', function (done) {
+    it("should allow an async fragment to flush last asynchronously", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut = out.beginAsync({ last: true });
         var lastFiredCount = 0;
 
-        out.on('last', function () {
+        out.on("last", function() {
             lastFiredCount++;
         });
 
-        out.once('last', function () {
-            setTimeout(function () {
-                asyncOut.write('2');
+        out.once("last", function() {
+            setTimeout(function() {
+                asyncOut.write("2");
                 asyncOut.end();
             }, 10);
         });
 
-        out.write('3');
+        out.write("3");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             expect(lastFiredCount).to.equal(1);
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
     });
 
-    it('should not crash the program if the underlying stream has an error listener', function (done) {
-        var stream = require('stream');
+    it("should not crash the program if the underlying stream has an error listener", function(done) {
+        var stream = require("stream");
         var PassThrough = stream.PassThrough;
         var passthrough = new PassThrough();
 
-        passthrough.on('error', function (err) {
+        passthrough.on("error", function() {
             done();
         });
 
         var out = createAsyncStream(passthrough);
-        out.write('hello');
-        out.error('test');
+        out.write("hello");
+        out.error("test");
     });
 
-    it('should crash the program if the underlying stream does *not* have an error listener', function (done) {
-        var stream = require('stream');
+    it("should crash the program if the underlying stream does *not* have an error listener", function(done) {
+        var stream = require("stream");
         var PassThrough = stream.PassThrough;
         var passthrough = new PassThrough();
 
         var out = createAsyncStream(passthrough);
-        out.write('hello');
+        out.write("hello");
         try {
-            out.error('test');
-            done('uncaught exception expected');
+            out.error("test");
+            done("uncaught exception expected");
         } catch (e) {
             done();
         }
     });
 
-    it('should allow multiple onLast calls', function (done) {
+    it("should allow multiple onLast calls", function(done) {
         var out = new AsyncStream();
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync();
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 20);
 
@@ -541,174 +559,182 @@ describe('AsyncStream', function () {
         var onLastCount = 0;
         var lastOutput = [];
 
-        out.onLast(function (next) {
+        out.onLast(function(next) {
             onLastCount++;
-            lastOutput.push('a');
-            asyncOut2.write('3');
+            lastOutput.push("a");
+            asyncOut2.write("3");
             asyncOut2.end();
             setTimeout(next, 10);
         });
 
         var asyncOut3 = out.beginAsync({ last: true });
-        out.onLast(function (next) {
+        out.onLast(function(next) {
             onLastCount++;
-            lastOutput.push('b');
-            asyncOut3.write('4');
+            lastOutput.push("b");
+            asyncOut3.write("4");
             asyncOut3.end();
             next();
         });
 
-        out.write('5');
+        out.write("5");
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('12345');
+            expect(output).to.equal("12345");
             expect(onLastCount).to.equal(2);
-            expect(lastOutput).to.deep.equal(['a', 'b']);
+            expect(lastOutput).to.deep.equal(["a", "b"]);
             done();
         });
     });
 
-    it('should handle timeout errors correctly', function (done) {
-        var output = '';
+    it("should handle timeout errors correctly", function(done) {
+        var output = "";
         var errors = [];
 
-        var through = require('through')(function write(data) {
+        var through = require("through")(function write(data) {
             output += data;
-        }).on('error', function (err) {
-            errors.push(err);
-        }).on('end', function () {
-            expect(output).to.equal('12');
-            expect(errors.length).to.equal(1);
-            expect(errors[0].toString()).to.contain('timed out');
-            done();
-        });
+        })
+            .on("error", function(err) {
+                errors.push(err);
+            })
+            .on("end", function() {
+                expect(output).to.equal("12");
+                expect(errors.length).to.equal(1);
+                expect(errors[0].toString()).to.contain("timed out");
+                done();
+            });
 
         var out = createAsyncStream(through);
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync();
         out.beginAsync({ timeout: 50 });
 
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 100);
 
         out.end();
     });
 
-    it('should avoid writes after end (a)', function (done) {
-        var output = '';
+    it("should avoid writes after end (a)", function(done) {
+        var output = "";
         var errors = [];
         var ended = false;
 
-        var through = require('through')(function write(data) {
+        var through = require("through")(function write(data) {
             expect(ended).to.equal(false);
             output += data;
-        }).on('error', function (err) {
-            errors.push(err);
-        }).on('end', function () {
-            ended = true;
-            expect(output).to.equal('13');
-            done();
-        });
+        })
+            .on("error", function(err) {
+                errors.push(err);
+            })
+            .on("end", function() {
+                ended = true;
+                expect(output).to.equal("13");
+                done();
+            });
 
         var out = createAsyncStream(through);
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync({ timeout: 50 });
 
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 100);
 
         var asyncOut2 = out.beginAsync();
-        setTimeout(function () {
-            asyncOut2.write('3');
+        setTimeout(function() {
+            asyncOut2.write("3");
             asyncOut2.end();
         }, 50);
 
         out.end();
     });
 
-    it('should avoid writes after end (b)', function (done) {
-        var output = '';
+    it("should avoid writes after end (b)", function(done) {
+        var output = "";
         var errors = [];
         var ended = false;
 
-        var through = require('through')(function write(data) {
+        var through = require("through")(function write(data) {
             expect(ended).to.equal(false);
             output += data;
-        }).on('error', function (err) {
-            errors.push(err);
-        }).on('end', function () {
-            ended = true;
-            expect(output).to.equal('12');
-            done();
-        });
+        })
+            .on("error", function(err) {
+                errors.push(err);
+            })
+            .on("end", function() {
+                ended = true;
+                expect(output).to.equal("12");
+                done();
+            });
 
         var out = createAsyncStream(through);
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync();
 
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 75);
 
         var asyncOut2 = out.beginAsync({ timeout: 50 });
         // This async fragment will timeout but we will
         // still write to it after it ends
-        setTimeout(function () {
-            asyncOut2.write('3');
+        setTimeout(function() {
+            asyncOut2.write("3");
             asyncOut2.end();
         }, 100);
 
         out.end();
     });
 
-    it('should avoid writes after end (c)', function (done) {
-        var output = '';
+    it("should avoid writes after end (c)", function(done) {
+        var output = "";
         var errors = [];
         var ended = false;
 
-        var through = require('through')(function write(data) {
+        var through = require("through")(function write(data) {
             expect(ended).to.equal(false);
             output += data;
-        }).on('error', function (err) {
-            errors.push(err);
-        }).on('end', function () {
-            ended = true;
-            expect(output).to.equal('12');
-            expect(errors.length).to.equal(1);
-            done();
-        });
+        })
+            .on("error", function(err) {
+                errors.push(err);
+            })
+            .on("end", function() {
+                ended = true;
+                expect(output).to.equal("12");
+                expect(errors.length).to.equal(1);
+                done();
+            });
 
         var out = createAsyncStream(through);
-        out.write('1');
+        out.write("1");
 
         var asyncOut1 = out.beginAsync();
 
-        setTimeout(function () {
-            asyncOut1.write('2');
+        setTimeout(function() {
+            asyncOut1.write("2");
             asyncOut1.end();
         }, 75);
 
         var asyncOut2 = out.beginAsync();
         // This async fragment will timeout but we will
         // still write to it after it ends
-        setTimeout(function () {
-            asyncOut2.error('TEST ERROR');
+        setTimeout(function() {
+            asyncOut2.error("TEST ERROR");
             asyncOut2.end();
         }, 100);
 
         out.end();
     });
 
-    it('should track finished correctly', function (done) {
+    it("should track finished correctly", function(done) {
         var myGlobal = {};
 
         var out1 = createAsyncStream({ global: myGlobal });
@@ -720,108 +746,103 @@ describe('AsyncStream', function () {
             }
         }
 
-        out1.on('finish', function () {
+        out1.on("finish", function() {
             if (out1.data.__finishedFlag) {
-                return done(new Error('finished invoked multiple times!'));
+                return done(new Error("finished invoked multiple times!"));
             }
 
             out1.data.__finishedFlag = true;
             handleFinished();
         });
-        out2.on('finish', function () {
+        out2.on("finish", function() {
             if (out2.data.__finishedFlag) {
-                return done(new Error('finished invoked multiple times!'));
+                return done(new Error("finished invoked multiple times!"));
             }
 
             out2.data.__finishedFlag = true;
             handleFinished();
         });
 
-        out1.write('foo');
+        out1.write("foo");
         out1.end();
         out1.end();
 
-        out2.write('bar');
+        out2.write("bar");
         out2.end();
     });
 
-    it('should end correctly if top-level is ended asynchronously', function (done) {
+    it("should end correctly if top-level is ended asynchronously", function(done) {
         var out = new AsyncStream();
-        out.name = 'outer';
+        out.name = "outer";
 
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
 
-        out.write('1');
+        out.write("1");
 
-        setTimeout(function () {
-            var asyncOut = out.beginAsync({ name: 'inner' });
-            setTimeout(function () {
-                asyncOut.write('2');
+        setTimeout(function() {
+            var asyncOut = out.beginAsync({ name: "inner" });
+            setTimeout(function() {
+                asyncOut.write("2");
                 asyncOut.end();
             }, 50);
 
-            out.write('3');
+            out.write("3");
 
             out.end();
         }, 10);
     });
 
-    it('should end correctly if top-level is ended asynchronously when providing custom globals', function (done) {
-        var out = createAsyncStream({ global: { foo: 'bar' } });
-        out.name = 'outer';
+    it("should end correctly if top-level is ended asynchronously when providing custom globals", function(done) {
+        var out = createAsyncStream({ global: { foo: "bar" } });
+        out.name = "outer";
 
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var output = result.getOutput();
-            expect(output).to.equal('123');
+            expect(output).to.equal("123");
             done();
         });
 
-        out.write('1');
+        out.write("1");
 
-        setTimeout(function () {
-            var asyncOut = out.beginAsync({ name: 'inner' });
-            setTimeout(function () {
-                asyncOut.write('2');
+        setTimeout(function() {
+            var asyncOut = out.beginAsync({ name: "inner" });
+            setTimeout(function() {
+                asyncOut.write("2");
                 asyncOut.end();
             }, 50);
 
-            out.write('3');
+            out.write("3");
 
             out.end();
         }, 10);
     });
 
-    it('should support out.stream for accessing the original stream', function (done) {
-
-        var through = require('through');
-        var outStr = '';
-
-        var stream = through(function write(str) {
-            outStr += str;
-        });
+    it("should support out.stream for accessing the original stream", function(done) {
+        var through = require("through");
+        var stream = through(function write() {});
 
         var out = createAsyncStream(stream);
         expect(out.stream).to.equal(stream);
 
         var asyncOut1 = out.beginAsync();
         expect(asyncOut1.stream).to.equal(stream);
-        setTimeout(function () {
+        setTimeout(function() {
             expect(asyncOut1.stream).to.equal(stream);
             asyncOut1.end();
         }, 100);
 
         var asyncOut2 = out.beginAsync();
         expect(asyncOut2.stream).to.equal(stream);
-        setTimeout(function () {
+        setTimeout(function() {
             expect(asyncOut2.stream).to.equal(stream);
             asyncOut2.end();
         }, 50);
 
-        out.on('end', function () {
+        out.on("end", function() {
             expect(out.stream).to.equal(stream);
             expect(asyncOut1.stream).to.equal(stream);
             expect(asyncOut2.stream).to.equal(stream);
diff --git a/test/async-vdom-builder/index.test.js b/test/async-vdom-builder/index.test.js
index 29c6dcc76..2f460ddcb 100644
--- a/test/async-vdom-builder/index.test.js
+++ b/test/async-vdom-builder/index.test.js
@@ -1,7 +1,7 @@
-require('../__util__/test-init');
-var AsyncVDOMBuilder = require('marko/runtime/vdom/AsyncVDOMBuilder');
-var VElement = require('marko/runtime/vdom/VElement');
-var expect = require('chai').expect;
+require("../__util__/test-init");
+var AsyncVDOMBuilder = require("marko/runtime/vdom/AsyncVDOMBuilder");
+var VElement = require("marko/runtime/vdom/VElement");
+var expect = require("chai").expect;
 
 function getChildNodes(parentNode) {
     var childNodes = [];
@@ -14,124 +14,131 @@ function getChildNodes(parentNode) {
 
     return childNodes;
 }
-describe('AsyncVDOMBuilder', function () {
-    it('sync', function () {
+describe("AsyncVDOMBuilder", function() {
+    it("sync", function() {
         var out = new AsyncVDOMBuilder();
-        out.element('div', {}, 0);
+        out.element("div", {}, 0);
         var tree = out.___getOutput();
         expect(getChildNodes(tree).length).to.equal(1);
     });
 
-    it('end, then listen for finish', function (done) {
+    it("end, then listen for finish", function(done) {
         var out = new AsyncVDOMBuilder();
-        out.element('div', {}, 0);
+        out.element("div", {}, 0);
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             expect(getChildNodes(result.getOutput()).length).to.equal(1);
             done();
         });
     });
 
-    it('async', function (done) {
+    it("async", function(done) {
         var out = new AsyncVDOMBuilder();
-        out.element('div', {}, 0);
+        out.element("div", {}, 0);
         var asyncOut = out.beginAsync();
 
-        setTimeout(function () {
-            asyncOut.element('span', {}, 0);
+        setTimeout(function() {
+            asyncOut.element("span", {}, 0);
             asyncOut.end();
         }, 10);
 
-        out.element('section', {}, 0);
+        out.element("section", {}, 0);
 
         out.end();
-        out.on('finish', function (result) {
+        out.on("finish", function(result) {
             var tree = result.getOutput();
             expect(getChildNodes(tree).length).to.equal(3);
-            expect(tree.___firstChild.___nodeName).to.equal('div');
-            expect(tree.___firstChild.___nextSibling.___nodeName).to.equal('span');
-            expect(tree.___firstChild.___nextSibling.___nextSibling.___nodeName).to.equal('section');
+            expect(tree.___firstChild.___nodeName).to.equal("div");
+            expect(tree.___firstChild.___nextSibling.___nodeName).to.equal(
+                "span"
+            );
+            expect(
+                tree.___firstChild.___nextSibling.___nextSibling.___nodeName
+            ).to.equal("section");
             done();
         });
     });
 
-    it('promise', function (done) {
+    it("promise", function(done) {
         const out = new AsyncVDOMBuilder();
-        out.element('div', {}, 0);
-        out.end().then(result => {
-            expect(getChildNodes(result.getOutput()).length).to.equal(1);
-            done();
-        }).catch(done);
+        out.element("div", {}, 0);
+        out
+            .end()
+            .then(result => {
+                expect(getChildNodes(result.getOutput()).length).to.equal(1);
+                done();
+            })
+            .catch(done);
     });
 
-    it('async flush', function (done) {
+    it("async flush", function(done) {
         var out = new AsyncVDOMBuilder();
-        out.on('update', function (result) {
+        out.on("update", function(result) {
             expect(getChildNodes(result.getOutput()).length).to.equal(1);
         });
-        out.once('finish', function (result) {
+        out.once("finish", function(result) {
             expect(getChildNodes(result.getOutput()).length).to.equal(2);
             done();
         });
 
-        out.element('div', {}, 0);
+        out.element("div", {}, 0);
         out.flush();
 
         var asyncOut = out.beginAsync();
 
-        setTimeout(function () {
-            asyncOut.element('span', {}, 0);
+        setTimeout(function() {
+            asyncOut.element("span", {}, 0);
             asyncOut.end();
         }, 10);
 
         out.end();
     });
 
-    it('for loop', function (done) {
+    it("for loop", function(done) {
         var out = new AsyncVDOMBuilder();
-        out.once('finish', function (result) {
+        out.once("finish", function(result) {
             var tree = result.getOutput();
             var childNodes = getChildNodes(tree);
             var header = childNodes[0];
             var list = childNodes[1];
             var paragraph = childNodes[2];
-            expect(header.___nodeName).to.equal('h1');
-            expect(list.___nodeName).to.equal('ul');
+            expect(header.___nodeName).to.equal("h1");
+            expect(list.___nodeName).to.equal("ul");
             expect(getChildNodes(list).length).to.equal(10);
-            expect(paragraph.___nodeName).to.equal('p');
+            expect(paragraph.___nodeName).to.equal("p");
             done();
         });
 
-        out.element('h1', {}, 0);
+        out.element("h1", {}, 0);
 
-        out.beginElement('ul', {});
+        out.beginElement("ul", {});
 
         for (var i = 0; i < 10; i++) {
-            out.element('li', {}, 1).t(i);
+            out.element("li", {}, 1).t(i);
         }
 
         out.endElement();
 
-        out.element('p', {}, 0);
+        out.element("p", {}, 0);
 
         out.end();
     });
 
-    it('staticNode, text, comment', function (done) {
-        var staticNode = new VElement('div', {}, 0, 'f891ea3');
+    it("staticNode, text, comment", function(done) {
+        var staticNode = new VElement("div", {}, 0, "f891ea3");
         var out = new AsyncVDOMBuilder();
 
         out.node(staticNode);
-        out.text('Hello <em>World</em>');
-        out.comment('TODO: make this work');
+        out.text("Hello <em>World</em>");
+        out.comment("TODO: make this work");
         out.end();
 
-        out.once('finish', function (result) {
+        out.once("finish", function(result) {
             var tree = result.getOutput();
             var childNodes = getChildNodes(tree);
-            expect(childNodes[0].___nodeName).to.equal('div');
-            expect(childNodes[1].___nodeValue).to.equal('Hello <em>World</em>');
-            expect(childNodes[2].___nodeValue).to.equal('TODO: make this work');
+            expect(childNodes[0].___nodeName).to.equal("div");
+            expect(childNodes[1].___nodeValue).to.equal("Hello <em>World</em>");
+            expect(childNodes[2].___nodeValue).to.equal("TODO: make this work");
             done();
         });
     });
diff --git a/test/autotest.js b/test/autotest.js
index da6225a37..3df530944 100644
--- a/test/autotest.js
+++ b/test/autotest.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var fs = require('fs');
+var fs = require("fs");
 var enabledTest = process.env.TEST;
-var updateExpectations = process.env.hasOwnProperty('UPDATE_EXPECTATIONS');
-var path = require('path');
-var assert = require('assert');
-const projectRoot = path.join(__dirname, '..');
+var updateExpectations = process.env.hasOwnProperty("UPDATE_EXPECTATIONS");
+var path = require("path");
+var assert = require("assert");
+const projectRoot = path.join(__dirname, "..");
 
 var enabledTestNames = enabledTest && enabledTest.split(/[\s*,\s*/]/);
 var enabledTests = null;
@@ -13,7 +13,7 @@ var enabledTests = null;
 if (enabledTestNames && enabledTestNames.length > 0) {
     enabledTests = {};
     enabledTest = null;
-    enabledTestNames.forEach((testName) => {
+    enabledTestNames.forEach(testName => {
         enabledTests[testName] = true;
     });
 }
@@ -23,46 +23,50 @@ function replaceAll(str, substr, replacement) {
 }
 
 function normalize(str) {
-    if (typeof str === 'string') {
-        return replaceAll(str, projectRoot, 'PROJECT_ROOT');
+    if (typeof str === "string") {
+        return replaceAll(str, projectRoot, "PROJECT_ROOT");
     }
     return str;
 }
 
 function compareHelper(dir, actual, prefix, suffix, format) {
-    var actualPath = path.join(dir, prefix + 'actual' + suffix);
-    var expectedPath = path.join(dir, prefix + 'expected' + suffix);
+    var actualPath = path.join(dir, prefix + "actual" + suffix);
+    var expectedPath = path.join(dir, prefix + "expected" + suffix);
 
     actual = normalize(actual);
     format = format || (contents => contents);
 
-    var isObject = typeof actual === 'string' ? false : true;
+    var isObject = typeof actual === "string" ? false : true;
     var actualString = isObject ? JSON.stringify(actual, null, 4) : actual;
-    fs.writeFileSync(actualPath, actualString, { encoding: 'utf8' });
+    fs.writeFileSync(actualPath, actualString, { encoding: "utf8" });
 
     var expectedString;
 
     try {
-        expectedString = fs.readFileSync(expectedPath, { encoding: 'utf8' });
-    } catch(e) {
-        expectedString = isObject ? '"TBD"' : 'TBD';
-        fs.writeFileSync(expectedPath, expectedString, {encoding: 'utf8'});
+        expectedString = fs.readFileSync(expectedPath, { encoding: "utf8" });
+    } catch (e) {
+        expectedString = isObject ? '"TBD"' : "TBD";
+        fs.writeFileSync(expectedPath, expectedString, { encoding: "utf8" });
     }
 
-    actual = isObject ? JSON.parse(actualString) : actualString.replace(/\r?\n$/, '');
+    actual = isObject
+        ? JSON.parse(actualString)
+        : actualString.replace(/\r?\n$/, "");
 
-    if (typeof actual === 'string') {
-        actual = replaceAll(actual, projectRoot, 'PROJECT_ROOT');
+    if (typeof actual === "string") {
+        actual = replaceAll(actual, projectRoot, "PROJECT_ROOT");
     }
 
-    var expected = isObject ? JSON.parse(expectedString) : expectedString.replace(/\r?\n$/, '');
+    var expected = isObject
+        ? JSON.parse(expectedString)
+        : expectedString.replace(/\r?\n$/, "");
     var formattedActual = format(actual);
     var formattedExpected = format(expected);
     try {
         assert.deepEqual(formattedActual, formattedExpected);
-    } catch(e) {
+    } catch (e) {
         if (updateExpectations) {
-            fs.writeFileSync(expectedPath, actualString, { encoding: 'utf8' });
+            fs.writeFileSync(expectedPath, actualString, { encoding: "utf8" });
         } else {
             throw e;
         }
@@ -76,7 +80,7 @@ function autoTest(name, dir, run, options, done) {
 
     var helpers = {
         compareSequence(actual, prefix, suffix) {
-            if (typeof prefix === 'object') {
+            if (typeof prefix === "object") {
                 var options = prefix;
                 prefix = options.prefix;
                 suffix = options.suffix;
@@ -84,14 +88,14 @@ function autoTest(name, dir, run, options, done) {
                 suffix = prefix;
                 prefix = null;
             } else if (arguments.length === 1) {
-                suffix = '.html';
+                suffix = ".html";
                 prefix = null;
             }
 
-            prefix = prefix || '';
-            suffix = suffix || '';
+            prefix = prefix || "";
+            suffix = suffix || "";
 
-            let sequenceKey = prefix + '|' + suffix;
+            let sequenceKey = prefix + "|" + suffix;
 
             let sequence = compareSequenceLookup[sequenceKey];
             if (sequence === undefined) {
@@ -101,13 +105,13 @@ function autoTest(name, dir, run, options, done) {
                 compareSequenceLookup[sequenceKey]++;
             }
 
-            suffix = '.' + sequence + suffix;
+            suffix = "." + sequence + suffix;
 
             compareHelper(dir, actual, prefix, suffix);
         },
 
         compare(actual, prefix, suffix, format) {
-            if (typeof prefix === 'object') {
+            if (typeof prefix === "object") {
                 var options = prefix;
                 prefix = options.prefix;
                 suffix = options.suffix;
@@ -115,20 +119,20 @@ function autoTest(name, dir, run, options, done) {
                 suffix = prefix;
                 prefix = null;
             } else if (arguments.length === 1) {
-                suffix = '.html';
+                suffix = ".html";
                 prefix = null;
             }
 
-            prefix = prefix || '';
-            suffix = suffix || '';
+            prefix = prefix || "";
+            suffix = suffix || "";
 
-            let sequenceKey = prefix + '|' + suffix;
+            let sequenceKey = prefix + "|" + suffix;
 
             let sequence = compareSequenceLookup[sequenceKey];
             if (sequence === undefined) {
                 compareSequenceLookup[sequenceKey] = 2;
             } else {
-                suffix = '.' + sequence + suffix;
+                suffix = "." + sequence + suffix;
                 compareSequenceLookup[sequenceKey]++;
             }
 
@@ -144,51 +148,64 @@ exports.scanDir = function(autoTestDir, run, options) {
     var testGroup = path.basename(autoTestDir);
     var describeFunc = describe;
 
-    if(enabledTest && testGroup === enabledTest) {
+    if (enabledTest && testGroup === enabledTest) {
         describeFunc = describe.only;
     }
 
-    describeFunc('', function() {
-        if(options.timeout) {
+    describeFunc("", function() {
+        if (options.timeout) {
             this.timeout(options.timeout);
         }
-        fs.readdirSync(autoTestDir)
-            .forEach(function(name) {
-                if (/^(\.|\~)/.test(name)) {
-                    return;
-                }
+        fs.readdirSync(autoTestDir).forEach(function(name) {
+            if (/^(\.|~)/.test(name)) {
+                return;
+            }
 
-                if (enabledTests && !enabledTests[name] && !enabledTests[testGroup] && !enabledTests[testGroup+'/'+name]) {
-                    return;
-                }
+            if (
+                enabledTests &&
+                !enabledTests[name] &&
+                !enabledTests[testGroup] &&
+                !enabledTests[testGroup + "/" + name]
+            ) {
+                return;
+            }
 
-                var testFunc = options.type === 'describe' ? describe : it;
-                var dir = path.join(autoTestDir, name);
-                var meta = {};
+            var testFunc = options.type === "describe" ? describe : it;
+            var dir = path.join(autoTestDir, name);
+            var meta = {};
 
-                if (enabledTest && (name === enabledTest || testGroup+'/'+name === enabledTest)) {
-                    testFunc = testFunc.only;
-                }
+            if (
+                enabledTest &&
+                (name === enabledTest || testGroup + "/" + name === enabledTest)
+            ) {
+                testFunc = testFunc.only;
+            }
 
-                var skipReason = options.skip && options.skip(name, dir);
-                if (name.endsWith('.skip') || skipReason) {
-                    testFunc = testFunc.skip;
-                    meta.details = typeof skipReason === 'string' ? skipReason : 'Pending';
-                }
+            var skipReason = options.skip && options.skip(name, dir);
+            if (name.endsWith(".skip") || skipReason) {
+                testFunc = testFunc.skip;
+                meta.details =
+                    typeof skipReason === "string" ? skipReason : "Pending";
+            }
 
-                if (name.endsWith('.fails') || options.fails && options.fails(name, dir)) {
-                    testFunc = testFunc.fails;
-                }
+            if (
+                name.endsWith(".fails") ||
+                (options.fails && options.fails(name, dir))
+            ) {
+                testFunc = testFunc.fails;
+            }
 
-                if (options.file) {
-                    meta.file = options.file(name, dir);
-                }
+            if (options.file) {
+                meta.file = options.file(name, dir);
+            }
 
-                var test = testFunc(options.name !== false ? name : '', function(done) {
-                    autoTest(name, dir, run, options, done);
-                });
-
-                Object.assign(test, meta);
+            var test = testFunc(options.name !== false ? name : "", function(
+                done
+            ) {
+                autoTest(name, dir, run, options, done);
             });
+
+            Object.assign(test, meta);
+        });
     });
 };
diff --git a/test/codegen/fixtures/arrayExpression-empty/index.js b/test/codegen/fixtures/arrayExpression-empty/index.js
index 1b063115d..3ff4eea5f 100644
--- a/test/codegen/fixtures/arrayExpression-empty/index.js
+++ b/test/codegen/fixtures/arrayExpression-empty/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     return builder.arrayExpression([]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/arrayExpression/index.js b/test/codegen/fixtures/arrayExpression/index.js
index 5e17190f0..6d4067592 100644
--- a/test/codegen/fixtures/arrayExpression/index.js
+++ b/test/codegen/fixtures/arrayExpression/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.arrayExpression([builder.literal('hello'), builder.literal('world')]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.arrayExpression([
+        builder.literal("hello"),
+        builder.literal("world")
+    ]);
+};
diff --git a/test/codegen/fixtures/attr-no-escape/index.js b/test/codegen/fixtures/attr-no-escape/index.js
index a8eceeb24..351ff7aaf 100644
--- a/test/codegen/fixtures/attr-no-escape/index.js
+++ b/test/codegen/fixtures/attr-no-escape/index.js
@@ -1,11 +1,20 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var htmlElement = builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.concat(builder.literal('foo'), builder.identifier('className')),
-        escape: false
-    }], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var htmlElement = builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.concat(
+                    builder.literal("foo"),
+                    builder.identifier("className")
+                ),
+                escape: false
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
 
     return htmlElement;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/binaryExpression-literal-divide/index.js b/test/codegen/fixtures/binaryExpression-literal-divide/index.js
index c13c75cc8..bc2343812 100644
--- a/test/codegen/fixtures/binaryExpression-literal-divide/index.js
+++ b/test/codegen/fixtures/binaryExpression-literal-divide/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.binaryExpression(builder.literal(10), '/', builder.literal(2));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.binaryExpression(
+        builder.literal(10),
+        "/",
+        builder.literal(2)
+    );
+};
diff --git a/test/codegen/fixtures/binaryExpression-literal-multiply/index.js b/test/codegen/fixtures/binaryExpression-literal-multiply/index.js
index 694788681..b09ea04aa 100644
--- a/test/codegen/fixtures/binaryExpression-literal-multiply/index.js
+++ b/test/codegen/fixtures/binaryExpression-literal-multiply/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.binaryExpression(builder.literal(2), '*', builder.literal(5));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.binaryExpression(
+        builder.literal(2),
+        "*",
+        builder.literal(5)
+    );
+};
diff --git a/test/codegen/fixtures/binaryExpression-literal-subtract/index.js b/test/codegen/fixtures/binaryExpression-literal-subtract/index.js
index 8e4b146e4..aab5ba6ad 100644
--- a/test/codegen/fixtures/binaryExpression-literal-subtract/index.js
+++ b/test/codegen/fixtures/binaryExpression-literal-subtract/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.binaryExpression(builder.literal(5), '-', builder.literal(1));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.binaryExpression(
+        builder.literal(5),
+        "-",
+        builder.literal(1)
+    );
+};
diff --git a/test/codegen/fixtures/binaryExpression/index.js b/test/codegen/fixtures/binaryExpression/index.js
index 91486da68..6dd2d0306 100644
--- a/test/codegen/fixtures/binaryExpression/index.js
+++ b/test/codegen/fixtures/binaryExpression/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.binaryExpression(builder.identifier('foo'), '/', builder.literal(2));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.binaryExpression(
+        builder.identifier("foo"),
+        "/",
+        builder.literal(2)
+    );
+};
diff --git a/test/codegen/fixtures/block-comment/index.js b/test/codegen/fixtures/block-comment/index.js
index 03a4fede8..ffa0e559c 100644
--- a/test/codegen/fixtures/block-comment/index.js
+++ b/test/codegen/fixtures/block-comment/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.comment('This is a comment\non multiple lines');
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.comment("This is a comment\non multiple lines");
+};
diff --git a/test/codegen/fixtures/body-only-if/index.js b/test/codegen/fixtures/body-only-if/index.js
index 829f09ea9..f16b5121a 100644
--- a/test/codegen/fixtures/body-only-if/index.js
+++ b/test/codegen/fixtures/body-only-if/index.js
@@ -1,11 +1,15 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var anchor = builder.htmlElement('a', {
-        href: 'data.url'
-    }, [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var anchor = builder.htmlElement(
+        "a",
+        {
+            href: "data.url"
+        },
+        [builder.text(builder.literal("Hello World"))]
+    );
 
-    anchor.setBodyOnlyIf('!data.url');
+    anchor.setBodyOnlyIf("!data.url");
 
     return builder.ifStatement(builder.literal(true), [anchor]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/code-before-after-if/index.js b/test/codegen/fixtures/code-before-after-if/index.js
index ccc939739..f5f9ce93e 100644
--- a/test/codegen/fixtures/code-before-after-if/index.js
+++ b/test/codegen/fixtures/code-before-after-if/index.js
@@ -1,20 +1,26 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var htmlElement = builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var htmlElement = builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
 
     htmlElement.onBeforeGenerateCode(event => {
-        event.insertCode(builder.functionCall('before', []));
+        event.insertCode(builder.functionCall("before", []));
     });
 
     htmlElement.onAfterGenerateCode(event => {
-        event.insertCode(builder.functionCall('after', []));
+        event.insertCode(builder.functionCall("after", []));
     });
 
-    var ifStatement = builder.ifStatement('a > b', [htmlElement]);
+    var ifStatement = builder.ifStatement("a > b", [htmlElement]);
 
     return ifStatement;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/code-before-after-surrounded/index.js b/test/codegen/fixtures/code-before-after-surrounded/index.js
index 86e508526..964dec35e 100644
--- a/test/codegen/fixtures/code-before-after-surrounded/index.js
+++ b/test/codegen/fixtures/code-before-after-surrounded/index.js
@@ -1,17 +1,21 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var vars = builder.vars(['foo']);
+module.exports = function(builder) {
+    var vars = builder.vars(["foo"]);
 
     vars.onBeforeGenerateCode(event => {
-        event.insertCode(builder.functionCall('before', []));
+        event.insertCode(builder.functionCall("before", []));
     });
 
     vars.onAfterGenerateCode(event => {
-        event.insertCode(builder.functionCall('after', []));
+        event.insertCode(builder.functionCall("after", []));
     });
 
-    var ifStatement = builder.ifStatement('a > b', [builder.vars(['before']), vars, builder.vars(['after'])]);
+    var ifStatement = builder.ifStatement("a > b", [
+        builder.vars(["before"]),
+        vars,
+        builder.vars(["after"])
+    ]);
 
     return ifStatement;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/code-before-after-var/index.js b/test/codegen/fixtures/code-before-after-var/index.js
index bf2cd46f7..505189c29 100644
--- a/test/codegen/fixtures/code-before-after-var/index.js
+++ b/test/codegen/fixtures/code-before-after-var/index.js
@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var vars = builder.vars(['foo']);
+module.exports = function(builder) {
+    var vars = builder.vars(["foo"]);
 
     vars.onBeforeGenerateCode(event => {
-        event.insertCode(builder.functionCall('before', []));
+        event.insertCode(builder.functionCall("before", []));
     });
 
     vars.onAfterGenerateCode(event => {
-        event.insertCode(builder.functionCall('after', []));
+        event.insertCode(builder.functionCall("after", []));
     });
 
-    var ifStatement = builder.ifStatement('a > b', [vars]);
+    var ifStatement = builder.ifStatement("a > b", [vars]);
 
     return ifStatement;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/code-before-after/index.js b/test/codegen/fixtures/code-before-after/index.js
index 1f79007c9..27a702b77 100644
--- a/test/codegen/fixtures/code-before-after/index.js
+++ b/test/codegen/fixtures/code-before-after/index.js
@@ -1,18 +1,24 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var htmlElement = builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var htmlElement = builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
 
     htmlElement.onBeforeGenerateCode(event => {
-        event.insertCode(builder.functionCall('before', []));
+        event.insertCode(builder.functionCall("before", []));
     });
 
     htmlElement.onAfterGenerateCode(event => {
-        event.insertCode(builder.functionCall('after', []));
+        event.insertCode(builder.functionCall("after", []));
     });
 
     return builder.program([htmlElement]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/code-expression/index.js b/test/codegen/fixtures/code-expression/index.js
index 3fe6f6806..911b624b5 100644
--- a/test/codegen/fixtures/code-expression/index.js
+++ b/test/codegen/fixtures/code-expression/index.js
@@ -1,11 +1,14 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var ifStatement = builder.ifStatement;
-    var strictEquality = builder.strictEquality;
     var assignment = builder.assignment;
     var literal = builder.literal;
 
-    return program([ifStatement(builder.code('a === b'), [assignment('foo', literal('bar'))])]);
-};
\ No newline at end of file
+    return program([
+        ifStatement(builder.code("a === b"), [
+            assignment("foo", literal("bar"))
+        ])
+    ]);
+};
diff --git a/test/codegen/fixtures/code-statement-nested/index.js b/test/codegen/fixtures/code-statement-nested/index.js
index 61998a876..d2e06cefe 100644
--- a/test/codegen/fixtures/code-statement-nested/index.js
+++ b/test/codegen/fixtures/code-statement-nested/index.js
@@ -1,5 +1,10 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.ifStatement(builder.literal(true), [builder.code('var a = 1;\nvar b = 2;'), builder.assignment(builder.identifier('b'), builder.literal(3))])]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.ifStatement(builder.literal(true), [
+            builder.code("var a = 1;\nvar b = 2;"),
+            builder.assignment(builder.identifier("b"), builder.literal(3))
+        ])
+    ]);
+};
diff --git a/test/codegen/fixtures/code-statement/index.js b/test/codegen/fixtures/code-statement/index.js
index 22948f195..67147ebed 100644
--- a/test/codegen/fixtures/code-statement/index.js
+++ b/test/codegen/fixtures/code-statement/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.code('var a = 1;\nvar b = 2;'), builder.assignment(builder.identifier('b'), builder.literal(3))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.code("var a = 1;\nvar b = 2;"),
+        builder.assignment(builder.identifier("b"), builder.literal(3))
+    ]);
+};
diff --git a/test/codegen/fixtures/codegen-addStaticVar/index.js b/test/codegen/fixtures/codegen-addStaticVar/index.js
index 5b5c7a8f9..eddb3ccda 100644
--- a/test/codegen/fixtures/codegen-addStaticVar/index.js
+++ b/test/codegen/fixtures/codegen-addStaticVar/index.js
@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
-
-    codegen.addStaticVar('foo', builder.literal('Hello World'));
+    codegen.addStaticVar("foo", builder.literal("Hello World"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/codegen-addVar/index.js b/test/codegen/fixtures/codegen-addVar/index.js
index b03dba690..cb0f811e3 100644
--- a/test/codegen/fixtures/codegen-addVar/index.js
+++ b/test/codegen/fixtures/codegen-addVar/index.js
@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
-
-    codegen.addVar('foo', builder.literal('Hello World'));
+    codegen.addVar("foo", builder.literal("Hello World"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/combine-writes/index.js b/test/codegen/fixtures/combine-writes/index.js
index a55a82ac0..a3dca1122 100644
--- a/test/codegen/fixtures/combine-writes/index.js
+++ b/test/codegen/fixtures/combine-writes/index.js
@@ -1,11 +1,30 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var functionDeclaration = builder.functionDeclaration;
     var functionCall = builder.functionCall;
     var text = builder.text;
     var htmlElement = builder.htmlElement;
 
-    return program([htmlElement('ul', [], [functionCall('forEach', ['data.colors', functionDeclaration(null, ['color'], [functionCall('foo'), htmlElement('li', [], [text('color')]), functionCall('bar')])])])]);
-};
\ No newline at end of file
+    return program([
+        htmlElement(
+            "ul",
+            [],
+            [
+                functionCall("forEach", [
+                    "data.colors",
+                    functionDeclaration(
+                        null,
+                        ["color"],
+                        [
+                            functionCall("foo"),
+                            htmlElement("li", [], [text("color")]),
+                            functionCall("bar")
+                        ]
+                    )
+                ])
+            ]
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/comment/index.js b/test/codegen/fixtures/comment/index.js
index 5a42dcefd..1c02edefe 100644
--- a/test/codegen/fixtures/comment/index.js
+++ b/test/codegen/fixtures/comment/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.comment('This is a comment');
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.comment("This is a comment");
+};
diff --git a/test/codegen/fixtures/concat-four/index.js b/test/codegen/fixtures/concat-four/index.js
index 1b26d9734..df4bbf886 100644
--- a/test/codegen/fixtures/concat-four/index.js
+++ b/test/codegen/fixtures/concat-four/index.js
@@ -1,5 +1,10 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.concat(builder.identifier('a'), builder.identifier('b'), builder.identifier('c'), builder.identifier('d'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.concat(
+        builder.identifier("a"),
+        builder.identifier("b"),
+        builder.identifier("c"),
+        builder.identifier("d")
+    );
+};
diff --git a/test/codegen/fixtures/concat-strings/index.js b/test/codegen/fixtures/concat-strings/index.js
index 9315fc661..c03d0ab13 100644
--- a/test/codegen/fixtures/concat-strings/index.js
+++ b/test/codegen/fixtures/concat-strings/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.concat(builder.literal('a'), builder.literal('b'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.concat(builder.literal("a"), builder.literal("b"));
+};
diff --git a/test/codegen/fixtures/concat-three/index.js b/test/codegen/fixtures/concat-three/index.js
index 60ef7caad..4ef473b83 100644
--- a/test/codegen/fixtures/concat-three/index.js
+++ b/test/codegen/fixtures/concat-three/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.concat(builder.identifier('a'), builder.identifier('b'), builder.identifier('c'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.concat(
+        builder.identifier("a"),
+        builder.identifier("b"),
+        builder.identifier("c")
+    );
+};
diff --git a/test/codegen/fixtures/concat/index.js b/test/codegen/fixtures/concat/index.js
index 18151b88b..d04a9d869 100644
--- a/test/codegen/fixtures/concat/index.js
+++ b/test/codegen/fixtures/concat/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.concat(builder.identifier('a'), builder.identifier('b'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.concat(builder.identifier("a"), builder.identifier("b"));
+};
diff --git a/test/codegen/fixtures/conditionalExpression/index.js b/test/codegen/fixtures/conditionalExpression/index.js
index 9f3be9051..78c2df52c 100644
--- a/test/codegen/fixtures/conditionalExpression/index.js
+++ b/test/codegen/fixtures/conditionalExpression/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.conditionalExpression(builder.identifier('isHidden'), builder.literal('hidden'), builder.literal('visible'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.conditionalExpression(
+        builder.identifier("isHidden"),
+        builder.literal("hidden"),
+        builder.literal("visible")
+    );
+};
diff --git a/test/codegen/fixtures/container-codegen/index.js b/test/codegen/fixtures/container-codegen/index.js
index 45fe9a514..2f101db1e 100644
--- a/test/codegen/fixtures/container-codegen/index.js
+++ b/test/codegen/fixtures/container-codegen/index.js
@@ -1,12 +1,18 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var containerNode = builder.containerNode('Test', function (node, codegen) {
-        return builder.htmlElement('div', [{
-            name: 'class',
-            value: builder.literal('greeting')
-        }], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var containerNode = builder.containerNode("Test", function() {
+        return builder.htmlElement(
+            "div",
+            [
+                {
+                    name: "class",
+                    value: builder.literal("greeting")
+                }
+            ],
+            [builder.text(builder.literal("Hello World"))]
+        );
     });
 
     return containerNode;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/container/index.js b/test/codegen/fixtures/container/index.js
index 56be7feaf..66eef2878 100644
--- a/test/codegen/fixtures/container/index.js
+++ b/test/codegen/fixtures/container/index.js
@@ -1,12 +1,20 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var containerNode = builder.containerNode('Test');
+module.exports = function(builder) {
+    var containerNode = builder.containerNode("Test");
 
-    containerNode.appendChild(builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [builder.text(builder.literal('Hello World'))]));
+    containerNode.appendChild(
+        builder.htmlElement(
+            "div",
+            [
+                {
+                    name: "class",
+                    value: builder.literal("greeting")
+                }
+            ],
+            [builder.text(builder.literal("Hello World"))]
+        )
+    );
 
     return containerNode;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/context-addStaticVar-dedupe/index.js b/test/codegen/fixtures/context-addStaticVar-dedupe/index.js
index 5938ad2c6..84a724876 100644
--- a/test/codegen/fixtures/context-addStaticVar-dedupe/index.js
+++ b/test/codegen/fixtures/context-addStaticVar-dedupe/index.js
@@ -1,11 +1,10 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
-
-    codegen.context.addStaticVar('foo', builder.literal('Hello World'));
-    codegen.context.addStaticVar('foo', builder.literal('Hello World'));
+    codegen.context.addStaticVar("foo", builder.literal("Hello World"));
+    codegen.context.addStaticVar("foo", builder.literal("Hello World"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/context-addStaticVar/index.js b/test/codegen/fixtures/context-addStaticVar/index.js
index 30a1ad2fc..205538931 100644
--- a/test/codegen/fixtures/context-addStaticVar/index.js
+++ b/test/codegen/fixtures/context-addStaticVar/index.js
@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
-
-    codegen.context.addStaticVar('foo', builder.literal('Hello World'));
+    codegen.context.addStaticVar("foo", builder.literal("Hello World"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/context-addVar-addStaticVar/index.js b/test/codegen/fixtures/context-addVar-addStaticVar/index.js
index c7004f94d..1bfea41c3 100644
--- a/test/codegen/fixtures/context-addVar-addStaticVar/index.js
+++ b/test/codegen/fixtures/context-addVar-addStaticVar/index.js
@@ -1,14 +1,13 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
+    codegen.context.addVar("foo", builder.literal("Hello Foo"));
+    codegen.context.addVar("bar", builder.literal("Hello Bar"));
 
-    codegen.context.addVar('foo', builder.literal('Hello Foo'));
-    codegen.context.addVar('bar', builder.literal('Hello Bar'));
-
-    codegen.context.addStaticVar('fooStatic', builder.literal('Hello Foo'));
-    codegen.context.addStaticVar('barStatic', builder.literal('Hello Bar'));
+    codegen.context.addStaticVar("fooStatic", builder.literal("Hello Foo"));
+    codegen.context.addStaticVar("barStatic", builder.literal("Hello Bar"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/context-addVar/index.js b/test/codegen/fixtures/context-addVar/index.js
index d6e9992d4..c58cd6a6f 100644
--- a/test/codegen/fixtures/context-addVar/index.js
+++ b/test/codegen/fixtures/context-addVar/index.js
@@ -1,10 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
-
-    codegen.context.addVar('foo', builder.literal('Hello World'));
+    codegen.context.addVar("foo", builder.literal("Hello World"));
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/forEach/index.js b/test/codegen/fixtures/forEach/index.js
index ac7032aea..5e1e0e760 100644
--- a/test/codegen/fixtures/forEach/index.js
+++ b/test/codegen/fixtures/forEach/index.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var templateRoot = builder.templateRoot;
     var forEach = builder.forEach;
     var text = builder.text;
 
-    return templateRoot([forEach('color', 'data.colors', [text('color')])]);
-};
\ No newline at end of file
+    return templateRoot([forEach("color", "data.colors", [text("color")])]);
+};
diff --git a/test/codegen/fixtures/forEachProps/index.js b/test/codegen/fixtures/forEachProps/index.js
index 020a49349..0ea99a061 100644
--- a/test/codegen/fixtures/forEachProps/index.js
+++ b/test/codegen/fixtures/forEachProps/index.js
@@ -1,12 +1,21 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var templateRoot = builder.templateRoot;
 
-    return templateRoot([builder.forEachProp({
-        nameVarName: 'k',
-        valueVarName: 'v',
-        in: 'myObject',
-        body: [builder.functionCall('console.log', [builder.literal('k:'), builder.identifier('k'), builder.literal('v:'), builder.identifier('v')])]
-    })]);
-};
\ No newline at end of file
+    return templateRoot([
+        builder.forEachProp({
+            nameVarName: "k",
+            valueVarName: "v",
+            in: "myObject",
+            body: [
+                builder.functionCall("console.log", [
+                    builder.literal("k:"),
+                    builder.identifier("k"),
+                    builder.literal("v:"),
+                    builder.identifier("v")
+                ])
+            ]
+        })
+    ]);
+};
diff --git a/test/codegen/fixtures/forRange/index.js b/test/codegen/fixtures/forRange/index.js
index b54021d61..6b1e5dd3d 100644
--- a/test/codegen/fixtures/forRange/index.js
+++ b/test/codegen/fixtures/forRange/index.js
@@ -1,13 +1,17 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
 
-    return program([builder.forRange({
-        varName: 'i',
-        from: builder.literal(0),
-        to: 'myArray.length',
-        step: builder.literal(2),
-        body: [builder.functionCall('console.log', [builder.identifier('i')])]
-    })]);
-};
\ No newline at end of file
+    return program([
+        builder.forRange({
+            varName: "i",
+            from: builder.literal(0),
+            to: "myArray.length",
+            step: builder.literal(2),
+            body: [
+                builder.functionCall("console.log", [builder.identifier("i")])
+            ]
+        })
+    ]);
+};
diff --git a/test/codegen/fixtures/forStatement/index.js b/test/codegen/fixtures/forStatement/index.js
index 1e079999b..6bc3fff71 100644
--- a/test/codegen/fixtures/forStatement/index.js
+++ b/test/codegen/fixtures/forStatement/index.js
@@ -1,9 +1,15 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-
-    return builder.forStatement(builder.vars([{
-        id: 'i',
-        init: builder.literal(0)
-    }]), builder.binaryExpression('i', '<', builder.literal(0)), builder.updateExpression('i', '++'), [builder.functionCall('console.log', [builder.identifier('i')])]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.forStatement(
+        builder.vars([
+            {
+                id: "i",
+                init: builder.literal(0)
+            }
+        ]),
+        builder.binaryExpression("i", "<", builder.literal(0)),
+        builder.updateExpression("i", "++"),
+        [builder.functionCall("console.log", [builder.identifier("i")])]
+    );
+};
diff --git a/test/codegen/fixtures/functionCall/index.js b/test/codegen/fixtures/functionCall/index.js
index 4979651ba..deec0fa1e 100644
--- a/test/codegen/fixtures/functionCall/index.js
+++ b/test/codegen/fixtures/functionCall/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.functionCall('console.log', [builder.literal('Hello'), builder.identifier('name')]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.functionCall("console.log", [
+        builder.literal("Hello"),
+        builder.identifier("name")
+    ]);
+};
diff --git a/test/codegen/fixtures/functionDeclaration-anonymous/index.js b/test/codegen/fixtures/functionDeclaration-anonymous/index.js
index cf6fe5afd..b90635444 100644
--- a/test/codegen/fixtures/functionDeclaration-anonymous/index.js
+++ b/test/codegen/fixtures/functionDeclaration-anonymous/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.functionDeclaration(null, ['num1', 'num2'], [builder.returnStatement(builder.binaryExpression('num1', '+', 'num2'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.functionDeclaration(
+        null,
+        ["num1", "num2"],
+        [builder.returnStatement(builder.binaryExpression("num1", "+", "num2"))]
+    );
+};
diff --git a/test/codegen/fixtures/functionDeclaration/index.js b/test/codegen/fixtures/functionDeclaration/index.js
index 56562fbe8..15108a79c 100644
--- a/test/codegen/fixtures/functionDeclaration/index.js
+++ b/test/codegen/fixtures/functionDeclaration/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.functionDeclaration('add', ['num1', 'num2'], [builder.returnStatement(builder.binaryExpression('num1', '+', 'num2'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.functionDeclaration(
+        "add",
+        ["num1", "num2"],
+        [builder.returnStatement(builder.binaryExpression("num1", "+", "num2"))]
+    );
+};
diff --git a/test/codegen/fixtures/html/index.js b/test/codegen/fixtures/html/index.js
index eed46cf69..25810bdb0 100644
--- a/test/codegen/fixtures/html/index.js
+++ b/test/codegen/fixtures/html/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.html(builder.literal('<div>Hello World</div>'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.html(builder.literal("<div>Hello World</div>"));
+};
diff --git a/test/codegen/fixtures/htmlComment/index.js b/test/codegen/fixtures/htmlComment/index.js
index 614e0584f..fe73d7f72 100644
--- a/test/codegen/fixtures/htmlComment/index.js
+++ b/test/codegen/fixtures/htmlComment/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.htmlComment(builder.literal('This is an HTML comment'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.htmlComment(builder.literal("This is an HTML comment"));
+};
diff --git a/test/codegen/fixtures/htmlElement-addAttribute/index.js b/test/codegen/fixtures/htmlElement-addAttribute/index.js
index ff26f3105..c4b5ae3d4 100644
--- a/test/codegen/fixtures/htmlElement-addAttribute/index.js
+++ b/test/codegen/fixtures/htmlElement-addAttribute/index.js
@@ -1,13 +1,20 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var htmlElement = builder.htmlElement('div', [], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var htmlElement = builder.htmlElement(
+        "div",
+        [],
+        [builder.text(builder.literal("Hello World"))]
+    );
 
     htmlElement.addAttribute({
-        name: 'class',
-        value: builder.concat(builder.literal('foo'), builder.identifier('className')),
+        name: "class",
+        value: builder.concat(
+            builder.literal("foo"),
+            builder.identifier("className")
+        ),
         escape: false
     });
 
     return htmlElement;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/htmlElement-attr-escape/index.js b/test/codegen/fixtures/htmlElement-attr-escape/index.js
index 7271fb98d..51f74b06b 100644
--- a/test/codegen/fixtures/htmlElement-attr-escape/index.js
+++ b/test/codegen/fixtures/htmlElement-attr-escape/index.js
@@ -1,11 +1,18 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }, {
-        name: 'foo',
-        value: builder.identifier('bar')
-    }], [builder.text(builder.literal('Hello World'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            },
+            {
+                name: "foo",
+                value: builder.identifier("bar")
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
+};
diff --git a/test/codegen/fixtures/htmlElement-dynamic/index.js b/test/codegen/fixtures/htmlElement-dynamic/index.js
index 55c85a861..a6ceb8726 100644
--- a/test/codegen/fixtures/htmlElement-dynamic/index.js
+++ b/test/codegen/fixtures/htmlElement-dynamic/index.js
@@ -1,8 +1,14 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.htmlElement(builder.memberExpression('data', 'tagName'), [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [builder.text(builder.literal('Hello World'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.htmlElement(
+        builder.memberExpression("data", "tagName"),
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
+};
diff --git a/test/codegen/fixtures/htmlElement/index.js b/test/codegen/fixtures/htmlElement/index.js
index df49d1b73..daa4d6f06 100644
--- a/test/codegen/fixtures/htmlElement/index.js
+++ b/test/codegen/fixtures/htmlElement/index.js
@@ -1,8 +1,14 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [builder.text(builder.literal('Hello World'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [builder.text(builder.literal("Hello World"))]
+    );
+};
diff --git a/test/codegen/fixtures/identifier/index.js b/test/codegen/fixtures/identifier/index.js
index 63d60ad85..c70befde9 100644
--- a/test/codegen/fixtures/identifier/index.js
+++ b/test/codegen/fixtures/identifier/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.assignment(builder.identifier('foo'), builder.literal('abc'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.assignment(
+        builder.identifier("foo"),
+        builder.literal("abc")
+    );
+};
diff --git a/test/codegen/fixtures/if-else-if-else/index.js b/test/codegen/fixtures/if-else-if-else/index.js
index 9a97f86a6..ecae4ea2f 100644
--- a/test/codegen/fixtures/if-else-if-else/index.js
+++ b/test/codegen/fixtures/if-else-if-else/index.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var ifStatement = builder.ifStatement;
     var elseIfStatement = builder.elseIfStatement;
@@ -9,5 +9,15 @@ module.exports = function (builder) {
     var assignment = builder.assignment;
     var literal = builder.literal;
 
-    return program([ifStatement(strictEquality('a', '1'), [assignment('foo', literal(1))], elseIfStatement(strictEquality('a', '2'), [assignment('foo', literal(2))], elseStatement([assignment('foo', literal(3))])))]);
-};
\ No newline at end of file
+    return program([
+        ifStatement(
+            strictEquality("a", "1"),
+            [assignment("foo", literal(1))],
+            elseIfStatement(
+                strictEquality("a", "2"),
+                [assignment("foo", literal(2))],
+                elseStatement([assignment("foo", literal(3))])
+            )
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/if-else-if/index.js b/test/codegen/fixtures/if-else-if/index.js
index 17b25457f..ab21fd50d 100644
--- a/test/codegen/fixtures/if-else-if/index.js
+++ b/test/codegen/fixtures/if-else-if/index.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var ifStatement = builder.ifStatement;
     var elseIfStatement = builder.elseIfStatement;
@@ -8,5 +8,13 @@ module.exports = function (builder) {
     var assignment = builder.assignment;
     var literal = builder.literal;
 
-    return program([ifStatement(strictEquality('a', '1'), [assignment('foo', literal(1))], elseIfStatement(strictEquality('a', '2'), [assignment('foo', literal(2))]))]);
-};
\ No newline at end of file
+    return program([
+        ifStatement(
+            strictEquality("a", "1"),
+            [assignment("foo", literal(1))],
+            elseIfStatement(strictEquality("a", "2"), [
+                assignment("foo", literal(2))
+            ])
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/if-else/index.js b/test/codegen/fixtures/if-else/index.js
index 2931749ca..49296ac1b 100644
--- a/test/codegen/fixtures/if-else/index.js
+++ b/test/codegen/fixtures/if-else/index.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var ifStatement = builder.ifStatement;
     var elseStatement = builder.elseStatement;
@@ -8,5 +8,11 @@ module.exports = function (builder) {
     var assignment = builder.assignment;
     var literal = builder.literal;
 
-    return program([ifStatement(strictEquality('a', '1'), [assignment('foo', literal(1))], elseStatement([assignment('foo', literal(2))]))]);
-};
\ No newline at end of file
+    return program([
+        ifStatement(
+            strictEquality("a", "1"),
+            [assignment("foo", literal(1))],
+            elseStatement([assignment("foo", literal(2))])
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/if-write-if/index.js b/test/codegen/fixtures/if-write-if/index.js
index 0f9d4e5c4..c91cfea46 100644
--- a/test/codegen/fixtures/if-write-if/index.js
+++ b/test/codegen/fixtures/if-write-if/index.js
@@ -1,9 +1,17 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var startIf = builder.ifStatement(builder.literal(true), [builder.text(builder.literal('A'))]);
+module.exports = function(builder) {
+    var startIf = builder.ifStatement(builder.literal(true), [
+        builder.text(builder.literal("A"))
+    ]);
 
-    var endIf = builder.ifStatement(builder.literal(true), [builder.text(builder.literal('C'))]);
+    var endIf = builder.ifStatement(builder.literal(true), [
+        builder.text(builder.literal("C"))
+    ]);
 
-    return builder.program([startIf, builder.text(builder.literal('B')), endIf]);
-};
\ No newline at end of file
+    return builder.program([
+        startIf,
+        builder.text(builder.literal("B")),
+        endIf
+    ]);
+};
diff --git a/test/codegen/fixtures/if/index.js b/test/codegen/fixtures/if/index.js
index 5fe35f2c6..2625bff6f 100644
--- a/test/codegen/fixtures/if/index.js
+++ b/test/codegen/fixtures/if/index.js
@@ -1,11 +1,15 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var ifStatement = builder.ifStatement;
     var strictEquality = builder.strictEquality;
     var assignment = builder.assignment;
     var literal = builder.literal;
 
-    return program([ifStatement(strictEquality('a', '1'), [assignment('foo', literal('bar'))])]);
-};
\ No newline at end of file
+    return program([
+        ifStatement(strictEquality("a", "1"), [
+            assignment("foo", literal("bar"))
+        ])
+    ]);
+};
diff --git a/test/codegen/fixtures/insertSiblingAfter/index.js b/test/codegen/fixtures/insertSiblingAfter/index.js
index ec9d512df..4e2b422a9 100644
--- a/test/codegen/fixtures/insertSiblingAfter/index.js
+++ b/test/codegen/fixtures/insertSiblingAfter/index.js
@@ -1,22 +1,32 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var spanElement = builder.htmlElement('span', [{
-        name: 'class',
-        value: builder.literal('foo')
-    }]);
+module.exports = function(builder) {
+    var spanElement = builder.htmlElement("span", [
+        {
+            name: "class",
+            value: builder.literal("foo")
+        }
+    ]);
 
-    var htmlElement = builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [spanElement, builder.text(builder.literal('Hello World'))]);
+    var htmlElement = builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [spanElement, builder.text(builder.literal("Hello World"))]
+    );
 
-    let varNode = builder.vars([{
-        id: builder.identifier('newVar'),
-        init: builder.literal('Hello World')
-    }]);
+    let varNode = builder.vars([
+        {
+            id: builder.identifier("newVar"),
+            init: builder.literal("Hello World")
+        }
+    ]);
 
     spanElement.insertSiblingAfter(varNode);
 
     return builder.ifStatement(builder.literalTrue(), [htmlElement]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/insertSiblingBefore/index.js b/test/codegen/fixtures/insertSiblingBefore/index.js
index ee9c7955d..f9f12b7ce 100644
--- a/test/codegen/fixtures/insertSiblingBefore/index.js
+++ b/test/codegen/fixtures/insertSiblingBefore/index.js
@@ -1,22 +1,32 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var spanElement = builder.htmlElement('span', [{
-        name: 'class',
-        value: builder.literal('foo')
-    }]);
+module.exports = function(builder) {
+    var spanElement = builder.htmlElement("span", [
+        {
+            name: "class",
+            value: builder.literal("foo")
+        }
+    ]);
 
-    var htmlElement = builder.htmlElement('div', [{
-        name: 'class',
-        value: builder.literal('greeting')
-    }], [spanElement, builder.text(builder.literal('Hello World'))]);
+    var htmlElement = builder.htmlElement(
+        "div",
+        [
+            {
+                name: "class",
+                value: builder.literal("greeting")
+            }
+        ],
+        [spanElement, builder.text(builder.literal("Hello World"))]
+    );
 
-    let varNode = builder.vars([{
-        id: builder.identifier('newVar'),
-        init: builder.literal('Hello World')
-    }]);
+    let varNode = builder.vars([
+        {
+            id: builder.identifier("newVar"),
+            init: builder.literal("Hello World")
+        }
+    ]);
 
     spanElement.insertSiblingBefore(varNode);
 
     return builder.ifStatement(builder.literalTrue(), [htmlElement]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/invokeMacro-body/index.js b/test/codegen/fixtures/invokeMacro-body/index.js
index f2cb388d1..ea0442857 100644
--- a/test/codegen/fixtures/invokeMacro-body/index.js
+++ b/test/codegen/fixtures/invokeMacro-body/index.js
@@ -1,5 +1,23 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.macro('greeting', ['name', 'age'], [builder.text(builder.literal('Hello ')), builder.text(builder.identifier('name'))]), builder.invokeMacro('greeting', [builder.literal('Frank'), builder.literal(10)], [builder.text(builder.literal('This is the body passed to the macro'))])]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.macro(
+            "greeting",
+            ["name", "age"],
+            [
+                builder.text(builder.literal("Hello ")),
+                builder.text(builder.identifier("name"))
+            ]
+        ),
+        builder.invokeMacro(
+            "greeting",
+            [builder.literal("Frank"), builder.literal(10)],
+            [
+                builder.text(
+                    builder.literal("This is the body passed to the macro")
+                )
+            ]
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/invokeMacro/index.js b/test/codegen/fixtures/invokeMacro/index.js
index 18143da90..0a005db5d 100644
--- a/test/codegen/fixtures/invokeMacro/index.js
+++ b/test/codegen/fixtures/invokeMacro/index.js
@@ -1,5 +1,18 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.macro('greeting', ['name', 'age'], [builder.text(builder.literal('Hello ')), builder.text(builder.identifier('name'))]), builder.invokeMacro('greeting', [builder.literal('Frank'), builder.literal(10)])]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.macro(
+            "greeting",
+            ["name", "age"],
+            [
+                builder.text(builder.literal("Hello ")),
+                builder.text(builder.identifier("name"))
+            ]
+        ),
+        builder.invokeMacro("greeting", [
+            builder.literal("Frank"),
+            builder.literal(10)
+        ])
+    ]);
+};
diff --git a/test/codegen/fixtures/invokeMacroFromEl-body-and-argument/index.js b/test/codegen/fixtures/invokeMacroFromEl-body-and-argument/index.js
index 49088bfc6..94b1969f3 100644
--- a/test/codegen/fixtures/invokeMacroFromEl-body-and-argument/index.js
+++ b/test/codegen/fixtures/invokeMacroFromEl-body-and-argument/index.js
@@ -1,6 +1,26 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.macro('greeting', ['name', 'age'], [builder.text(builder.literal('Hello ')), builder.text(builder.identifier('name'))]), builder.invokeMacroFromEl(builder.htmlElement('greeting', [], /* empty attributes */
-    [builder.text(builder.literal('This is the body passed to the macro'))], '"Frank", 10') /* argument string */)]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.macro(
+            "greeting",
+            ["name", "age"],
+            [
+                builder.text(builder.literal("Hello ")),
+                builder.text(builder.identifier("name"))
+            ]
+        ),
+        builder.invokeMacroFromEl(
+            builder.htmlElement(
+                "greeting",
+                [] /* empty attributes */,
+                [
+                    builder.text(
+                        builder.literal("This is the body passed to the macro")
+                    )
+                ],
+                '"Frank", 10'
+            ) /* argument string */
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/invokeMacroFromEl/index.js b/test/codegen/fixtures/invokeMacroFromEl/index.js
index 7580042b0..b736a7916 100644
--- a/test/codegen/fixtures/invokeMacroFromEl/index.js
+++ b/test/codegen/fixtures/invokeMacroFromEl/index.js
@@ -1,8 +1,20 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.macro('greeting', ['name', 'age'], [builder.text(builder.literal('Hello ')), builder.text(builder.identifier('name'))]), builder.invokeMacroFromEl(builder.htmlElement('greeting', {
-        name: builder.literal('Frank'),
-        age: builder.literal(10)
-    }))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.macro(
+            "greeting",
+            ["name", "age"],
+            [
+                builder.text(builder.literal("Hello ")),
+                builder.text(builder.identifier("name"))
+            ]
+        ),
+        builder.invokeMacroFromEl(
+            builder.htmlElement("greeting", {
+                name: builder.literal("Frank"),
+                age: builder.literal(10)
+            })
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/literal/index.js b/test/codegen/fixtures/literal/index.js
index f328496a7..67a080f84 100644
--- a/test/codegen/fixtures/literal/index.js
+++ b/test/codegen/fixtures/literal/index.js
@@ -1,18 +1,18 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     return builder.vars({
-        'aString': builder.literal('abc'),
-        'aNumber': builder.literal(123),
-        'aBoolean': builder.literal(false),
-        'anObject': builder.literal({
-            foo: 'bar',
-            dynamic: builder.expression('data.name')
+        aString: builder.literal("abc"),
+        aNumber: builder.literal(123),
+        aBoolean: builder.literal(false),
+        anObject: builder.literal({
+            foo: "bar",
+            dynamic: builder.expression("data.name")
         }),
-        'anArray': builder.literal(['foo', builder.expression('data.name')]),
-        'literalTrue': builder.literalTrue(),
-        'literalFalse': builder.literalFalse(),
-        'literalNull': builder.literalNull(),
-        'literalUndefined': builder.literalUndefined()
+        anArray: builder.literal(["foo", builder.expression("data.name")]),
+        literalTrue: builder.literalTrue(),
+        literalFalse: builder.literalFalse(),
+        literalNull: builder.literalNull(),
+        literalUndefined: builder.literalUndefined()
     });
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/macro/index.js b/test/codegen/fixtures/macro/index.js
index 1e76d1497..9e8fcb952 100644
--- a/test/codegen/fixtures/macro/index.js
+++ b/test/codegen/fixtures/macro/index.js
@@ -1,5 +1,12 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.macro('greeting', ['name', 'age'], [builder.text(builder.literal('Hello ')), builder.text(builder.identifier('name'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.macro(
+        "greeting",
+        ["name", "age"],
+        [
+            builder.text(builder.literal("Hello ")),
+            builder.text(builder.identifier("name"))
+        ]
+    );
+};
diff --git a/test/codegen/fixtures/marko-template/index.js b/test/codegen/fixtures/marko-template/index.js
index 90cc225b2..c97bd9781 100644
--- a/test/codegen/fixtures/marko-template/index.js
+++ b/test/codegen/fixtures/marko-template/index.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var templateRoot = builder.templateRoot;
     var literal = builder.literal;
     var functionDeclaration = builder.functionDeclaration;
@@ -10,7 +10,31 @@ module.exports = function (builder) {
     var html = builder.html;
     var htmlElement = builder.htmlElement;
 
-    var rootNode = templateRoot([text(literal('Hello')), html('data.name'), text(literal('!')), ifStatement(functionCall('notEmpty', ['data.colors']), [htmlElement('ul', [{ name: 'class', value: literal('colors') }], [functionCall('forEach', ['data.colors', functionDeclaration(null, ['color'], [htmlElement('li', { 'class': literal('color') }, [text('color')])])])])])]);
+    var rootNode = templateRoot([
+        text(literal("Hello")),
+        html("data.name"),
+        text(literal("!")),
+        ifStatement(functionCall("notEmpty", ["data.colors"]), [
+            htmlElement(
+                "ul",
+                [{ name: "class", value: literal("colors") }],
+                [
+                    functionCall("forEach", [
+                        "data.colors",
+                        functionDeclaration(
+                            null,
+                            ["color"],
+                            [
+                                htmlElement("li", { class: literal("color") }, [
+                                    text("color")
+                                ])
+                            ]
+                        )
+                    ])
+                ]
+            )
+        ])
+    ]);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/meta-dependencies/index.js b/test/codegen/fixtures/meta-dependencies/index.js
index 58f1202b5..d374bc7c9 100644
--- a/test/codegen/fixtures/meta-dependencies/index.js
+++ b/test/codegen/fixtures/meta-dependencies/index.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
     var context = codegen.context;
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
     context.useMeta = true;
     context.addDependency("./foo");
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/meta-unique/index.js b/test/codegen/fixtures/meta-unique/index.js
index 82e822351..eef9ed15d 100644
--- a/test/codegen/fixtures/meta-unique/index.js
+++ b/test/codegen/fixtures/meta-unique/index.js
@@ -1,14 +1,14 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder, codegen) {
+module.exports = function(builder, codegen) {
     var context = codegen.context;
 
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
     context.useMeta = true;
-    context.pushMeta('foo', { bar: 1 }, true);
-    context.pushMeta('foo', { bar: 1 }, true);
-    context.pushMeta('foo', { bar: 2 }, true);
+    context.pushMeta("foo", { bar: 1 }, true);
+    context.pushMeta("foo", { bar: 1 }, true);
+    context.pushMeta("foo", { bar: 2 }, true);
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/moveChildrenTo/index.js b/test/codegen/fixtures/moveChildrenTo/index.js
index a2ebaf6f8..1e70087d5 100644
--- a/test/codegen/fixtures/moveChildrenTo/index.js
+++ b/test/codegen/fixtures/moveChildrenTo/index.js
@@ -1,11 +1,19 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var div = builder.htmlElement('div', [], [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var div = builder.htmlElement(
+        "div",
+        [],
+        [builder.text(builder.literal("Hello World"))]
+    );
 
-    var span = builder.htmlElement('span', [], [builder.text(builder.literal('Foo'))]);
+    var span = builder.htmlElement(
+        "span",
+        [],
+        [builder.text(builder.literal("Foo"))]
+    );
 
     div.moveChildrenTo(span);
 
     return builder.program([div, span]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/negate/index.js b/test/codegen/fixtures/negate/index.js
index ecc6994c8..8a7e6200b 100644
--- a/test/codegen/fixtures/negate/index.js
+++ b/test/codegen/fixtures/negate/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.negate(builder.identifier('foo'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.negate(builder.identifier("foo"));
+};
diff --git a/test/codegen/fixtures/new/index.js b/test/codegen/fixtures/new/index.js
index ab4ae5c1a..07d47068b 100644
--- a/test/codegen/fixtures/new/index.js
+++ b/test/codegen/fixtures/new/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.newExpression(builder.identifier('Foo'), [builder.literal('Frank'), builder.literal('human')]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.newExpression(builder.identifier("Foo"), [
+        builder.literal("Frank"),
+        builder.literal("human")
+    ]);
+};
diff --git a/test/codegen/fixtures/node/index.js b/test/codegen/fixtures/node/index.js
index b8fbb63f1..a28322c64 100644
--- a/test/codegen/fixtures/node/index.js
+++ b/test/codegen/fixtures/node/index.js
@@ -1,8 +1,10 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.node(function (node, codegen) {
-        var builder = codegen.builder;
-        return builder.text(builder.literal('Hello World!'));
-    })]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.node(function(node, codegen) {
+            var builder = codegen.builder;
+            return builder.text(builder.literal("Hello World!"));
+        })
+    ]);
+};
diff --git a/test/codegen/fixtures/program/index.js b/test/codegen/fixtures/program/index.js
index eab2e407d..a2d2003f2 100644
--- a/test/codegen/fixtures/program/index.js
+++ b/test/codegen/fixtures/program/index.js
@@ -1,7 +1,13 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.program([builder.vars({
-        name: builder.literal('Frank')
-    }), builder.functionCall('console.log', [builder.literal('Hello'), builder.identifier('name')])]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.program([
+        builder.vars({
+            name: builder.literal("Frank")
+        }),
+        builder.functionCall("console.log", [
+            builder.literal("Hello"),
+            builder.identifier("name")
+        ])
+    ]);
+};
diff --git a/test/codegen/fixtures/removeAllAttributes/index.js b/test/codegen/fixtures/removeAllAttributes/index.js
index f6b294d6c..1793edd6f 100644
--- a/test/codegen/fixtures/removeAllAttributes/index.js
+++ b/test/codegen/fixtures/removeAllAttributes/index.js
@@ -1,11 +1,15 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var div = builder.htmlElement('div', {
-        'class': builder.literal('foo')
-    }, [builder.text(builder.literal('Hello World'))]);
+module.exports = function(builder) {
+    var div = builder.htmlElement(
+        "div",
+        {
+            class: builder.literal("foo")
+        },
+        [builder.text(builder.literal("Hello World"))]
+    );
 
     div.removeAllAttributes();
 
     return builder.program([div]);
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/renderBodyFunction/index.js b/test/codegen/fixtures/renderBodyFunction/index.js
index 7545df955..1580e849a 100644
--- a/test/codegen/fixtures/renderBodyFunction/index.js
+++ b/test/codegen/fixtures/renderBodyFunction/index.js
@@ -1,5 +1,7 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.renderBodyFunction([builder.text(builder.literal('Hello World!'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.renderBodyFunction([
+        builder.text(builder.literal("Hello World!"))
+    ]);
+};
diff --git a/test/codegen/fixtures/returnStatement-empty/index.js b/test/codegen/fixtures/returnStatement-empty/index.js
index d9abe5c58..572e9804d 100644
--- a/test/codegen/fixtures/returnStatement-empty/index.js
+++ b/test/codegen/fixtures/returnStatement-empty/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.functionDeclaration(builder.identifier('foo'), [builder.identifier('bar')], [builder.returnStatement()]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.functionDeclaration(
+        builder.identifier("foo"),
+        [builder.identifier("bar")],
+        [builder.returnStatement()]
+    );
+};
diff --git a/test/codegen/fixtures/returnStatement/index.js b/test/codegen/fixtures/returnStatement/index.js
index 2b29b36d5..19e6ca7a4 100644
--- a/test/codegen/fixtures/returnStatement/index.js
+++ b/test/codegen/fixtures/returnStatement/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.functionDeclaration('upperCase', ['str'], [builder.returnStatement(builder.functionCall('str.toUpperCase'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.functionDeclaration(
+        "upperCase",
+        ["str"],
+        [builder.returnStatement(builder.functionCall("str.toUpperCase"))]
+    );
+};
diff --git a/test/codegen/fixtures/selfInvokingFunction-no-args/index.js b/test/codegen/fixtures/selfInvokingFunction-no-args/index.js
index a3cedddcc..ce1106357 100644
--- a/test/codegen/fixtures/selfInvokingFunction-no-args/index.js
+++ b/test/codegen/fixtures/selfInvokingFunction-no-args/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-        return builder.selfInvokingFunction([builder.vars(['foo']), builder.assignment('foo', builder.literal('bar'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.selfInvokingFunction([
+        builder.vars(["foo"]),
+        builder.assignment("foo", builder.literal("bar"))
+    ]);
+};
diff --git a/test/codegen/fixtures/selfInvokingFunction-null-args/index.js b/test/codegen/fixtures/selfInvokingFunction-null-args/index.js
index 5e57912d1..1eeb25559 100644
--- a/test/codegen/fixtures/selfInvokingFunction-null-args/index.js
+++ b/test/codegen/fixtures/selfInvokingFunction-null-args/index.js
@@ -1,5 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.selfInvokingFunction(null, null, [builder.vars(['foo']), builder.assignment('foo', builder.literal('bar'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.selfInvokingFunction(null, null, [
+        builder.vars(["foo"]),
+        builder.assignment("foo", builder.literal("bar"))
+    ]);
+};
diff --git a/test/codegen/fixtures/selfInvokingFunction/index.js b/test/codegen/fixtures/selfInvokingFunction/index.js
index 498cdd961..4dd4e04e7 100644
--- a/test/codegen/fixtures/selfInvokingFunction/index.js
+++ b/test/codegen/fixtures/selfInvokingFunction/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.selfInvokingFunction(['win'], ['window'], [builder.assignment('win.foo', builder.literal('bar'))]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.selfInvokingFunction(
+        ["win"],
+        ["window"],
+        [builder.assignment("win.foo", builder.literal("bar"))]
+    );
+};
diff --git a/test/codegen/fixtures/simple/index.js b/test/codegen/fixtures/simple/index.js
index 99be5925e..1a9502527 100644
--- a/test/codegen/fixtures/simple/index.js
+++ b/test/codegen/fixtures/simple/index.js
@@ -1,10 +1,16 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     var program = builder.program;
     var identifier = builder.identifier;
     var functionDeclaration = builder.functionDeclaration;
     var functionCall = builder.functionCall;
 
-    return program([functionDeclaration('foo', ['a', 'b', identifier('c')], [functionCall('hello', ['arg1', 'arg2'])])]);
-};
\ No newline at end of file
+    return program([
+        functionDeclaration(
+            "foo",
+            ["a", "b", identifier("c")],
+            [functionCall("hello", ["arg1", "arg2"])]
+        )
+    ]);
+};
diff --git a/test/codegen/fixtures/strictEquality/index.js b/test/codegen/fixtures/strictEquality/index.js
index 7fc9f5bf0..dafb31942 100644
--- a/test/codegen/fixtures/strictEquality/index.js
+++ b/test/codegen/fixtures/strictEquality/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.strictEquality('a', 'b');
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.strictEquality("a", "b");
+};
diff --git a/test/codegen/fixtures/templateRoot-prependChild/index.js b/test/codegen/fixtures/templateRoot-prependChild/index.js
index 6b79967f1..2c405adeb 100644
--- a/test/codegen/fixtures/templateRoot-prependChild/index.js
+++ b/test/codegen/fixtures/templateRoot-prependChild/index.js
@@ -1,12 +1,16 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', [])]);
+module.exports = function(builder) {
+    var templateRoot = builder.templateRoot([builder.htmlElement("div", [])]);
 
-    templateRoot.prependChild(builder.vars([{
-        id: 'foo',
-        init: builder.literal('bar')
-    }]));
+    templateRoot.prependChild(
+        builder.vars([
+            {
+                id: "foo",
+                init: builder.literal("bar")
+            }
+        ])
+    );
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/templateRoot/index.js b/test/codegen/fixtures/templateRoot/index.js
index aad9b2989..47662d06c 100644
--- a/test/codegen/fixtures/templateRoot/index.js
+++ b/test/codegen/fixtures/templateRoot/index.js
@@ -1,12 +1,20 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var templateRoot = builder.templateRoot([builder.htmlElement('div', { class: builder.literal('foo') }, [builder.htmlElement('span', { class: builder.literal('bar') })])]);
+module.exports = function(builder) {
+    var templateRoot = builder.templateRoot([
+        builder.htmlElement("div", { class: builder.literal("foo") }, [
+            builder.htmlElement("span", { class: builder.literal("bar") })
+        ])
+    ]);
 
-    templateRoot.prependChild(builder.vars([{
-        id: 'foo',
-        init: builder.literal('bar')
-    }]));
+    templateRoot.prependChild(
+        builder.vars([
+            {
+                id: "foo",
+                init: builder.literal("bar")
+            }
+        ])
+    );
 
     return templateRoot;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/unaryExpression/index.js b/test/codegen/fixtures/unaryExpression/index.js
index ecc6994c8..8a7e6200b 100644
--- a/test/codegen/fixtures/unaryExpression/index.js
+++ b/test/codegen/fixtures/unaryExpression/index.js
@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.negate(builder.identifier('foo'));
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.negate(builder.identifier("foo"));
+};
diff --git a/test/codegen/fixtures/var-scoped/index.js b/test/codegen/fixtures/var-scoped/index.js
index 68b89d7d8..31e75935a 100644
--- a/test/codegen/fixtures/var-scoped/index.js
+++ b/test/codegen/fixtures/var-scoped/index.js
@@ -1,11 +1,17 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    var declarations = [{
-        id: builder.identifier('name'),
-        init: builder.literal('string')
-    }];
+module.exports = function(builder) {
+    var declarations = [
+        {
+            id: builder.identifier("name"),
+            init: builder.literal("string")
+        }
+    ];
     var vars = builder.vars(declarations);
-    vars.appendChild(builder.functionCall(builder.identifier('log'), [builder.identifier('name')]));
+    vars.appendChild(
+        builder.functionCall(builder.identifier("log"), [
+            builder.identifier("name")
+        ])
+    );
     return vars;
-};
\ No newline at end of file
+};
diff --git a/test/codegen/fixtures/var/index.js b/test/codegen/fixtures/var/index.js
index 4d9ea1eb7..7fd51fe6e 100644
--- a/test/codegen/fixtures/var/index.js
+++ b/test/codegen/fixtures/var/index.js
@@ -1,5 +1,9 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.var(builder.identifier('foo'), builder.literal('bar'), 'let');
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.var(
+        builder.identifier("foo"),
+        builder.literal("bar"),
+        "let"
+    );
+};
diff --git a/test/codegen/fixtures/vars-array/index.js b/test/codegen/fixtures/vars-array/index.js
index fdb8c8c2f..aa4263dc8 100644
--- a/test/codegen/fixtures/vars-array/index.js
+++ b/test/codegen/fixtures/vars-array/index.js
@@ -1,11 +1,14 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
-    return builder.vars([{
-        id: 'foo',
-        init: builder.literal('bar')
-    }, {
-        id: builder.identifier('hello'),
-        init: builder.literal('world')
-    }]);
-};
\ No newline at end of file
+module.exports = function(builder) {
+    return builder.vars([
+        {
+            id: "foo",
+            init: builder.literal("bar")
+        },
+        {
+            id: builder.identifier("hello"),
+            init: builder.literal("world")
+        }
+    ]);
+};
diff --git a/test/codegen/fixtures/vars-object/index.js b/test/codegen/fixtures/vars-object/index.js
index b0f1874a6..b40cbbc1e 100644
--- a/test/codegen/fixtures/vars-object/index.js
+++ b/test/codegen/fixtures/vars-object/index.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
-module.exports = function (builder) {
+module.exports = function(builder) {
     return builder.vars({
-        'foo': builder.literal('bar'),
-        'hello': builder.literal('world')
+        foo: builder.literal("bar"),
+        hello: builder.literal("world")
     });
-};
\ No newline at end of file
+};
diff --git a/test/codegen/index.test.js b/test/codegen/index.test.js
index db3bf5466..798894e4d 100644
--- a/test/codegen/index.test.js
+++ b/test/codegen/index.test.js
@@ -1,19 +1,19 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-var path = require('path');
-var compiler = require('../../compiler');
+var path = require("path");
+var compiler = require("../../compiler");
 var builder = compiler.createBuilder();
-var autotest = require('../autotest');
+var autotest = require("../autotest");
 
-var CompileContext = require('marko/compiler/CompileContext');
-var CodeGenerator = require('marko/compiler/CodeGenerator');
-var CodeWriter = require('marko/compiler/CodeWriter');
+var CompileContext = require("marko/compiler/CompileContext");
+var CodeGenerator = require("marko/compiler/CodeGenerator");
+var CodeWriter = require("marko/compiler/CodeWriter");
 
 function createCodeGenerator(context) {
     return new CodeGenerator(context);
@@ -23,14 +23,18 @@ function createCodeWriter(context) {
     return new CodeWriter(context, builder);
 }
 
-describe('compiler/codegen', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("compiler/codegen", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var main = require(path.join(dir, 'index.js'));
+        var main = require(path.join(dir, "index.js"));
         var generateCodeFunc = main;
 
-        var context = new CompileContext('dummy', path.join(dir, 'dummy.marko'), builder);
+        var context = new CompileContext(
+            "dummy",
+            path.join(dir, "dummy.marko"),
+            builder
+        );
         var codegen = createCodeGenerator(context);
         var codeWriter = createCodeWriter(context);
 
@@ -40,22 +44,26 @@ describe('compiler/codegen', function () {
         codeWriter.write(finalAST);
 
         var actualSrc = codeWriter.getCode();
-        actualSrc = actualSrc.replace(/marko\/dist\//g, 'marko/src/');
+        actualSrc = actualSrc.replace(/marko\/dist\//g, "marko/src/");
 
-        helpers.compare(actualSrc, '.js');
+        helpers.compare(actualSrc, ".js");
         done();
     });
 
-    it('should not allow a return outside a function', function () {
+    it("should not allow a return outside a function", function() {
         let builder = compiler.createBuilder();
 
-        var context = new CompileContext('dummy', path.join(autoTestDir, 'dummy.marko'), builder);
+        var context = new CompileContext(
+            "dummy",
+            path.join(autoTestDir, "dummy.marko"),
+            builder
+        );
         var codegen = createCodeGenerator(context);
 
-        var rootNode = builder.program([builder.returnStatement('foo')]);
+        var rootNode = builder.program([builder.returnStatement("foo")]);
 
-        expect(function () {
+        expect(function() {
             codegen.generateCode(rootNode);
         }).to.throw('"return" not allowed outside a function body');
     });
-});
\ No newline at end of file
+});
diff --git a/test/compiler/fixtures-html/addNestedVariable/marko.json b/test/compiler/fixtures-html/addNestedVariable/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/addNestedVariable/marko.json
+++ b/test/compiler/fixtures-html/addNestedVariable/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/marko-tag.json b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/marko-tag.json
index 9f61bec61..05978a7ff 100644
--- a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/marko-tag.json
+++ b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer.js",
     "transformer": "./transformer.js"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/renderer.js b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/renderer.js
+++ b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/transformer.js b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/transformer.js
index 8a625c425..acc814250 100644
--- a/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/transformer.js
+++ b/test/compiler/fixtures-html/addNestedVariable/tags/test-addNestedVariable/transformer.js
@@ -1,3 +1,3 @@
-module.exports = function transform(el, context) {
-    el.addNestedVariable('foo');
-};
\ No newline at end of file
+module.exports = function transform(el) {
+    el.addNestedVariable("foo");
+};
diff --git a/test/compiler/fixtures-html/attr-placeholder-escapeXml/foo-transformer.js b/test/compiler/fixtures-html/attr-placeholder-escapeXml/foo-transformer.js
index be5fd9ab1..7c29d6019 100644
--- a/test/compiler/fixtures-html/attr-placeholder-escapeXml/foo-transformer.js
+++ b/test/compiler/fixtures-html/attr-placeholder-escapeXml/foo-transformer.js
@@ -1,6 +1,6 @@
-module.exports = function (el, context) {
+module.exports = function(el, context) {
     var builder = context.builder;
-    var fooValue = el.getAttributeValue('foo');
+    var fooValue = el.getAttributeValue("foo");
 
-    el.insertSiblingAfter(builder.var('foo', fooValue));
-};
\ No newline at end of file
+    el.insertSiblingAfter(builder.var("foo", fooValue));
+};
diff --git a/test/compiler/fixtures-html/attr-placeholder-escapeXml/marko.json b/test/compiler/fixtures-html/attr-placeholder-escapeXml/marko.json
index 95938a821..cee0e42a7 100644
--- a/test/compiler/fixtures-html/attr-placeholder-escapeXml/marko.json
+++ b/test/compiler/fixtures-html/attr-placeholder-escapeXml/marko.json
@@ -2,4 +2,4 @@
     "<div>": {
         "transformer": "./foo-transformer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/class-tag-nested-content-error/test.js b/test/compiler/fixtures-html/class-tag-nested-content-error/test.js
index e9c40a70b..701d81bf2 100644
--- a/test/compiler/fixtures-html/class-tag-nested-content-error/test.js
+++ b/test/compiler/fixtures-html/class-tag-nested-content-error/test.js
@@ -1,5 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.checkError = function (e) {
-    expect(e.toString()).to.contain('The "class" tag does not allow nested body content');
-};
\ No newline at end of file
+exports.checkError = function(e) {
+    expect(e.toString()).to.contain(
+        'The "class" tag does not allow nested body content'
+    );
+};
diff --git a/test/compiler/fixtures-html/createNodeFromEl/marko.json b/test/compiler/fixtures-html/createNodeFromEl/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/createNodeFromEl/marko.json
+++ b/test/compiler/fixtures-html/createNodeFromEl/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/createNodeFromEl/tags/test-createNodeFromEl/code-generator.js b/test/compiler/fixtures-html/createNodeFromEl/tags/test-createNodeFromEl/code-generator.js
index 61f67f5ff..5e0d44285 100644
--- a/test/compiler/fixtures-html/createNodeFromEl/tags/test-createNodeFromEl/code-generator.js
+++ b/test/compiler/fixtures-html/createNodeFromEl/tags/test-createNodeFromEl/code-generator.js
@@ -1,20 +1,22 @@
-module.exports = function (elNode, codegen) {
+module.exports = function(elNode, codegen) {
     var builder = codegen.builder;
 
-    var helloNode1 = codegen.context.createNodeForEl('test-hello', [{
-        name: 'name',
-        value: builder.literal('Frank')
-    }]);
+    var helloNode1 = codegen.context.createNodeForEl("test-hello", [
+        {
+            name: "name",
+            value: builder.literal("Frank")
+        }
+    ]);
 
-    var helloNode2 = codegen.context.createNodeForEl('test-hello', {
-        name: builder.literal('Frank')
+    var helloNode2 = codegen.context.createNodeForEl("test-hello", {
+        name: builder.literal("Frank")
     });
 
-    var helloNode3 = codegen.context.createNodeForEl('test-hello', {
+    var helloNode3 = codegen.context.createNodeForEl("test-hello", {
         name: {
-            value: builder.literal('Frank')
+            value: builder.literal("Frank")
         }
     });
 
     return [helloNode1, helloNode2, helloNode3];
-};
\ No newline at end of file
+};
diff --git a/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/marko-tag.json b/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/marko-tag.json
+++ b/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/renderer.js b/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/renderer.js
+++ b/test/compiler/fixtures-html/createNodeFromEl/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/compiler/fixtures-html/custom-tag-body-function/marko.json b/test/compiler/fixtures-html/custom-tag-body-function/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/custom-tag-body-function/marko.json
+++ b/test/compiler/fixtures-html/custom-tag-body-function/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/marko-tag.json b/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/marko-tag.json
index 1231ef693..10ffa3960 100644
--- a/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/marko-tag.json
+++ b/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "body-function": "myBody(foo, bar)"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/renderer.js b/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/renderer.js
+++ b/test/compiler/fixtures-html/custom-tag-body-function/tags/test-body-function/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/compiler/fixtures-html/custom-tag-data/custom-tag-data-tag.js b/test/compiler/fixtures-html/custom-tag-data/custom-tag-data-tag.js
index 4f600d13b..0a55f349a 100644
--- a/test/compiler/fixtures-html/custom-tag-data/custom-tag-data-tag.js
+++ b/test/compiler/fixtures-html/custom-tag-data/custom-tag-data-tag.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/compiler/fixtures-html/custom-tag-data/marko.json b/test/compiler/fixtures-html/custom-tag-data/marko.json
index 4fb5c98ec..f5b02b258 100644
--- a/test/compiler/fixtures-html/custom-tag-data/marko.json
+++ b/test/compiler/fixtures-html/custom-tag-data/marko.json
@@ -4,4 +4,4 @@
         "@name": "string",
         "@age": "integer"
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag-import-var/marko.json b/test/compiler/fixtures-html/custom-tag-import-var/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/custom-tag-import-var/marko.json
+++ b/test/compiler/fixtures-html/custom-tag-import-var/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/marko-tag.json b/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/marko-tag.json
index 1ff8d5ed2..94b09e627 100644
--- a/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/marko-tag.json
+++ b/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/marko-tag.json
@@ -4,4 +4,4 @@
         "foo": "input.foo",
         "bar": "input.bar"
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/renderer.js b/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/renderer.js
+++ b/test/compiler/fixtures-html/custom-tag-import-var/tags/test-import-var/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/compiler/fixtures-html/custom-tag-template/marko.json b/test/compiler/fixtures-html/custom-tag-template/marko.json
index 37f4d2cb2..9c5c6c55b 100644
--- a/test/compiler/fixtures-html/custom-tag-template/marko.json
+++ b/test/compiler/fixtures-html/custom-tag-template/marko.json
@@ -2,4 +2,4 @@
     "<hello>": {
         "template": "./hello.marko"
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag/marko.json b/test/compiler/fixtures-html/custom-tag/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/custom-tag/marko.json
+++ b/test/compiler/fixtures-html/custom-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag/tags/test-hello/marko-tag.json b/test/compiler/fixtures-html/custom-tag/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/compiler/fixtures-html/custom-tag/tags/test-hello/marko-tag.json
+++ b/test/compiler/fixtures-html/custom-tag/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/custom-tag/tags/test-hello/renderer.js b/test/compiler/fixtures-html/custom-tag/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/compiler/fixtures-html/custom-tag/tags/test-hello/renderer.js
+++ b/test/compiler/fixtures-html/custom-tag/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/compiler/fixtures-html/import-tag/bar.js b/test/compiler/fixtures-html/import-tag/bar.js
index 444e89d34..bc7c25c6d 100644
--- a/test/compiler/fixtures-html/import-tag/bar.js
+++ b/test/compiler/fixtures-html/import-tag/bar.js
@@ -1 +1 @@
-module.exports.f = "bar";
\ No newline at end of file
+module.exports.f = "bar";
diff --git a/test/compiler/fixtures-html/importModule/marko.json b/test/compiler/fixtures-html/importModule/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/importModule/marko.json
+++ b/test/compiler/fixtures-html/importModule/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/importModule/tags/test-import-module/code-generator.js b/test/compiler/fixtures-html/importModule/tags/test-import-module/code-generator.js
index 3fc19ece8..35372aca5 100644
--- a/test/compiler/fixtures-html/importModule/tags/test-import-module/code-generator.js
+++ b/test/compiler/fixtures-html/importModule/tags/test-import-module/code-generator.js
@@ -1,4 +1,4 @@
-module.exports = function (el, codegen) {
-    var fooVar = codegen.importModule('foo', './foo');
+module.exports = function(el, codegen) {
+    var fooVar = codegen.importModule("foo", "./foo");
     return codegen.builder.functionCall(fooVar, []);
-};
\ No newline at end of file
+};
diff --git a/test/compiler/fixtures-html/metadata/foo.js b/test/compiler/fixtures-html/metadata/foo.js
index 89040bb06..b97a131bc 100644
--- a/test/compiler/fixtures-html/metadata/foo.js
+++ b/test/compiler/fixtures-html/metadata/foo.js
@@ -1 +1 @@
-// just a test dependency
\ No newline at end of file
+// just a test dependency
diff --git a/test/compiler/fixtures-html/metadata/marko.json b/test/compiler/fixtures-html/metadata/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/metadata/marko.json
+++ b/test/compiler/fixtures-html/metadata/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/metadata/tags/script-dependency/transformer.js b/test/compiler/fixtures-html/metadata/tags/script-dependency/transformer.js
index d92165a71..d99884a34 100644
--- a/test/compiler/fixtures-html/metadata/tags/script-dependency/transformer.js
+++ b/test/compiler/fixtures-html/metadata/tags/script-dependency/transformer.js
@@ -1,8 +1,8 @@
-module.exports = function (el, context) {
-    var path = el.getAttributeValue('require');
+module.exports = function(el, context) {
+    var path = el.getAttributeValue("require");
     el.detach();
 
-    if (path.type === 'Literal') {
-        context.addDependency(path.value, 'require');
+    if (path.type === "Literal") {
+        context.addDependency(path.value, "require");
     }
-};
\ No newline at end of file
+};
diff --git a/test/compiler/fixtures-html/metadata/tags/test-hello/bar.js b/test/compiler/fixtures-html/metadata/tags/test-hello/bar.js
index 89040bb06..b97a131bc 100644
--- a/test/compiler/fixtures-html/metadata/tags/test-hello/bar.js
+++ b/test/compiler/fixtures-html/metadata/tags/test-hello/bar.js
@@ -1 +1 @@
-// just a test dependency
\ No newline at end of file
+// just a test dependency
diff --git a/test/compiler/fixtures-html/metadata/test.js b/test/compiler/fixtures-html/metadata/test.js
index b44edb065..c66a24ae2 100644
--- a/test/compiler/fixtures-html/metadata/test.js
+++ b/test/compiler/fixtures-html/metadata/test.js
@@ -1,12 +1,11 @@
-var expect = require('chai').expect;
-var config = require('marko/compiler/config');
+var config = require("marko/compiler/config");
 var oldMeta = config.meta;
 
 config.meta = true;
 
-exports.checkTemplate = function (template, helpers) {
+exports.checkTemplate = function(template, helpers) {
     var dependencies = template.getDependencies();
     config.meta = oldMeta;
 
-    helpers.compare(JSON.stringify(dependencies, null, 4), '.json');
-};
\ No newline at end of file
+    helpers.compare(JSON.stringify(dependencies, null, 4), ".json");
+};
diff --git a/test/compiler/fixtures-html/nested-tags-missing-parent/marko.json b/test/compiler/fixtures-html/nested-tags-missing-parent/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/nested-tags-missing-parent/marko.json
+++ b/test/compiler/fixtures-html/nested-tags-missing-parent/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/marko-tag.json b/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/marko-tag.json
index 9686a762c..4624c93c9 100644
--- a/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/marko-tag.json
+++ b/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/marko-tag.json
@@ -20,4 +20,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/renderer.js b/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/renderer.js
index 364254e5c..89137e3b2 100644
--- a/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/renderer.js
+++ b/test/compiler/fixtures-html/nested-tags-missing-parent/tags/test-nested-tags-overlay/renderer.js
@@ -1,13 +1,16 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var header = input.header;
     var body = input.body;
     var footer = input.footer;
 
-    template.render({
-        header: header,
-        body: body,
-        footer: footer
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            header: header,
+            body: body,
+            footer: footer
+        },
+        out
+    );
+};
diff --git a/test/compiler/fixtures-html/nested-tags-missing-parent/test.js b/test/compiler/fixtures-html/nested-tags-missing-parent/test.js
index b294a46ec..d42766de5 100644
--- a/test/compiler/fixtures-html/nested-tags-missing-parent/test.js
+++ b/test/compiler/fixtures-html/nested-tags-missing-parent/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.checkError = function (e) {
-    expect(e.toString()).to.contain('Tag not nested within a');
-    expect(e.toString()).to.contain('<test-nested-tags-overlay>');
-    expect(e.toString()).to.contain('<test-nested-tags-overlay:header>');
-    expect(e.toString()).to.contain('<test-nested-tags-overlay:footer>');
-};
\ No newline at end of file
+exports.checkError = function(e) {
+    expect(e.toString()).to.contain("Tag not nested within a");
+    expect(e.toString()).to.contain("<test-nested-tags-overlay>");
+    expect(e.toString()).to.contain("<test-nested-tags-overlay:header>");
+    expect(e.toString()).to.contain("<test-nested-tags-overlay:footer>");
+};
diff --git a/test/compiler/fixtures-html/nested-tags/marko.json b/test/compiler/fixtures-html/nested-tags/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/nested-tags/marko.json
+++ b/test/compiler/fixtures-html/nested-tags/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/marko-tag.json b/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
index 9686a762c..4624c93c9 100644
--- a/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
+++ b/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
@@ -20,4 +20,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/renderer.js b/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/renderer.js
index 364254e5c..89137e3b2 100644
--- a/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/renderer.js
+++ b/test/compiler/fixtures-html/nested-tags/tags/test-nested-tags-overlay/renderer.js
@@ -1,13 +1,16 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var header = input.header;
     var body = input.body;
     var footer = input.footer;
 
-    template.render({
-        header: header,
-        body: body,
-        footer: footer
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            header: header,
+            body: body,
+            footer: footer
+        },
+        out
+    );
+};
diff --git a/test/compiler/fixtures-html/replaceWith/marko.json b/test/compiler/fixtures-html/replaceWith/marko.json
index e85a78200..7720f87ea 100644
--- a/test/compiler/fixtures-html/replaceWith/marko.json
+++ b/test/compiler/fixtures-html/replaceWith/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/marko-tag.json b/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/marko-tag.json
index 04df1f56d..afd8aa3d0 100644
--- a/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/marko-tag.json
+++ b/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "transformer": "./transformer.js"
-}
\ No newline at end of file
+}
diff --git a/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/transformer.js b/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/transformer.js
index 5c6c1d293..2bf9e6b8a 100644
--- a/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/transformer.js
+++ b/test/compiler/fixtures-html/replaceWith/tags/test-replaceWith/transformer.js
@@ -1,7 +1,7 @@
 module.exports = function transform(el, context) {
-    var div = context.builder.htmlElement('div', {
-        replaced: context.builder.literal('test-replaceWith')
+    var div = context.builder.htmlElement("div", {
+        replaced: context.builder.literal("test-replaceWith")
     });
 
     el.replaceWith(div);
-};
\ No newline at end of file
+};
diff --git a/test/compiler/fixtures-html/static-tag-custom-root-element/components/wrapper/transformer.js b/test/compiler/fixtures-html/static-tag-custom-root-element/components/wrapper/transformer.js
index ba73b17eb..25646f56a 100644
--- a/test/compiler/fixtures-html/static-tag-custom-root-element/components/wrapper/transformer.js
+++ b/test/compiler/fixtures-html/static-tag-custom-root-element/components/wrapper/transformer.js
@@ -1,13 +1,13 @@
-module.exports = function (el, context) {
-  var builder = context.builder;
-  var rootNode = builder.containerNode(function () {
-    return context.createNodeForEl({
-      tagName: "div",
-      body: rootNode.body
+module.exports = function(el, context) {
+    var builder = context.builder;
+    var rootNode = builder.containerNode(function() {
+        return context.createNodeForEl({
+            tagName: "div",
+            body: rootNode.body
+        });
     });
-  });
 
-  context.root.moveChildrenTo(rootNode);
-  context.root.appendChild(rootNode);
-  el.detach();
-}
+    context.root.moveChildrenTo(rootNode);
+    context.root.appendChild(rootNode);
+    el.detach();
+};
diff --git a/test/compiler/fixtures-vdom/dependencies/components/dependency/transformer.js b/test/compiler/fixtures-vdom/dependencies/components/dependency/transformer.js
index 053189c6d..5c687ef84 100644
--- a/test/compiler/fixtures-vdom/dependencies/components/dependency/transformer.js
+++ b/test/compiler/fixtures-vdom/dependencies/components/dependency/transformer.js
@@ -1,4 +1,4 @@
-module.exports = function (el, context) {
+module.exports = function(el, context) {
     el.detach();
     context.addDependency(eval(el.argument));
-};
\ No newline at end of file
+};
diff --git a/test/compiler/fixtures-vdom/dependencies/test.js b/test/compiler/fixtures-vdom/dependencies/test.js
index 4534d78a1..88f4ead46 100644
--- a/test/compiler/fixtures-vdom/dependencies/test.js
+++ b/test/compiler/fixtures-vdom/dependencies/test.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.checkTemplate = function (compiledTemplate) {
-    expect(compiledTemplate.dependencies).to.eql([{
-        type: 'require',
-        run: true,
-        path: __filename
-    }]);
-};
\ No newline at end of file
+exports.checkTemplate = function(compiledTemplate) {
+    expect(compiledTemplate.dependencies).to.eql([
+        {
+            type: "require",
+            run: true,
+            path: __filename
+        }
+    ]);
+};
diff --git a/test/compiler/html.test.js b/test/compiler/html.test.js
index 5100ac1e1..2d98f8634 100644
--- a/test/compiler/html.test.js
+++ b/test/compiler/html.test.js
@@ -1,15 +1,15 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
-var fs = require('fs');
+var path = require("path");
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-const EXTENSIONS = ['.marko', '.xml.marko'];
+const EXTENSIONS = [".marko", ".xml.marko"];
 
 function runTestForExtension(dir, helpers, extension, done) {
     var templatePath = path.join(dir, `template${extension}`);
@@ -18,14 +18,18 @@ function runTestForExtension(dir, helpers, extension, done) {
         return false;
     }
 
-    var mainPath = path.join(dir, 'test.js');
+    var mainPath = path.join(dir, "test.js");
     var main;
 
     if (fs.existsSync(mainPath)) {
         main = require(mainPath);
     }
 
-    var compilerOptions = { output: 'html', writeVersionComment: false, autoKeyEnabled: true };
+    var compilerOptions = {
+        output: "html",
+        writeVersionComment: false,
+        autoKeyEnabled: true
+    };
 
     if (main && main.checkError) {
         var e;
@@ -37,27 +41,33 @@ function runTestForExtension(dir, helpers, extension, done) {
         }
 
         if (!e) {
-            throw new Error('Error expected');
+            throw new Error("Error expected");
         }
 
         main.checkError(e);
         done();
     } else if (main && main.checkTemplate) {
-        var template = require('marko').load(templatePath, Object.assign(compilerOptions, main.compilerOptions));
+        var template = require("marko").load(
+            templatePath,
+            Object.assign(compilerOptions, main.compilerOptions)
+        );
         main.checkTemplate(template, helpers);
         done();
     } else {
-        var compiledSrc = compiler.compileFile(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
-        compiledSrc = compiledSrc.replace(/marko\/dist\//g, 'marko/src/');
-        helpers.compare(compiledSrc, '.js');
+        var compiledSrc = compiler.compileFile(
+            templatePath,
+            Object.assign(compilerOptions, main && main.compilerOptions)
+        );
+        compiledSrc = compiledSrc.replace(/marko\/dist\//g, "marko/src/");
+        helpers.compare(compiledSrc, ".js");
         done();
     }
 
     return true;
 }
 
-describe('compiler (html)', function () {
-    var autoTestDir = path.join(__dirname, './fixtures-html');
+describe("compiler (html)", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures-html");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
         for (let i = 0; i < EXTENSIONS.length; i++) {
diff --git a/test/compiler/vdom.test.js b/test/compiler/vdom.test.js
index a5ac370d8..3cbec8b05 100644
--- a/test/compiler/vdom.test.js
+++ b/test/compiler/vdom.test.js
@@ -1,27 +1,30 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
-var fs = require('fs');
+var path = require("path");
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('compiler (vdom)', function () {
-    var autoTestDir = path.join(__dirname, './fixtures-vdom');
+describe("compiler (vdom)", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures-vdom");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var templatePath = path.join(dir, 'template.marko');
-        var mainPath = path.join(dir, 'test.js');
+        var templatePath = path.join(dir, "template.marko");
+        var mainPath = path.join(dir, "test.js");
         var main;
 
         if (fs.existsSync(mainPath)) {
             main = require(mainPath);
         }
 
-        var compilerOptions = { writeVersionComment: false, autoKeyEnabled: true };
+        var compilerOptions = {
+            writeVersionComment: false,
+            autoKeyEnabled: true
+        };
 
         if (main && main.checkError) {
             var e;
@@ -33,20 +36,23 @@ describe('compiler (vdom)', function () {
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
             done();
         } else {
-            var compiledTemplate = compiler.compileFileForBrowser(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
+            var compiledTemplate = compiler.compileFileForBrowser(
+                templatePath,
+                Object.assign(compilerOptions, main && main.compilerOptions)
+            );
 
             if (main && main.checkTemplate) {
                 main.checkTemplate(compiledTemplate);
             } else {
                 var actualSrc = compiledTemplate.code;
-                actualSrc = actualSrc.replace(/marko\/dist\//g, 'marko/src/');
-                helpers.compare(actualSrc, '.js');
+                actualSrc = actualSrc.replace(/marko\/dist\//g, "marko/src/");
+                helpers.compare(actualSrc, ".js");
             }
 
             done();
diff --git a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/index.js b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/index.js
index e10c78c2c..144d614d4 100644
--- a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/index.js
+++ b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-	handleColorClick: function (event, el) {
-		this.color = el.getAttribute('data-color');
-	}
-});
\ No newline at end of file
+    handleColorClick: function(event, el) {
+        this.color = el.getAttribute("data-color");
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/test.js b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/test.js
index 46663284c..841511d64 100644
--- a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/test.js
+++ b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-bubbling/test.js
@@ -1,19 +1,18 @@
-var path = require('path');
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = widget.el.querySelectorAll('li');
+    var liEls = widget.el.querySelectorAll("li");
 
-    helpers.triggerMouseEvent(liEls[0], 'click');
-    expect(widget.color).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "click");
+    expect(widget.color).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'click');
-    expect(widget.color).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "click");
+    expect(widget.color).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'click');
-    expect(widget.color).to.equal('blue');
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "click");
+    expect(widget.color).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/index.js b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/index.js
index 97d5c622e..9beb3c946 100644
--- a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/index.js
+++ b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-	handleColorMouseOver: function (event, el) {
-		this.color = el.getAttribute('data-color');
-	}
-});
\ No newline at end of file
+    handleColorMouseOver: function(event, el) {
+        this.color = el.getAttribute("data-color");
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/test.js b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/test.js
index 2544769e1..e339811a8 100644
--- a/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/test.js
+++ b/test/components-browser/fixtures-deprecated/dom-events-repeated-el-non-bubbling/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = widget.el.querySelectorAll('li');
+    var liEls = widget.el.querySelectorAll("li");
 
-    helpers.triggerMouseEvent(liEls[0], 'mouseover');
-    expect(widget.color).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "mouseover");
+    expect(widget.color).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'mouseover');
-    expect(widget.color).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "mouseover");
+    expect(widget.color).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'mouseover');
-    expect(widget.color).to.equal('blue');
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "mouseover");
+    expect(widget.color).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures-deprecated/for-key-repeated/test.js b/test/components-browser/fixtures-deprecated/for-key-repeated/test.js
index bfe90b2c1..f8528732f 100644
--- a/test/components-browser/fixtures-deprecated/for-key-repeated/test.js
+++ b/test/components-browser/fixtures-deprecated/for-key-repeated/test.js
@@ -1,28 +1,31 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var fields = [{
-        value: 'name',
-        label: 'Name'
-    }, {
-        value: 'age',
-        label: 'Age'
-    }];
+module.exports = function(helpers) {
+    var fields = [
+        {
+            value: "name",
+            label: "Name"
+        },
+        {
+            value: "age",
+            label: "Age"
+        }
+    ];
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         fields: fields
     });
 
-    var inputs = component.getEl('root').querySelectorAll('input');
-    var labels = component.getEl('root').querySelectorAll('label');
+    var inputs = component.getEl("root").querySelectorAll("input");
+    var labels = component.getEl("root").querySelectorAll("label");
 
     expect(inputs.length).to.equal(fields.length);
 
     for (var i = 0; i < fields.length; i++) {
         var input = inputs[i];
         var label = labels[i];
-        expect(label.getAttribute('for')).to.equal(input.id);
+        expect(label.getAttribute("for")).to.equal(input.id);
         expect(input.value).to.equal(fields[i].value);
         expect(label.innerHTML).to.equal(fields[i].label);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/lifecyle-hooks-constructor/test.js b/test/components-browser/fixtures-deprecated/lifecyle-hooks-constructor/test.js
index 1abd1c74c..ec78a7196 100644
--- a/test/components-browser/fixtures-deprecated/lifecyle-hooks-constructor/test.js
+++ b/test/components-browser/fixtures-deprecated/lifecyle-hooks-constructor/test.js
@@ -1,22 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.onInputCalls).to.deep.equal([{
-        name: 'INITIAL'
-    }]);
-    expect(component.name).to.equal('Frank');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.onInputCalls).to.deep.equal([
+        {
+            name: "INITIAL"
+        }
+    ]);
+    expect(component.name).to.equal("Frank");
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(component.onInputCalls).to.deep.equal([{
-        name: 'INITIAL'
-    }, {
-        name: 'Frank'
-    }]);
+    expect(component.onInputCalls).to.deep.equal([
+        {
+            name: "INITIAL"
+        },
+        {
+            name: "Frank"
+        }
+    ]);
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('John');
-    expect(component.name).to.equal('John');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".name").innerHTML).to.equal("John");
+    expect(component.name).to.equal("John");
+};
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/index.js b/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/index.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/test.js b/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/test.js
index 236631090..dc2a5042e 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/test.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-body-no-id/test.js
@@ -1,21 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var widget = helpers.mount(require.resolve('./index'), {
+    var widget = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "0"
+    );
+    expect(
+        widget.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     widget.rerender({
         counter: ++counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('1');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "1"
+    );
+    expect(
+        widget.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("1");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-body/index.js b/test/components-browser/fixtures-deprecated/preserve-dom-body/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-body/index.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-body/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-body/test.js b/test/components-browser/fixtures-deprecated/preserve-dom-body/test.js
index bc1efefcf..b1a39c211 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-body/test.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-body/test.js
@@ -1,21 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var widget = helpers.mount(require.resolve('./index'), {
+    var widget = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "0"
+    );
+    expect(widget.getEl("preserve").getAttribute("data-counter")).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     widget.rerender({
         counter: ++counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('1');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "1"
+    );
+    expect(widget.getEl("preserve").getAttribute("data-counter")).to.equal("1");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-no-id/index.js b/test/components-browser/fixtures-deprecated/preserve-dom-no-id/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-no-id/index.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-no-id/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom-no-id/test.js b/test/components-browser/fixtures-deprecated/preserve-dom-no-id/test.js
index 23c09cb47..43f8088c8 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom-no-id/test.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom-no-id/test.js
@@ -1,21 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var widget = helpers.mount(require.resolve('./index'), {
+    var widget = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "0"
+    );
+    expect(
+        widget.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     widget.rerender({
         counter: ++counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "1"
+    );
+    expect(
+        widget.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom/index.js b/test/components-browser/fixtures-deprecated/preserve-dom/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom/index.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/preserve-dom/test.js b/test/components-browser/fixtures-deprecated/preserve-dom/test.js
index 938982da7..90c505325 100644
--- a/test/components-browser/fixtures-deprecated/preserve-dom/test.js
+++ b/test/components-browser/fixtures-deprecated/preserve-dom/test.js
@@ -1,21 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var widget = helpers.mount(require.resolve('./index'), {
+    var widget = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "0"
+    );
+    expect(widget.getEl("preserve").getAttribute("data-counter")).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     widget.rerender({
         counter: ++counter
     });
 
-    expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(widget.el.querySelector(".unpreserved-counter").innerHTML).to.equal(
+        "1"
+    );
+    expect(widget.getEl("preserve").getAttribute("data-counter")).to.equal("0");
+    expect(widget.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/repeated-with-label-ref/test.js b/test/components-browser/fixtures-deprecated/repeated-with-label-ref/test.js
index 1a7d79527..5e55419bf 100644
--- a/test/components-browser/fixtures-deprecated/repeated-with-label-ref/test.js
+++ b/test/components-browser/fixtures-deprecated/repeated-with-label-ref/test.js
@@ -1,22 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        fields: [{
-            value: 'name',
-            label: 'Name'
-        }, {
-            value: 'age',
-            label: 'Age'
-        }]
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        fields: [
+            {
+                value: "name",
+                label: "Name"
+            },
+            {
+                value: "age",
+                label: "Age"
+            }
+        ]
     });
 
     var inputs = [];
 
     for (var i = 0; i < 2; i++) {
-        inputs.push(widget.getEl('field[' + i + ']'));
+        inputs.push(widget.getEl("field[" + i + "]"));
     }
 
     expect(inputs.length).to.equal(2);
-    expect(inputs[0].value).to.equal('name');
-};
\ No newline at end of file
+    expect(inputs[0].value).to.equal("name");
+};
diff --git a/test/components-browser/fixtures-deprecated/sanity-check/index.js b/test/components-browser/fixtures-deprecated/sanity-check/index.js
index 83bc872bb..644503b86 100644
--- a/test/components-browser/fixtures-deprecated/sanity-check/index.js
+++ b/test/components-browser/fixtures-deprecated/sanity-check/index.js
@@ -1,14 +1,14 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getInitialState: function(input) {
         return {
             name: input.name
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return state;
     },
-    setName: function (newName) {
-        this.setState('name', newName);
+    setName: function(newName) {
+        this.setState("name", newName);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/sanity-check/test.js b/test/components-browser/fixtures-deprecated/sanity-check/test.js
index dfaa7485b..5a5381659 100644
--- a/test/components-browser/fixtures-deprecated/sanity-check/test.js
+++ b/test/components-browser/fixtures-deprecated/sanity-check/test.js
@@ -1,13 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), { name: "Frank" });
 
-    var widget = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+    expect(widget.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(widget.el.innerHTML).to.contain('Hello Frank!');
-
-    widget.setName('Jane');
+    widget.setName("Jane");
     widget.update();
 
-    expect(widget.el.innerHTML).to.contain('Hello Jane!');
-};
\ No newline at end of file
+    expect(widget.el.innerHTML).to.contain("Hello Jane!");
+};
diff --git a/test/components-browser/fixtures-deprecated/update-manager-batch-updates/index.js b/test/components-browser/fixtures-deprecated/update-manager-batch-updates/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/update-manager-batch-updates/index.js
+++ b/test/components-browser/fixtures-deprecated/update-manager-batch-updates/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/update-manager-batch-updates/test.js b/test/components-browser/fixtures-deprecated/update-manager-batch-updates/test.js
index 4144f1a88..c4ea7f1f5 100644
--- a/test/components-browser/fixtures-deprecated/update-manager-batch-updates/test.js
+++ b/test/components-browser/fixtures-deprecated/update-manager-batch-updates/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    expect(widget.el.className).to.contain('large');
-    expect(widget.el.innerHTML).to.contain('Initial Label');
+    expect(widget.el.className).to.contain("large");
+    expect(widget.el.innerHTML).to.contain("Initial Label");
 
-    widget.setSize('small');
+    widget.setSize("small");
     widget.update();
 
-    expect(widget.el.className).to.contain('small');
-};
\ No newline at end of file
+    expect(widget.el.className).to.contain("small");
+};
diff --git a/test/components-browser/fixtures-deprecated/update-manager-next-tick/index.js b/test/components-browser/fixtures-deprecated/update-manager-next-tick/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/update-manager-next-tick/index.js
+++ b/test/components-browser/fixtures-deprecated/update-manager-next-tick/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/update-manager-next-tick/test.js b/test/components-browser/fixtures-deprecated/update-manager-next-tick/test.js
index 93ff7d099..ec8b70864 100644
--- a/test/components-browser/fixtures-deprecated/update-manager-next-tick/test.js
+++ b/test/components-browser/fixtures-deprecated/update-manager-next-tick/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers, done) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    widget.onUpdate = function () {
-        expect(widget.el.className).to.contain('small');
+    widget.onUpdate = function() {
+        expect(widget.el.className).to.contain("small");
         done();
     };
 
-    expect(widget.el.className).to.contain('large');
-    widget.setSize('small');
-    expect(widget.el.className).to.not.contain('small');
-};
\ No newline at end of file
+    expect(widget.el.className).to.contain("large");
+    widget.setSize("small");
+    expect(widget.el.className).to.not.contain("small");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-api/index.js b/test/components-browser/fixtures-deprecated/widget-api/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-api/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-api/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-api/test.js b/test/components-browser/fixtures-deprecated/widget-api/test.js
index 9a91c037d..72d7967a6 100644
--- a/test/components-browser/fixtures-deprecated/widget-api/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-api/test.js
@@ -1,24 +1,24 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.id).to.be.a('string');
-    expect(widget.emit).to.be.a('function');
-    expect(widget.on).to.be.a('function');
-    expect(widget.once).to.be.a('function');
-    expect(widget.subscribeTo).to.be.a('function');
-    expect(widget.getElId).to.be.a('function');
-    expect(widget.elId).to.be.a('function');
-    expect(widget.getEl).to.be.a('function');
-    expect(widget.destroy).to.be.a('function');
-    expect(widget.isDestroyed).to.be.a('function');
-    expect(widget.rerender).to.be.a('function');
-    expect(widget.appendTo).to.be.a('function');
-    expect(widget.replace).to.be.a('function');
-    expect(widget.replaceChildrenOf).to.be.a('function');
-    expect(widget.insertBefore).to.be.a('function');
-    expect(widget.insertAfter).to.be.a('function');
-    expect(widget.prependTo).to.be.a('function');
-    expect(widget.ready).to.be.a('function');
-    expect(widget.$).to.be.a('function');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.id).to.be.a("string");
+    expect(widget.emit).to.be.a("function");
+    expect(widget.on).to.be.a("function");
+    expect(widget.once).to.be.a("function");
+    expect(widget.subscribeTo).to.be.a("function");
+    expect(widget.getElId).to.be.a("function");
+    expect(widget.elId).to.be.a("function");
+    expect(widget.getEl).to.be.a("function");
+    expect(widget.destroy).to.be.a("function");
+    expect(widget.isDestroyed).to.be.a("function");
+    expect(widget.rerender).to.be.a("function");
+    expect(widget.appendTo).to.be.a("function");
+    expect(widget.replace).to.be.a("function");
+    expect(widget.replaceChildrenOf).to.be.a("function");
+    expect(widget.insertBefore).to.be.a("function");
+    expect(widget.insertAfter).to.be.a("function");
+    expect(widget.prependTo).to.be.a("function");
+    expect(widget.ready).to.be.a("function");
+    expect(widget.$).to.be.a("function");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-bind-different-roots/index.js b/test/components-browser/fixtures-deprecated/widget-bind-different-roots/index.js
index 51ad1514a..6e856212c 100644
--- a/test/components-browser/fixtures-deprecated/widget-bind-different-roots/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-bind-different-roots/index.js
@@ -1,13 +1,13 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
     getInitialState: function(input) {
-        return { interactive:input.interactive }
+        return { interactive: input.interactive };
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             interactive: state.interactive
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-bind-different-roots/test.js b/test/components-browser/fixtures-deprecated/widget-bind-different-roots/test.js
index fedf63d0b..e5400578f 100644
--- a/test/components-browser/fixtures-deprecated/widget-bind-different-roots/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-bind-different-roots/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
         interactive: true
     });
 
     expect(widget.el).to.be.instanceOf(HTMLButtonElement);
 
-    widget.setState('interactive', false);
+    widget.setState("interactive", false);
     widget.update();
 
     expect(widget.el).to.be.instanceOf(HTMLDivElement);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-conditional/index.js b/test/components-browser/fixtures-deprecated/widget-conditional/index.js
index 052755198..b5de18bc6 100644
--- a/test/components-browser/fixtures-deprecated/widget-conditional/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-conditional/index.js
@@ -1,11 +1,11 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state, input) {
         return {
             includeWidget: input.includeWidget
         };
     },
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-conditional/test.js b/test/components-browser/fixtures-deprecated/widget-conditional/test.js
index 7e30089d2..855ee6f9f 100644
--- a/test/components-browser/fixtures-deprecated/widget-conditional/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-conditional/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
         includeWidget: false
     });
 
     expect(widget == null).to.equal(true);
 
-    expect(helpers.targetEl.innerHTML).contain('[app-conditional-widget]');
+    expect(helpers.targetEl.innerHTML).contain("[app-conditional-widget]");
 
-    widget = helpers.mount(require.resolve('./index'), {
+    widget = helpers.mount(require.resolve("./index"), {
         includeWidget: true
     });
 
     expect(widget != null).to.equal(true);
 };
 
-module.exports.failHydrate = true;
\ No newline at end of file
+module.exports.failHydrate = true;
diff --git a/test/components-browser/fixtures-deprecated/widget-config-attr/index.js b/test/components-browser/fixtures-deprecated/widget-config-attr/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-attr/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-attr/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-config-attr/renderer.js b/test/components-browser/fixtures-deprecated/widget-config-attr/renderer.js
index 8c9d74cb8..714430eee 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-attr/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-attr/renderer.js
@@ -1,18 +1,18 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var viewModel = {};
     var config = {
-        string: 'world',
+        string: "world",
         number: 12,
         boolean: true,
         complex: {
-            a: '<\"hello">',
-            b: 'test'
+            a: '<"hello">',
+            b: "test"
         }
     };
 
     viewModel._widgetConfig = config;
 
     template.render(viewModel, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-config-attr/test.js b/test/components-browser/fixtures-deprecated/widget-config-attr/test.js
index b8ddacf6f..943cbfbda 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-attr/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-attr/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     expect(widget.config).to.deep.equal({
-        string: 'world',
+        string: "world",
         number: 12,
         boolean: true,
         complex: {
-            a: '<\"hello">',
-            b: 'test'
+            a: '<"hello">',
+            b: "test"
         }
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-config-attr/widget.js b/test/components-browser/fixtures-deprecated/widget-config-attr/widget.js
index f2763667b..35e997a94 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-attr/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-attr/widget.js
@@ -1,8 +1,8 @@
 function Widget(config) {
-    this.name = 'app-widget-config';
+    this.name = "app-widget-config";
     this.config = config;
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/index.js b/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/index.js
index 8464b3be4..559e4a320 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/index.js
@@ -1,19 +1,19 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getWidgetConfig: function (input) {
+    getWidgetConfig: function(input) {
         return {
             string: input.name,
             number: 12,
             boolean: true,
             complex: {
-                a: '<\"hello">',
-                b: 'test'
+                a: '<"hello">',
+                b: "test"
             }
         };
     },
 
-    init: function (config) {
+    init: function(config) {
         this.config = config;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/test.js b/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/test.js
index 549057773..da9ac9e9c 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-getWidgetConfig/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
     expect(widget.config).to.deep.equal({
-        string: 'Frank',
+        string: "Frank",
         number: 12,
         boolean: true,
         complex: {
-            a: '<\"hello">',
-            b: 'test'
+            a: '<"hello">',
+            b: "test"
         }
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-config-template-data/index.js b/test/components-browser/fixtures-deprecated/widget-config-template-data/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-template-data/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-template-data/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-config-template-data/renderer.js b/test/components-browser/fixtures-deprecated/widget-config-template-data/renderer.js
index b9392d947..1e8fe8790 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-template-data/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-template-data/renderer.js
@@ -1,17 +1,17 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var templateData = {
         widgetConfig: {
-            string: 'world',
+            string: "world",
             number: 12,
             boolean: true,
             complex: {
-                a: '<\"hello">',
-                b: 'test'
+                a: '<"hello">',
+                b: "test"
             }
         }
     };
 
     template.render(templateData, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-config-template-data/test.js b/test/components-browser/fixtures-deprecated/widget-config-template-data/test.js
index b8ddacf6f..943cbfbda 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-template-data/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-template-data/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     expect(widget.config).to.deep.equal({
-        string: 'world',
+        string: "world",
         number: 12,
         boolean: true,
         complex: {
-            a: '<\"hello">',
-            b: 'test'
+            a: '<"hello">',
+            b: "test"
         }
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-config-template-data/widget.js b/test/components-browser/fixtures-deprecated/widget-config-template-data/widget.js
index f2763667b..35e997a94 100644
--- a/test/components-browser/fixtures-deprecated/widget-config-template-data/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-config-template-data/widget.js
@@ -1,8 +1,8 @@
 function Widget(config) {
-    this.name = 'app-widget-config';
+    this.name = "app-widget-config";
     this.config = config;
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/renderer.js
index 13ddf6bd5..945033f42 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/renderer.js
@@ -1,11 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
-    var label = input.label || 'BAR';
-    template.render({
-        label: label,
-        widgetConfig: {
-            label: label
-        }
-    }, out);
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    var label = input.label || "BAR";
+    template.render(
+        {
+            label: label,
+            widgetConfig: {
+                label: label
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/widget.js
index dc7d36b0c..865e7a69f 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-bar/widget.js
@@ -1,18 +1,18 @@
 function Widget(config) {
     this.label = config.label;
-    this.name = 'app-bar';
+    this.name = "app-bar";
 
     var $el = this.$();
 
-    this.appendHtml = function (html) {
+    this.appendHtml = function(html) {
         $el.append(html);
     };
 }
 
 Widget.prototype = {
-    emitTestEvent: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent: function() {
+        this.emit("testEvent", "a", "b");
     }
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/renderer.js
index 7b5b63b49..44dec121d 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/renderer.js
@@ -1,14 +1,16 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var channel = input.channel;
     var name = input.name;
 
-    template.render({
-
-        widgetConfig: {
-            name: name,
-            channel: channel
-        }
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            widgetConfig: {
+                name: name,
+                channel: channel
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/widget.js
index 52f942181..ba561b41e 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/components/app-custom-events/widget.js
@@ -1,23 +1,23 @@
-var pubsub = require('../../../../../__util__/pubsub');
+var pubsub = require("../../../../../__util__/pubsub");
 
 function Widget(config) {
     this.name = config.name;
     var self = this;
 
     if (config.channel) {
-        pubsub.channel(config.channel).on('emitTestEvent2', function () {
+        pubsub.channel(config.channel).on("emitTestEvent2", function() {
             self.emitTestEvent2();
         });
     }
 }
 
 Widget.prototype = {
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
 };
 
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/index.js
index 9774d904c..85118d5aa 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/index.js
@@ -1,3 +1,3 @@
 // Export a render(input) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/marko.json b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/renderer.js
index 6677e570f..f024d46d5 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/test.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/test.js
index 6ecd7330b..37ced7b94 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/test.js
@@ -1,36 +1,36 @@
-var expect = require('chai').expect;
-var pubsub = require('../../../__util__/pubsub');
+var expect = require("chai").expect;
+var pubsub = require("../../../__util__/pubsub");
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var received1 = [];
     var received2 = [];
 
-    widget.handleTestEvent1 = function () {
+    widget.handleTestEvent1 = function() {
         received1.push({
             args: arguments,
             widget: arguments[arguments.length - 1]
         });
     };
 
-    widget.handleTestEvent2 = function () {
+    widget.handleTestEvent2 = function() {
         received2.push({
             args: arguments,
             widget: arguments[arguments.length - 1]
         });
     };
 
-    widget.getWidget('customEvents').emitTestEvent1();
+    widget.getWidget("customEvents").emitTestEvent1();
     expect(received1.length).to.equal(1);
     expect(received1[0].args.length).to.equal(3); // ['a', 'b', sourceWidget]
-    expect(received1[0].widget).to.equal(widget.getWidget('customEvents'));
+    expect(received1[0].widget).to.equal(widget.getWidget("customEvents"));
 
-    pubsub.channel('customEvents-' + widget.id).emit('emitTestEvent2');
+    pubsub.channel("customEvents-" + widget.id).emit("emitTestEvent2");
 
     expect(received1.length).to.equal(1);
     expect(received2.length).to.equal(1);
 
     expect(received2[0].args.length).to.equal(1); // [sourceWidget]
-    expect(received2[0].widget).to.be.an('object');
+    expect(received2[0].widget).to.be.an("object");
 };
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/widget.js
index 4966b4018..789c04905 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events-declarative/widget.js
@@ -1,9 +1,9 @@
 function Widget(config) {
-    this.name = 'app-foo';
+    this.name = "app-foo";
     this.config = config;
-    this.getWidget('bar').appendHtml('FOO');
+    this.getWidget("bar").appendHtml("FOO");
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/renderer.js
index 13ddf6bd5..945033f42 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/renderer.js
@@ -1,11 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
-    var label = input.label || 'BAR';
-    template.render({
-        label: label,
-        widgetConfig: {
-            label: label
-        }
-    }, out);
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    var label = input.label || "BAR";
+    template.render(
+        {
+            label: label,
+            widgetConfig: {
+                label: label
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/widget.js
index dc7d36b0c..865e7a69f 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-bar/widget.js
@@ -1,18 +1,18 @@
 function Widget(config) {
     this.label = config.label;
-    this.name = 'app-bar';
+    this.name = "app-bar";
 
     var $el = this.$();
 
-    this.appendHtml = function (html) {
+    this.appendHtml = function(html) {
         $el.append(html);
     };
 }
 
 Widget.prototype = {
-    emitTestEvent: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent: function() {
+        this.emit("testEvent", "a", "b");
     }
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/renderer.js
index 7b5b63b49..44dec121d 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/renderer.js
@@ -1,14 +1,16 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var channel = input.channel;
     var name = input.name;
 
-    template.render({
-
-        widgetConfig: {
-            name: name,
-            channel: channel
-        }
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            widgetConfig: {
+                name: name,
+                channel: channel
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/widget.js
index 52f942181..ba561b41e 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/components/app-custom-events/widget.js
@@ -1,23 +1,23 @@
-var pubsub = require('../../../../../__util__/pubsub');
+var pubsub = require("../../../../../__util__/pubsub");
 
 function Widget(config) {
     this.name = config.name;
     var self = this;
 
     if (config.channel) {
-        pubsub.channel(config.channel).on('emitTestEvent2', function () {
+        pubsub.channel(config.channel).on("emitTestEvent2", function() {
             self.emitTestEvent2();
         });
     }
 }
 
 Widget.prototype = {
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
 };
 
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-custom-events/index.js
index 9774d904c..85118d5aa 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/marko.json b/test/components-browser/fixtures-deprecated/widget-custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-custom-events/renderer.js
index 6677e570f..f024d46d5 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/test.js b/test/components-browser/fixtures-deprecated/widget-custom-events/test.js
index e3811283c..f810b6abd 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var testEventFired = false;
 
-    widget.getWidget('bar').on('testEvent', function (a, b) {
-        expect(a).to.equal('a');
-        expect(b).to.equal('b');
+    widget.getWidget("bar").on("testEvent", function(a, b) {
+        expect(a).to.equal("a");
+        expect(b).to.equal("b");
         testEventFired = true;
     });
 
-    widget.getWidget('bar').emitTestEvent();
+    widget.getWidget("bar").emitTestEvent();
 
     expect(testEventFired).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-custom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-custom-events/widget.js
index 4966b4018..789c04905 100644
--- a/test/components-browser/fixtures-deprecated/widget-custom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-custom-events/widget.js
@@ -1,9 +1,9 @@
 function Widget(config) {
-    this.name = 'app-foo';
+    this.name = "app-foo";
     this.config = config;
-    this.getWidget('bar').appendHtml('FOO');
+    this.getWidget("bar").appendHtml("FOO");
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-detach/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-detach/index.js
index f773f4eae..d7fcf5076 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-detach/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-detach/index.js
@@ -1,3 +1,3 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko')
-});
\ No newline at end of file
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko")
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-detach/test.js b/test/components-browser/fixtures-deprecated/widget-destroy-detach/test.js
index 8c455e25d..cc4e75e11 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-detach/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-detach/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
     var el = widget.el;
 
     expect(widget.el.parentNode).to.equal(helpers.targetEl);
     widget.destroy();
     expect(widget.el == null).to.equal(true);
     expect(el.parentNode == null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/renderer.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/renderer.js
index 13ddf6bd5..945033f42 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/renderer.js
@@ -1,11 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
-    var label = input.label || 'BAR';
-    template.render({
-        label: label,
-        widgetConfig: {
-            label: label
-        }
-    }, out);
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    var label = input.label || "BAR";
+    template.render(
+        {
+            label: label,
+            widgetConfig: {
+                label: label
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/widget.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/widget.js
index b56be7991..4237c76fe 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-bar/widget.js
@@ -1,14 +1,14 @@
 function Widget(config) {
     this.label = config.label;
-    this.name = 'app-bar';
+    this.name = "app-bar";
 
     var $el = this.$();
 
-    this.appendHtml = function (html) {
+    this.appendHtml = function(html) {
         $el.append(html);
     };
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/renderer.js
index 7b5b63b49..44dec121d 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/renderer.js
@@ -1,14 +1,16 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var channel = input.channel;
     var name = input.name;
 
-    template.render({
-
-        widgetConfig: {
-            name: name,
-            channel: channel
-        }
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            widgetConfig: {
+                name: name,
+                channel: channel
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/widget.js
index 259487427..1fcff5843 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/components/app-custom-events/widget.js
@@ -4,4 +4,4 @@ function Widget(config) {
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/index.js
index 9774d904c..85118d5aa 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/index.js
@@ -1,3 +1,3 @@
 // Export a render(input) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/marko.json b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/renderer.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/renderer.js
index 6677e570f..f024d46d5 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/test.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/test.js
index 86004905b..b6b79e7bf 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    expect(widget.getWidget('bar') == null).to.equal(false);
+    expect(widget.getWidget("bar") == null).to.equal(false);
 
-    widget.getWidget('bar').destroy();
+    widget.getWidget("bar").destroy();
 
-    expect(widget.getWidget('bar') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(widget.getWidget("bar") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/widget.js b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/widget.js
index 4966b4018..789c04905 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-legacy/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-legacy/widget.js
@@ -1,9 +1,9 @@
 function Widget(config) {
-    this.name = 'app-foo';
+    this.name = "app-foo";
     this.config = config;
-    this.getWidget('bar').appendHtml('FOO');
+    this.getWidget("bar").appendHtml("FOO");
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/renderer.js b/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/renderer.js
index a3cdb9049..7877c6dc9 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/widget.js b/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/widget.js
index 0a341a10b..d355c09bc 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-ref/components/app-legacy-button/widget.js
@@ -1,7 +1,7 @@
-function Widget(config) {
-    this.name = 'app-legacy-button';
+function Widget() {
+    this.name = "app-legacy-button";
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-ref/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-ref/index.js
index 561ab3fef..bc0ea2ae9 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-ref/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-ref/index.js
@@ -1,17 +1,17 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function() {
         return {};
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function() {
         return {};
     },
 
-    destroyButton1: function (size) {
-        this.getWidget('button1').destroy();
+    destroyButton1: function() {
+        this.getWidget("button1").destroy();
     },
 
-    getButton1: function () {
-        return this.getWidget('button1');
+    getButton1: function() {
+        return this.getWidget("button1");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-ref/marko.json b/test/components-browser/fixtures-deprecated/widget-destroy-ref/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-ref/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-ref/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-ref/test.js b/test/components-browser/fixtures-deprecated/widget-destroy-ref/test.js
index ed1d8b91f..d555ae6d6 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-ref/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-ref/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var button1Widget = widget.getButton1();
     expect(button1Widget != null).to.equal(true);
@@ -10,5 +10,5 @@ module.exports = function (helpers) {
 
     button1Widget = widget.getButton1();
     expect(button1Widget === undefined).to.equal(true);
-    expect(widget.getWidget('simple') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(widget.getWidget("simple") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js
index 7b5b63b49..44dec121d 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/renderer.js
@@ -1,14 +1,16 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var channel = input.channel;
     var name = input.name;
 
-    template.render({
-
-        widgetConfig: {
-            name: name,
-            channel: channel
-        }
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            widgetConfig: {
+                name: name,
+                channel: channel
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js
index 52f942181..ba561b41e 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/components/app-custom-events/widget.js
@@ -1,23 +1,23 @@
-var pubsub = require('../../../../../__util__/pubsub');
+var pubsub = require("../../../../../__util__/pubsub");
 
 function Widget(config) {
     this.name = config.name;
     var self = this;
 
     if (config.channel) {
-        pubsub.channel(config.channel).on('emitTestEvent2', function () {
+        pubsub.channel(config.channel).on("emitTestEvent2", function() {
             self.emitTestEvent2();
         });
     }
 }
 
 Widget.prototype = {
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
 };
 
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/index.js
index 561ab3fef..bc0ea2ae9 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/index.js
@@ -1,17 +1,17 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function() {
         return {};
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function() {
         return {};
     },
 
-    destroyButton1: function (size) {
-        this.getWidget('button1').destroy();
+    destroyButton1: function() {
+        this.getWidget("button1").destroy();
     },
 
-    getButton1: function () {
-        return this.getWidget('button1');
+    getButton1: function() {
+        return this.getWidget("button1");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/marko.json b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/test.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/test.js
index 73e339501..f4204c370 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-custom-events/test.js
@@ -1,12 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    var customEventsWidget = helpers.mount(require.resolve('./components/app-custom-events'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    var customEventsWidget = helpers.mount(
+        require.resolve("./components/app-custom-events"),
+        {}
+    );
 
     var receivedEvents = [];
 
-    widget.subscribeTo(customEventsWidget).on('testEvent', function () {
+    widget.subscribeTo(customEventsWidget).on("testEvent", function() {
         receivedEvents.push(arguments);
     });
 
@@ -15,4 +18,4 @@ module.exports = function (helpers) {
     customEventsWidget.destroy();
     customEventsWidget.emitTestEvent2();
     expect(receivedEvents.length).to.equal(1);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/index.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/index.js
index 0e848c020..c9a995b5c 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/index.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-    init: function () {
+    init: function() {
         this.logOutput = [];
 
-        this.name = 'app-dom-events';
+        this.name = "app-dom-events";
 
         var slef = this;
         function log(data) {
@@ -14,19 +14,19 @@ module.exports = require('marko/legacy-components').defineComponent({
         }
 
         this.log = log;
-        this.clearLog = function () {
+        this.clearLog = function() {
             this.logOutput = [];
         };
 
         this.logOutput = [];
     },
 
-    handleFooLinkDblClick: function () {
-        this.log('#fooLink:dblclick');
+    handleFooLinkDblClick: function() {
+        this.log("#fooLink:dblclick");
     },
 
-    handleFooLinkMouseOut: function (event, el) {
+    handleFooLinkMouseOut: function(event, el) {
         expect(event.target).to.equal(el);
-        this.log('#fooLink:mouseout');
+        this.log("#fooLink:mouseout");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/test.js b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/test.js
index a33b6bae5..5e4269a1c 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy-unsubscribe-dom-events/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     // expect(Array.isArray(widget.___domEventListenerHandles)).to.equal(true);
 
     var el = widget.el;
-    var fooLink = widget.getEl('fooLink');
+    var fooLink = widget.getEl("fooLink");
 
     widget.destroy();
 
@@ -18,6 +18,6 @@ module.exports = function (helpers) {
 
     // Make sure there are no DOM event listeners
     widget.clearLog();
-    helpers.triggerMouseEvent(fooLink, 'mouseout');
+    helpers.triggerMouseEvent(fooLink, "mouseout");
     expect(widget.logOutput).to.deep.equal([]);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy/components/app-simple/index.js b/test/components-browser/fixtures-deprecated/widget-destroy/components/app-simple/index.js
index e8ab46839..c61db91a4 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy/components/app-simple/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy/components/app-simple/index.js
@@ -1,10 +1,10 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	}
-});
\ No newline at end of file
+    getTemplateData: function(state, input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy/index.js b/test/components-browser/fixtures-deprecated/widget-destroy/index.js
index 0b9d63b44..13e05dd1f 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy/index.js
@@ -1,9 +1,9 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			showSimple: input.showSimple == null ? true : input.showSimple
-		};
-	}
-});
\ No newline at end of file
+    getTemplateData: function(state, input) {
+        return {
+            showSimple: input.showSimple == null ? true : input.showSimple
+        };
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy/marko.json b/test/components-browser/fixtures-deprecated/widget-destroy/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-destroy/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-destroy/test.js b/test/components-browser/fixtures-deprecated/widget-destroy/test.js
index d0800994f..6cc444a8d 100644
--- a/test/components-browser/fixtures-deprecated/widget-destroy/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-destroy/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
         showSimple: true
     });
 
-    var simple = widget.getWidget('simple');
+    var simple = widget.getWidget("simple");
     var simpleDestroyed = false;
 
-    simple.onDestroy = function () {
+    simple.onDestroy = function() {
         simpleDestroyed = true;
     };
 
@@ -22,5 +22,5 @@ module.exports = function (helpers) {
     expect(simpleDestroyed).to.equal(true);
     expect(simple.isDestroyed()).to.equal(true);
 
-    expect(widget.getWidget('simple') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(widget.getWidget("simple") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/index.js b/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/index.js
index c94c4f18f..d3f1d5e89 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/index.js
@@ -1,15 +1,15 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {};
-	},
+    getTemplateData: function() {
+        return {};
+    },
 
-	init: function () {
-		this.counter = 0;
-	},
+    init: function() {
+        this.counter = 0;
+    },
 
-	handleMouseMove: function (event, el) {
-		el.innerHTML = '' + this.counter++;
-	}
-});
\ No newline at end of file
+    handleMouseMove: function(event, el) {
+        el.innerHTML = "" + this.counter++;
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/test.js b/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/test.js
index fa77490d6..768efdc06 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-event-listeners-repeated-non-bubbling/test.js
@@ -1,33 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-				var widget = helpers.mount(require.resolve('./index'), {
-								name: 'Frank',
-								count: 30
-				});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        count: 30
+    });
 
-				var li1 = widget.getEl('foo-0');
-				var li2 = widget.getEl('foo-1');
-				var li3 = widget.getEl('foo-2');
+    var li1 = widget.getEl("foo-0");
+    var li2 = widget.getEl("foo-1");
+    var li3 = widget.getEl("foo-2");
 
-				expect(li1.innerHTML).to.equal('red');
-				expect(li2.innerHTML).to.equal('green');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("red");
+    expect(li2.innerHTML).to.equal("green");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li1);
+    helpers.triggerMouseMove(li1);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('green');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("green");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li2);
+    helpers.triggerMouseMove(li2);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('1');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("1");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li3);
+    helpers.triggerMouseMove(li3);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('1');
-};
\ No newline at end of file
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("1");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/index.js b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/renderer.js b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/renderer.js
index f384fc6ea..a904ae5f5 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/test.js b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/test.js
index 919a24271..8f7d6499b 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/test.js
@@ -1,24 +1,24 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers, done) {
+    var widget = helpers.mount(require.resolve("./index"), {});
     var $el = widget.$();
-    var $button = widget.$('#button');
+    var $button = widget.$("#button");
 
-    $el.click(function () {
-        helpers.log('$el:click');
+    $el.click(function() {
+        helpers.log("$el:click");
     });
 
-    $button.click(function (event) {
+    $button.click(function(event) {
         event.stopPropagation();
-        helpers.log('$button:click');
+        helpers.log("$button:click");
     });
 
     // Trigger a click event on the root element
     helpers.triggerClick(widget.el);
-    helpers.triggerClick(widget.getEl('button'));
+    helpers.triggerClick(widget.getEl("button"));
 
-    expect(helpers.logOutput).to.deep.equal(['$el:click', '$button:click']);
+    expect(helpers.logOutput).to.deep.equal(["$el:click", "$button:click"]);
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/widget.js b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/widget.js
index 21ca4d267..b8a387f9c 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events-jquery/widget.js
@@ -1,3 +1,3 @@
-function Widget(config) {}
+function Widget() {}
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/renderer.js b/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/renderer.js
index a3cdb9049..7877c6dc9 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/widget.js b/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/widget.js
index 03061d4d6..c979ed957 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/components/app-legacy-button/widget.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-function Widget(config) {
-    this.name = 'app-legacy-button';
+function Widget() {
+    this.name = "app-legacy-button";
 
-    var logOutput = this.logOutput = [];
+    var logOutput = (this.logOutput = []);
 
     function log(data) {
         logOutput.push(data);
@@ -14,12 +14,12 @@ function Widget(config) {
 }
 
 Widget.prototype = {
-    handleRootMouseDown: function (event, el) {
+    handleRootMouseDown: function(event, el) {
         this.clicked = true;
-        expect(el.getAttribute('class')).to.equal('app-legacy-button');
-        this.log('click');
-        expect(this.name).to.equal('app-legacy-button');
+        expect(el.getAttribute("class")).to.equal("app-legacy-button");
+        this.log("click");
+        expect(this.name).to.equal("app-legacy-button");
     }
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/index.js b/test/components-browser/fixtures-deprecated/widget-dom-events/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/marko.json b/test/components-browser/fixtures-deprecated/widget-dom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/renderer.js b/test/components-browser/fixtures-deprecated/widget-dom-events/renderer.js
index f384fc6ea..a904ae5f5 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/test.js b/test/components-browser/fixtures-deprecated/widget-dom-events/test.js
index c3544bc71..ea46cb6a0 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/test.js
@@ -1,41 +1,50 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     widget.clearLog();
 
     // Trigger a click event on the root element
-    helpers.triggerMouseEvent(widget.el, 'click');
-    expect(widget.logOutput).to.deep.equal(['el:click']);
+    helpers.triggerMouseEvent(widget.el, "click");
+    expect(widget.logOutput).to.deep.equal(["el:click"]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(widget.getEl('button'), 'click');
-    expect(widget.logOutput).to.deep.equal(['button:click', 'el:click']);
+    helpers.triggerMouseEvent(widget.getEl("button"), "click");
+    expect(widget.logOutput).to.deep.equal(["button:click", "el:click"]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(widget.getEl('button').firstElementChild, 'click');
-    expect(widget.logOutput).to.deep.equal(['button:click', 'el:click']);
+    helpers.triggerMouseEvent(
+        widget.getEl("button").firstElementChild,
+        "click"
+    );
+    expect(widget.logOutput).to.deep.equal(["button:click", "el:click"]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(widget.el, 'mousemove');
-    expect(widget.logOutput).to.deep.equal(['el:mousemove']);
+    helpers.triggerMouseEvent(widget.el, "mousemove");
+    expect(widget.logOutput).to.deep.equal(["el:mousemove"]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(widget.getEl('button').firstElementChild, 'mousemove');
-    expect(widget.logOutput).to.deep.equal(['button>span:mousemove', 'el:mousemove']);
+    helpers.triggerMouseEvent(
+        widget.getEl("button").firstElementChild,
+        "mousemove"
+    );
+    expect(widget.logOutput).to.deep.equal([
+        "button>span:mousemove",
+        "el:mousemove"
+    ]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(document.getElementById('fooLink'), 'dblclick');
-    expect(widget.logOutput).to.deep.equal(['#fooLink:dblclick']);
+    helpers.triggerMouseEvent(document.getElementById("fooLink"), "dblclick");
+    expect(widget.logOutput).to.deep.equal(["#fooLink:dblclick"]);
 
     widget.clearLog();
-    helpers.triggerMouseEvent(document.getElementById('fooLink'), 'mouseout');
-    expect(widget.logOutput).to.deep.equal(['#fooLink:mouseout']);
+    helpers.triggerMouseEvent(document.getElementById("fooLink"), "mouseout");
+    expect(widget.logOutput).to.deep.equal(["#fooLink:mouseout"]);
 
     widget.clearLog();
-    expect(widget.getWidget('appButton').clicked).to.equal(false);
-    helpers.triggerMouseEvent(widget.getEl('helloWorld'), 'mousedown');
-    expect(widget.logOutput).to.deep.equal(['#helloWorld:mousedown']);
-    expect(widget.getWidget('appButton').clicked).to.equal(true);
-};
\ No newline at end of file
+    expect(widget.getWidget("appButton").clicked).to.equal(false);
+    helpers.triggerMouseEvent(widget.getEl("helloWorld"), "mousedown");
+    expect(widget.logOutput).to.deep.equal(["#helloWorld:mousedown"]);
+    expect(widget.getWidget("appButton").clicked).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-dom-events/widget.js b/test/components-browser/fixtures-deprecated/widget-dom-events/widget.js
index 41628d7cd..c3bf33315 100644
--- a/test/components-browser/fixtures-deprecated/widget-dom-events/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-dom-events/widget.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-function Widget(config) {
+function Widget() {
     this.logOutput = [];
 
-    this.name = 'app-dom-events';
+    this.name = "app-dom-events";
 
     var _this = this;
     function log(data) {
@@ -11,7 +11,7 @@ function Widget(config) {
     }
 
     this.log = log;
-    this.clearLog = function () {
+    this.clearLog = function() {
         this.logOutput = [];
     };
 
@@ -19,38 +19,38 @@ function Widget(config) {
 }
 
 Widget.prototype = {
-    handleRootClick: function (event, el) {
-        expect(el.getAttribute('class')).to.equal('app-dom-events');
+    handleRootClick: function(event, el) {
+        expect(el.getAttribute("class")).to.equal("app-dom-events");
         expect(event.target.tagName.length > 0).to.equal(true);
-        this.log('el:click');
-        expect(this.name).to.equal('app-dom-events');
+        this.log("el:click");
+        expect(this.name).to.equal("app-dom-events");
     },
 
-    handleButtonClick: function () {
-        this.log('button:click');
+    handleButtonClick: function() {
+        this.log("button:click");
     },
 
-    handleRootMouseMove: function () {
-        this.log('el:mousemove');
+    handleRootMouseMove: function() {
+        this.log("el:mousemove");
     },
 
-    handleButtonSpanMouseMove: function () {
-        this.log('button>span:mousemove');
+    handleButtonSpanMouseMove: function() {
+        this.log("button>span:mousemove");
     },
 
-    handleFooLinkDblClick: function () {
-        this.log('#fooLink:dblclick');
+    handleFooLinkDblClick: function() {
+        this.log("#fooLink:dblclick");
     },
 
-    handleFooLinkMouseOut: function (event, el) {
+    handleFooLinkMouseOut: function(event, el) {
         expect(event.target).to.equal(el);
-        this.log('#fooLink:mouseout');
+        this.log("#fooLink:mouseout");
     },
 
-    handleHelloWorldMouseDown: function (event, el) {
-        expect(this.getEl('helloWorld')).to.equal(el);
-        this.log('#helloWorld:mousedown');
+    handleHelloWorldMouseDown: function(event, el) {
+        expect(this.getEl("helloWorld")).to.equal(el);
+        this.log("#helloWorld:mousedown");
     }
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/index.js b/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/test.js b/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/test.js
index 2f9fa98ef..9c065c95f 100644
--- a/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-dynamic-tag-name/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     function renderWidget(rootTagName) {
-        var widget = helpers.mount(require.resolve('./index'), {
+        var widget = helpers.mount(require.resolve("./index"), {
             rootTagName: rootTagName
         });
         return widget;
     }
 
-    var widgetDiv = renderWidget('div');
-    var widgetSpan = renderWidget('span');
+    var widgetDiv = renderWidget("div");
+    var widgetSpan = renderWidget("span");
 
-    expect(widgetDiv.el.nodeName).to.equal('DIV');
-    expect(widgetSpan.el.nodeName).to.equal('SPAN');
-};
\ No newline at end of file
+    expect(widgetDiv.el.nodeName).to.equal("DIV");
+    expect(widgetSpan.el.nodeName).to.equal("SPAN");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/index.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/index.js
index de41f7988..1cf8d4461 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/index.js
@@ -1,15 +1,15 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {};
-	},
+    getTemplateData: function() {
+        return {};
+    },
 
-	init: function () {
-		this.clicked = false;
-	},
+    init: function() {
+        this.clicked = false;
+    },
 
-	handleButtonClick: function () {
-		this.clicked = true;
-	}
-});
\ No newline at end of file
+    handleButtonClick: function() {
+        this.clicked = true;
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/test.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/test.js
index 5a2fd2673..aaa5cd6ad 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-bubbles/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-   var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-   helpers.triggerClick(widget.getEl('inputWithoutHandler'));
-   expect(widget.clicked).to.equal(false);
+    helpers.triggerClick(widget.getEl("inputWithoutHandler"));
+    expect(widget.clicked).to.equal(false);
 
-   helpers.triggerClick(widget.getEl('inputWithHandler'));
-   expect(widget.clicked).to.equal(true);
+    helpers.triggerClick(widget.getEl("inputWithHandler"));
+    expect(widget.clicked).to.equal(true);
 
-   // Reset widget.clicked
-   widget.clicked = false;
+    // Reset widget.clicked
+    widget.clicked = false;
 
-   helpers.triggerClick(widget.getEl('inputWithLiteralHandler'));
-   expect(widget.clicked).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerClick(widget.getEl("inputWithLiteralHandler"));
+    expect(widget.clicked).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/index.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/index.js
index d82a91242..32078817c 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/index.js
@@ -1,15 +1,15 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {};
-	},
+    getTemplateData: function() {
+        return {};
+    },
 
-	init: function () {
-		this.mouseMoved = false;
-	},
+    init: function() {
+        this.mouseMoved = false;
+    },
 
-	handleMouseMove: function () {
-		this.mouseMoved = true;
-	}
-});
\ No newline at end of file
+    handleMouseMove: function() {
+        this.mouseMoved = true;
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/test.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/test.js
index 725686c36..fc736d225 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-conditional-direct/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-   var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-   helpers.triggerMouseMove(widget.getEl('inputWithoutHandler'));
-   expect(widget.mouseMoved).to.equal(false);
+    helpers.triggerMouseMove(widget.getEl("inputWithoutHandler"));
+    expect(widget.mouseMoved).to.equal(false);
 
-   helpers.triggerMouseMove(widget.getEl('inputWithHandler'));
-   expect(widget.mouseMoved).to.equal(true);
+    helpers.triggerMouseMove(widget.getEl("inputWithHandler"));
+    expect(widget.mouseMoved).to.equal(true);
 
-   // Reset widget.mouseMoved
-   widget.mouseMoved = false;
+    // Reset widget.mouseMoved
+    widget.mouseMoved = false;
 
-   helpers.triggerMouseMove(widget.getEl('inputWithLiteralHandler'));
-   expect(widget.mouseMoved).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerMouseMove(widget.getEl("inputWithLiteralHandler"));
+    expect(widget.mouseMoved).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/index.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/index.js
index 0e197041f..b710f7c02 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/index.js
@@ -1,20 +1,20 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {};
-	},
+    getTemplateData: function() {
+        return {};
+    },
 
-	init: function () {
-		this.fooClicked = false;
-		this.barClicked = false;
-	},
+    init: function() {
+        this.fooClicked = false;
+        this.barClicked = false;
+    },
 
-	handleFooClick: function () {
-		this.fooClicked = true;
-	},
+    handleFooClick: function() {
+        this.fooClicked = true;
+    },
 
-	handleBarClick: function () {
-		this.barClicked = true;
-	}
-});
\ No newline at end of file
+    handleBarClick: function() {
+        this.barClicked = true;
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/test.js b/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/test.js
index f0eabeea2..283de5188 100644
--- a/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-event-handler-method-dynamic/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-				var widget = helpers.mount(require.resolve('./index'), {});
-				expect(widget.fooClicked).to.equal(false);
-				expect(widget.barClicked).to.equal(false);
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.fooClicked).to.equal(false);
+    expect(widget.barClicked).to.equal(false);
 
-				helpers.triggerClick(widget.getEl('foo'));
-				expect(widget.fooClicked).to.equal(true);
-				expect(widget.barClicked).to.equal(false);
+    helpers.triggerClick(widget.getEl("foo"));
+    expect(widget.fooClicked).to.equal(true);
+    expect(widget.barClicked).to.equal(false);
 
-				helpers.triggerClick(widget.getEl('bar'));
-				expect(widget.fooClicked).to.equal(true);
-				expect(widget.barClicked).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerClick(widget.getEl("bar"));
+    expect(widget.fooClicked).to.equal(true);
+    expect(widget.barClicked).to.equal(true);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/index.js b/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/test.js b/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/test.js
index a07465807..9a9c0973f 100644
--- a/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-extends-EventEmitter/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
     var fooEvent = null;
     var fooEventThis = null;
 
@@ -10,20 +10,20 @@ module.exports = function (helpers) {
         fooEventThis = this;
     }
 
-    widget.on('foo', fooListener);
+    widget.on("foo", fooListener);
 
-    widget.emit('foo', 'a', 'b');
+    widget.emit("foo", "a", "b");
 
-    expect(fooEvent[0]).to.equal('a');
+    expect(fooEvent[0]).to.equal("a");
 
-    expect(fooEvent[1]).to.equal('b');
+    expect(fooEvent[1]).to.equal("b");
     expect(fooEventThis).to.equal(widget);
 
     fooEvent = null;
 
-    widget.removeListener('foo', fooListener);
+    widget.removeListener("foo", fooListener);
 
-    widget.emit('foo', 'a', 'b');
+    widget.emit("foo", "a", "b");
 
     expect(fooEvent).to.equal(null);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getEl-ref/component.js b/test/components-browser/fixtures-deprecated/widget-getEl-ref/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEl-ref/component.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEl-ref/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getEl-ref/test.js b/test/components-browser/fixtures-deprecated/widget-getEl-ref/test.js
index 6d09e3e47..1d85b5107 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEl-ref/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEl-ref/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.getEl('foo').className).to.equal('foo');
-    expect(widget.getEl('bar').className).to.equal('bar');
-    expect(widget.getEl('foo-bar').className).to.equal('foo-bar');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.getEl("foo").className).to.equal("foo");
+    expect(widget.getEl("bar").className).to.equal("bar");
+    expect(widget.getEl("foo-bar").className).to.equal("foo-bar");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getEl/index.js b/test/components-browser/fixtures-deprecated/widget-getEl/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEl/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEl/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getEl/test.js b/test/components-browser/fixtures-deprecated/widget-getEl/test.js
index 6d09e3e47..1d85b5107 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEl/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEl/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.getEl('foo').className).to.equal('foo');
-    expect(widget.getEl('bar').className).to.equal('bar');
-    expect(widget.getEl('foo-bar').className).to.equal('foo-bar');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.getEl("foo").className).to.equal("foo");
+    expect(widget.getEl("bar").className).to.equal("bar");
+    expect(widget.getEl("foo-bar").className).to.equal("foo-bar");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getEls/index.js b/test/components-browser/fixtures-deprecated/widget-getEls/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEls/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEls/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getEls/test.js b/test/components-browser/fixtures-deprecated/widget-getEls/test.js
index b395de655..f584728a4 100644
--- a/test/components-browser/fixtures-deprecated/widget-getEls/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getEls/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    var els = widget.getEls('colorListItems');
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    var els = widget.getEls("colorListItems");
     expect(els.length).to.equal(3);
-    expect(els[0].innerHTML).to.equal('red');
-    expect(els[1].innerHTML).to.equal('green');
-    expect(els[2].innerHTML).to.equal('blue');
-};
\ No newline at end of file
+    expect(els[0].innerHTML).to.equal("red");
+    expect(els[1].innerHTML).to.equal("green");
+    expect(els[2].innerHTML).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getInitialProps/index.js b/test/components-browser/fixtures-deprecated/widget-getInitialProps/index.js
index b183a5581..3303d4cc6 100644
--- a/test/components-browser/fixtures-deprecated/widget-getInitialProps/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getInitialProps/index.js
@@ -1,9 +1,9 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialProps: function (input, out) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialProps: function(input) {
         var name = input.name;
         return {
             name: name.toUpperCase()
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getInitialProps/test.js b/test/components-browser/fixtures-deprecated/widget-getInitialProps/test.js
index a6ae80c58..532704723 100644
--- a/test/components-browser/fixtures-deprecated/widget-getInitialProps/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getInitialProps/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
-    expect(component.el.innerHTML).to.contain('Hello FRANK!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello FRANK!");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidget/components/app-foo/index.js b/test/components-browser/fixtures-deprecated/widget-getWidget/components/app-foo/index.js
index fea24b735..6af82feaf 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidget/components/app-foo/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidget/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {
-        this.name = 'app-foo';
+    init: function() {
+        this.name = "app-foo";
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidget/index.js b/test/components-browser/fixtures-deprecated/widget-getWidget/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidget/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidget/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidget/marko.json b/test/components-browser/fixtures-deprecated/widget-getWidget/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidget/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-getWidget/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidget/test.js b/test/components-browser/fixtures-deprecated/widget-getWidget/test.js
index 071407d63..4592b2d8b 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidget/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidget/test.js
@@ -1,6 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.getWidget('bar').name).to.equal('app-foo');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.getWidget("bar").name).to.equal("app-foo");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/components/app-foo/index.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/components/app-foo/index.js
index a094e9055..d64491238 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/components/app-foo/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/components/app-foo/index.js
@@ -1,13 +1,13 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function (widgetConfig) {
+    init: function(widgetConfig) {
         this.name = widgetConfig.name;
     },
 
-    getWidgetConfig: function (input) {
+    getWidgetConfig: function(input) {
         return {
             name: input.name
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/index.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/marko.json b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/test.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/test.js
index 6d966ebbb..400bcec02 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-multiple/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.getWidgets('bar').length).to.equal(2);
-    expect(widget.getWidgets('bar')[0].name).to.equal('a');
-    expect(widget.getWidgets('bar')[1].name).to.equal('b');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.getWidgets("bar").length).to.equal(2);
+    expect(widget.getWidgets("bar")[0].name).to.equal("a");
+    expect(widget.getWidgets("bar")[1].name).to.equal("b");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/components/app-foo/index.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/components/app-foo/index.js
index fea24b735..6af82feaf 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/components/app-foo/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {
-        this.name = 'app-foo';
+    init: function() {
+        this.name = "app-foo";
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/index.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/marko.json b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/test.js b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/test.js
index 0cc57e014..c684cb8a4 100644
--- a/test/components-browser/fixtures-deprecated/widget-getWidgets-single/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-getWidgets-single/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    expect(widget.getWidgets('bar').length).to.equal(1);
-    expect(widget.getWidgets('bar')[0].name).to.equal('app-foo');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    expect(widget.getWidgets("bar").length).to.equal(1);
+    expect(widget.getWidgets("bar")[0].name).to.equal("app-foo");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/index.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js
index 13ddf6bd5..945033f42 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/renderer.js
@@ -1,11 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
-    var label = input.label || 'BAR';
-    template.render({
-        label: label,
-        widgetConfig: {
-            label: label
-        }
-    }, out);
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    var label = input.label || "BAR";
+    template.render(
+        {
+            label: label,
+            widgetConfig: {
+                label: label
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/widget.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/widget.js
index 1c61cb254..30b36fa1c 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/widget.js
@@ -1,7 +1,7 @@
-function Widget(config) {
-    this.name = 'app-bar';
+function Widget() {
+    this.name = "app-bar";
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/index.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/index.js
index 6b2c4785a..065d45a51 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/index.js
@@ -1,11 +1,11 @@
-var barRenderer = require('./components/app-bar/renderer').render;
+var barRenderer = require("./components/app-bar/renderer").render;
 
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getTemplateData: function (input, out) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getTemplateData: function() {
         return {
             barRenderer: barRenderer,
-            barWidgetId: 'myBar'
+            barWidgetId: "myBar"
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/test.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/test.js
index ba1f89f1b..e3ad68eb7 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id-dynamic/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var barWidget = widget.getWidget('myBar');
+    var barWidget = widget.getWidget("myBar");
     expect(barWidget != null).to.equal(true);
-    expect(barWidget.name).to.equal('app-bar');
-};
\ No newline at end of file
+    expect(barWidget.name).to.equal("app-bar");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/index.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/renderer.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/renderer.js
index 13ddf6bd5..945033f42 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/renderer.js
@@ -1,11 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
-    var label = input.label || 'BAR';
-    template.render({
-        label: label,
-        widgetConfig: {
-            label: label
-        }
-    }, out);
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    var label = input.label || "BAR";
+    template.render(
+        {
+            label: label,
+            widgetConfig: {
+                label: label
+            }
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/widget.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/widget.js
index 1c61cb254..30b36fa1c 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/components/app-bar/widget.js
@@ -1,7 +1,7 @@
-function Widget(config) {
-    this.name = 'app-bar';
+function Widget() {
+    this.name = "app-bar";
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/index.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/index.js
index 99b3d919a..9165f4e0f 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/index.js
@@ -1,10 +1,10 @@
-var barRenderer = require('./components/app-bar/renderer').render;
+var barRenderer = require("./components/app-bar/renderer").render;
 
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getTemplateData: function (input, out) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getTemplateData: function() {
         return {
             barRenderer: barRenderer
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/test.js b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/test.js
index eaf5dfea7..dd01c485e 100644
--- a/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-invoke-widget-id/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var barWidget = widget.getWidget('barTest');
+    var barWidget = widget.getWidget("barTest");
     expect(barWidget != null).to.equal(true);
-    expect(barWidget.name).to.equal('app-bar');
-};
\ No newline at end of file
+    expect(barWidget.name).to.equal("app-bar");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/index.js b/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/test.js b/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/test.js
index cca3e7050..3dfc6145f 100644
--- a/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-jQuery-proxy/test.js
@@ -1,19 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers, done) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    expect(widget.$().attr('class')).to.equal('app-jquery-proxy');
-    expect(widget.$('#foo').html()).to.equal('foo');
-    expect(widget.$('#fooText').html()).to.equal('fooText');
-    expect(widget.$('#foo-text').html()).to.equal('foo-text');
-    expect(widget.$('#ul li').length).to.equal(3);
-    expect(widget.$('button').html()).to.equal('Test Button');
-    expect(widget.$('li', 'ul').length).to.equal(3);
+    expect(widget.$().attr("class")).to.equal("app-jquery-proxy");
+    expect(widget.$("#foo").html()).to.equal("foo");
+    expect(widget.$("#fooText").html()).to.equal("fooText");
+    expect(widget.$("#foo-text").html()).to.equal("foo-text");
+    expect(widget.$("#ul li").length).to.equal(3);
+    expect(widget.$("button").html()).to.equal("Test Button");
+    expect(widget.$("li", "ul").length).to.equal(3);
 
-    var count = 0;
-    widget.$(function () {
-        count++;
+    widget.$(function() {
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for-key/component.js b/test/components-browser/fixtures-deprecated/widget-label-for-key/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for-key/component.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for-key/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for-key/test.js b/test/components-browser/fixtures-deprecated/widget-label-for-key/test.js
index 53c59fe50..eb5000aba 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for-key/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for-key/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var label = component.getEl('label');
-    var forElId = label.getAttribute('for');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var label = component.getEl("label");
+    var forElId = label.getAttribute("for");
     var inputEl = document.getElementById(forElId);
 
     expect(!!forElId).to.equal(true);
-    expect(inputEl.value).to.equal('test');
-    expect(label.getAttribute('for-ref')).to.equal(null);
-};
\ No newline at end of file
+    expect(inputEl.value).to.equal("test");
+    expect(label.getAttribute("for-ref")).to.equal(null);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for/index.js b/test/components-browser/fixtures-deprecated/widget-label-for/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for/test.js b/test/components-browser/fixtures-deprecated/widget-label-for/test.js
index ad845d6e4..3f07fbfd3 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    var label = widget.getEl('label');
-    var forElId = label.getAttribute('for');
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    var label = widget.getEl("label");
+    var forElId = label.getAttribute("for");
     var inputEl = document.getElementById(forElId);
 
     expect(forElId).to.exist;
-    expect(inputEl.value).to.equal('test');
-    expect(label.getAttribute('w-for')).to.equal(null);
-};
\ No newline at end of file
+    expect(inputEl.value).to.equal("test");
+    expect(label.getAttribute("w-for")).to.equal(null);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for0/component.js b/test/components-browser/fixtures-deprecated/widget-label-for0/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for0/component.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for0/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-label-for0/test.js b/test/components-browser/fixtures-deprecated/widget-label-for0/test.js
index 53c59fe50..eb5000aba 100644
--- a/test/components-browser/fixtures-deprecated/widget-label-for0/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-label-for0/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var label = component.getEl('label');
-    var forElId = label.getAttribute('for');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var label = component.getEl("label");
+    var forElId = label.getAttribute("for");
     var inputEl = document.getElementById(forElId);
 
     expect(!!forElId).to.equal(true);
-    expect(inputEl.value).to.equal('test');
-    expect(label.getAttribute('for-ref')).to.equal(null);
-};
\ No newline at end of file
+    expect(inputEl.value).to.equal("test");
+    expect(label.getAttribute("for-ref")).to.equal(null);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/index.js b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/renderer.js b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/renderer.js
index 82fb2d352..48cc8ec52 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/renderer.js
@@ -1,7 +1,10 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 exports.render = function render(input, out) {
-    template.render({
-        label: input.label
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            label: input.label
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/test.js b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/test.js
index 4947e3e97..79de00769 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        label: 'Foo'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        label: "Foo"
     });
 
     var oldId = widget.id;
 
     widget.rerender({
-        label: 'Bar'
+        label: "Bar"
     });
 
     expect(widget.id).to.equal(oldId);
 };
 
-module.exports.skipHydrate = 'a split widget cannot re-render when hydrated';
\ No newline at end of file
+module.exports.skipHydrate = "a split widget cannot re-render when hydrated";
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/widget.js b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/widget.js
index 68c1ca8fe..9fedaf5dd 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-render-same-id/widget.js
@@ -1,7 +1,7 @@
-function Widget(config) {}
+function Widget() {}
 
 Widget.prototype = {
-    renderer: require('./renderer')
+    renderer: require("./renderer")
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/index.js b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/renderer.js b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/renderer.js
index 82fb2d352..48cc8ec52 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/renderer.js
@@ -1,7 +1,10 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 exports.render = function render(input, out) {
-    template.render({
-        label: input.label
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            label: input.label
+        },
+        out
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/test.js b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/test.js
index 54902ffe3..981a7a7d8 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var previousSibling = document.createElement('div');
+module.exports = function(helpers) {
+    var previousSibling = document.createElement("div");
     helpers.targetEl.appendChild(previousSibling);
 
-    var widget = helpers.mount(require.resolve('./index'), {
-        label: 'Foo'
+    var widget = helpers.mount(require.resolve("./index"), {
+        label: "Foo"
     });
 
-    var nextSibling = document.createElement('div');
+    var nextSibling = document.createElement("div");
     helpers.targetEl.appendChild(nextSibling);
 
     expect(widget.el.previousSibling).to.equal(previousSibling);
@@ -16,24 +16,23 @@ module.exports = function (helpers) {
 
     var parentNode = widget.el.parentNode;
 
-    expect(widget.el.innerHTML.trim()).to.equal('Foo');
+    expect(widget.el.innerHTML.trim()).to.equal("Foo");
 
     // var oldEl = widget.el;
 
     widget.rerender({
-        label: 'Bar'
+        label: "Bar"
     });
 
-    expect(widget.el.innerHTML.trim()).to.equal('Bar');
+    expect(widget.el.innerHTML.trim()).to.equal("Bar");
 
     expect(widget.el.parentNode).to.equal(parentNode);
     // expect(widget.el !== oldEl).to.equal(true);
 
-
     expect(helpers.targetEl.childNodes.length).to.equal(3);
     expect(helpers.targetEl.childNodes[0]).to.equal(previousSibling);
     expect(helpers.targetEl.childNodes[1]).to.equal(widget.el);
     expect(helpers.targetEl.childNodes[2]).to.equal(nextSibling);
 };
 
-module.exports.skipHydrate = 'a split widget cannot re-render when hydrated';
\ No newline at end of file
+module.exports.skipHydrate = "a split widget cannot re-render when hydrated";
diff --git a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/widget.js b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/widget.js
index 68c1ca8fe..9fedaf5dd 100644
--- a/test/components-browser/fixtures-deprecated/widget-legacy-rerender/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-legacy-rerender/widget.js
@@ -1,7 +1,7 @@
-function Widget(config) {}
+function Widget() {}
 
 Widget.prototype = {
-    renderer: require('./renderer')
+    renderer: require("./renderer")
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js
index 3a3661c55..8195d3c94 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/components/app-stateful-lifecycle-events-nested/index.js
@@ -1,50 +1,53 @@
-var lifecycle = require('../../lifecycle-recorder');
+var lifecycle = require("../../lifecycle-recorder");
 
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getInitialState: function (input) {
-		return {
-			messageCount: input.messageCount,
-			name: input.name
-		};
-	},
+    getInitialState: function(input) {
+        return {
+            messageCount: input.messageCount,
+            name: input.name
+        };
+    },
 
-	getTemplateData: function (state, input) {
-		return {
-			messageCount: state.messageCount
-		};
-	},
+    getTemplateData: function(state) {
+        return {
+            messageCount: state.messageCount
+        };
+    },
 
-	init: function () {
-		if (this.INIT_CALLED) {
-			throw new Error('Doublie init()');
-		}
-		this.INIT_CALLED = true;
-		lifecycle.record(this.state.name || this.id, 'init');
-	},
+    init: function() {
+        if (this.INIT_CALLED) {
+            throw new Error("Doublie init()");
+        }
+        this.INIT_CALLED = true;
+        lifecycle.record(this.state.name || this.id, "init");
+    },
 
-	setMessageCount: function (messageCount) {
-		this.setState('messageCount', messageCount);
-	},
+    setMessageCount: function(messageCount) {
+        this.setState("messageCount", messageCount);
+    },
 
-	onRender: function (eventArg) {
-		lifecycle.record(this.state.name || this.id, eventArg.firstRender ? 'onRender:firstRender' : 'onRender');
-	},
+    onRender: function(eventArg) {
+        lifecycle.record(
+            this.state.name || this.id,
+            eventArg.firstRender ? "onRender:firstRender" : "onRender"
+        );
+    },
 
-	onBeforeDestroy: function () {
-		lifecycle.record(this.state.name || this.id, 'onBeforeDestroy');
-	},
+    onBeforeDestroy: function() {
+        lifecycle.record(this.state.name || this.id, "onBeforeDestroy");
+    },
 
-	onDestroy: function () {
-		lifecycle.record(this.state.name || this.id, 'onDestroy');
-	},
+    onDestroy: function() {
+        lifecycle.record(this.state.name || this.id, "onDestroy");
+    },
 
-	onBeforeUpdate: function () {
-		lifecycle.record(this.state.name || this.id, 'onBeforeUpdate');
-	},
+    onBeforeUpdate: function() {
+        lifecycle.record(this.state.name || this.id, "onBeforeUpdate");
+    },
 
-	onUpdate: function () {
-		lifecycle.record(this.state.name || this.id, 'onUpdate');
-	}
-});
\ No newline at end of file
+    onUpdate: function() {
+        lifecycle.record(this.state.name || this.id, "onUpdate");
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/index.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/index.js
index 23c1a1dce..a17668c3d 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/index.js
@@ -1,57 +1,60 @@
-var lifecycle = require('./lifecycle-recorder');
+var lifecycle = require("./lifecycle-recorder");
 
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getInitialState: function (input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	},
+    getInitialState: function(input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    },
 
-	getTemplateData: function (state, input) {
-		return {
-			name: state.name,
-			messageCount: state.messageCount
-		};
-	},
+    getTemplateData: function(state) {
+        return {
+            name: state.name,
+            messageCount: state.messageCount
+        };
+    },
 
-	init: function () {
-		this.lifecycleEvents = [];
-		lifecycle.record(this.id, 'init');
-	},
+    init: function() {
+        this.lifecycleEvents = [];
+        lifecycle.record(this.id, "init");
+    },
 
-	onRender: function (eventArg) {
-		lifecycle.record(this.id, eventArg.firstRender ? 'onRender:firstRender' : 'onRender');
-	},
+    onRender: function(eventArg) {
+        lifecycle.record(
+            this.id,
+            eventArg.firstRender ? "onRender:firstRender" : "onRender"
+        );
+    },
 
-	update_messageCount: function (newMessageCount) {
-		this.getWidget('nestedStateful').setMessageCount(newMessageCount);
-		this.getWidget('nestedStateful').update();
-	},
+    update_messageCount: function(newMessageCount) {
+        this.getWidget("nestedStateful").setMessageCount(newMessageCount);
+        this.getWidget("nestedStateful").update();
+    },
 
-	setName: function (newName) {
-		this.setState('name', newName);
-	},
+    setName: function(newName) {
+        this.setState("name", newName);
+    },
 
-	setMessageCount: function (newMessageCount) {
-		this.setState('messageCount', newMessageCount);
-	},
+    setMessageCount: function(newMessageCount) {
+        this.setState("messageCount", newMessageCount);
+    },
 
-	onBeforeDestroy: function () {
-		lifecycle.record(this.id, 'onBeforeDestroy');
-	},
+    onBeforeDestroy: function() {
+        lifecycle.record(this.id, "onBeforeDestroy");
+    },
 
-	onDestroy: function () {
-		lifecycle.record(this.id, 'onDestroy');
-	},
+    onDestroy: function() {
+        lifecycle.record(this.id, "onDestroy");
+    },
 
-	onBeforeUpdate: function () {
-		lifecycle.record(this.id, 'onBeforeUpdate');
-	},
+    onBeforeUpdate: function() {
+        lifecycle.record(this.id, "onBeforeUpdate");
+    },
 
-	onUpdate: function () {
-		lifecycle.record(this.id, 'onUpdate');
-	}
-});
\ No newline at end of file
+    onUpdate: function() {
+        lifecycle.record(this.id, "onUpdate");
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/lifecycle-recorder.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/lifecycle-recorder.js
index c505a4b2d..376056fa5 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/lifecycle-recorder.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/lifecycle-recorder.js
@@ -1,9 +1,10 @@
 var widgetLifecycleEvents = {};
 
 function recordWidgetLifecycleEvent(key, eventType) {
-    var events = widgetLifecycleEvents[key] || (widgetLifecycleEvents[key] = []);
+    var events =
+        widgetLifecycleEvents[key] || (widgetLifecycleEvents[key] = []);
     events.push(eventType);
-};
+}
 
 function resetWidgetLifecycleEvents() {
     widgetLifecycleEvents = {};
@@ -14,5 +15,3 @@ module.exports = {
     reset: resetWidgetLifecycleEvents,
     record: recordWidgetLifecycleEvent
 };
-    
-
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/marko.json b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/test.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/test.js
index ef4b72289..1a0c20eb4 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateful/test.js
@@ -1,64 +1,144 @@
-var expect = require('chai').expect;
-var lifecycle = require('./lifecycle-recorder');
+var expect = require("chai").expect;
+var lifecycle = require("./lifecycle-recorder");
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 10
     });
 
     var targetEl = helpers.targetEl;
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank!');
-    expect(targetEl.innerHTML).to.contain('10');
+    expect(targetEl.innerHTML).to.contain("Hello Frank!");
+    expect(targetEl.innerHTML).to.contain("10");
 
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
 
-    expect(lifecycle.events[widget.getWidget('nestedStateful').id]).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(
+        lifecycle.events[widget.getWidget("nestedStateful").id]
+    ).to.deep.equal(["init", "onRender:firstRender"]);
 
-    expect(lifecycle.events.foo).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(lifecycle.events.foo).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
 
     // NOTE: messageCount has an update handler
-    widget.setState('messageCount', 999);
-    expect(targetEl.innerHTML).to.contain('Hello Frank!');
-    expect(targetEl.innerHTML).to.contain('10');
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender']);
+    widget.setState("messageCount", 999);
+    expect(targetEl.innerHTML).to.contain("Hello Frank!");
+    expect(targetEl.innerHTML).to.contain("10");
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank!');
-    expect(targetEl.innerHTML).to.contain('999');
+    expect(targetEl.innerHTML).to.contain("Hello Frank!");
+    expect(targetEl.innerHTML).to.contain("999");
 
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate']);
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate"
+    ]);
 
-    expect(lifecycle.events[widget.getWidget('nestedStateful').id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender']);
+    expect(
+        lifecycle.events[widget.getWidget("nestedStateful").id]
+    ).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender"
+    ]);
 
-    expect(lifecycle.events.foo).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(lifecycle.events.foo).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
 
     // NOTE: name does *not* have an update handler
-    widget.setState('name', 'Jane');
-    expect(targetEl.innerHTML).to.contain('Hello Frank!');
-    expect(targetEl.innerHTML).to.contain('999');
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate']);
+    widget.setState("name", "Jane");
+    expect(targetEl.innerHTML).to.contain("Hello Frank!");
+    expect(targetEl.innerHTML).to.contain("999");
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate"
+    ]);
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello Jane!');
-    expect(targetEl.innerHTML).to.contain('999');
+    expect(targetEl.innerHTML).to.contain("Hello Jane!");
+    expect(targetEl.innerHTML).to.contain("999");
 
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onBeforeUpdate', 'onUpdate', 'onRender']);
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender"
+    ]);
 
-    expect(lifecycle.events[widget.getWidget('nestedStateful').id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender']);
+    expect(
+        lifecycle.events[widget.getWidget("nestedStateful").id]
+    ).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender"
+    ]);
 
-    expect(lifecycle.events.foo).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender']);
+    expect(lifecycle.events.foo).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender"
+    ]);
 
-    var nestedStateful = widget.getWidget('nestedStateful');
+    var nestedStateful = widget.getWidget("nestedStateful");
 
     widget.destroy();
 
-    expect(lifecycle.events[widget.id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onBeforeUpdate', 'onUpdate', 'onRender', 'onBeforeDestroy', 'onDestroy']);
+    expect(lifecycle.events[widget.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender",
+        "onBeforeDestroy",
+        "onDestroy"
+    ]);
 
-    expect(lifecycle.events[nestedStateful.id]).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender', 'onBeforeDestroy', 'onDestroy']);
+    expect(lifecycle.events[nestedStateful.id]).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender",
+        "onBeforeDestroy",
+        "onDestroy"
+    ]);
 
-    expect(lifecycle.events.foo).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender', 'onBeforeDestroy', 'onDestroy']);
+    expect(lifecycle.events.foo).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender",
+        "onBeforeDestroy",
+        "onDestroy"
+    ]);
 
     lifecycle.reset();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/index.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/index.js
index f4c8c1637..60528265c 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/index.js
@@ -1,40 +1,42 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	},
+    getTemplateData: function(state, input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    },
 
-	init: function () {
-		this.lifecycleEvents = [];
+    init: function() {
+        this.lifecycleEvents = [];
 
-		this.recordWidgetLifecycleEvent('init');
-	},
+        this.recordWidgetLifecycleEvent("init");
+    },
 
-	onRender: function (eventArg) {
-		this.recordWidgetLifecycleEvent(eventArg.firstRender ? 'onRender:firstRender' : 'onRender');
-	},
+    onRender: function(eventArg) {
+        this.recordWidgetLifecycleEvent(
+            eventArg.firstRender ? "onRender:firstRender" : "onRender"
+        );
+    },
 
-	onBeforeDestroy: function () {
-		this.recordWidgetLifecycleEvent('onBeforeDestroy');
-	},
+    onBeforeDestroy: function() {
+        this.recordWidgetLifecycleEvent("onBeforeDestroy");
+    },
 
-	onDestroy: function () {
-		this.recordWidgetLifecycleEvent('onDestroy');
-	},
+    onDestroy: function() {
+        this.recordWidgetLifecycleEvent("onDestroy");
+    },
 
-	onBeforeUpdate: function () {
-		this.recordWidgetLifecycleEvent('onBeforeUpdate');
-	},
+    onBeforeUpdate: function() {
+        this.recordWidgetLifecycleEvent("onBeforeUpdate");
+    },
 
-	onUpdate: function () {
-		this.recordWidgetLifecycleEvent('onUpdate');
-	},
+    onUpdate: function() {
+        this.recordWidgetLifecycleEvent("onUpdate");
+    },
 
-	recordWidgetLifecycleEvent: function (name) {
-		this.lifecycleEvents.push(name);
-	}
-});
\ No newline at end of file
+    recordWidgetLifecycleEvent: function(name) {
+        this.lifecycleEvents.push(name);
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/test.js b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/test.js
index e4105c381..e24a7e991 100644
--- a/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-lifecycle-events-stateless/test.js
@@ -1,32 +1,58 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 10
     });
 
     var targetEl = helpers.targetEl;
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 10 new messages."
+    );
 
-    expect(widget.lifecycleEvents).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(widget.lifecycleEvents).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
 
     widget.setProps({
-        name: 'Jane',
+        name: "Jane",
         messageCount: 30
     });
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 10 new messages."
+    );
 
-    expect(widget.lifecycleEvents).to.deep.equal(['init', 'onRender:firstRender']);
+    expect(widget.lifecycleEvents).to.deep.equal([
+        "init",
+        "onRender:firstRender"
+    ]);
 
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello Jane! You have 30 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Jane! You have 30 new messages."
+    );
 
-    expect(widget.lifecycleEvents).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender']);
+    expect(widget.lifecycleEvents).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender"
+    ]);
 
     widget.destroy();
 
-    expect(widget.lifecycleEvents).to.deep.equal(['init', 'onRender:firstRender', 'onBeforeUpdate', 'onUpdate', 'onRender', 'onBeforeDestroy', 'onDestroy']);
-};
\ No newline at end of file
+    expect(widget.lifecycleEvents).to.deep.equal([
+        "init",
+        "onRender:firstRender",
+        "onBeforeUpdate",
+        "onUpdate",
+        "onRender",
+        "onBeforeDestroy",
+        "onDestroy"
+    ]);
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/index.js b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/index.js
index 06557d0d0..a191495c1 100644
--- a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko/legacy-components').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko/legacy-components").renderable(exports, require("./renderer"));
diff --git a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/renderer.js b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/renderer.js
index 4d3fe69f9..6a797de21 100644
--- a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/renderer.js
@@ -1,6 +1,6 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var viewModel = {};
     template.render(viewModel, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/test.js b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/test.js
index afe6fcf27..a487cb548 100644
--- a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var widgetsLookup = {};
-    window.addWidget = function (name, widget) {
+    window.addWidget = function(name, widget) {
         var widgets = widgetsLookup[name] || (widgetsLookup[name] = []);
         widgets.push(widget);
     };
 
-    var widget = helpers.mount(require.resolve('./index'), {});
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    expect(widgetsLookup['app-nested-widget-bind/foo'].length).to.equal(1);
-    expect(widgetsLookup['app-nested-widget-bind/bar'].length).to.equal(1);
+    expect(widgetsLookup["app-nested-widget-bind/foo"].length).to.equal(1);
+    expect(widgetsLookup["app-nested-widget-bind/bar"].length).to.equal(1);
 
-    expect(widgetsLookup['app-nested-widget-bind/foo'][0]).to.equal(widget);
+    expect(widgetsLookup["app-nested-widget-bind/foo"][0]).to.equal(widget);
 
     delete window.addWidget;
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-bar.js b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-bar.js
index 255fb193d..58ea7c8e2 100644
--- a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-bar.js
+++ b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-bar.js
@@ -1,8 +1,8 @@
-function Widget(config) {
-    this.name = 'app-nested-widget-bind/bar';
-    window.addWidget('app-nested-widget-bind/bar', this);
+function Widget() {
+    this.name = "app-nested-widget-bind/bar";
+    window.addWidget("app-nested-widget-bind/bar", this);
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-foo.js b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-foo.js
index 29f38a02f..b229ba199 100644
--- a/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-foo.js
+++ b/test/components-browser/fixtures-deprecated/widget-multiple-binds-in-template.fails/widget-foo.js
@@ -1,8 +1,8 @@
-function Widget(config) {
-    this.name = 'app-nested-widget-bind/foo';
-    window.addWidget('app-nested-widget-bind/foo', this);
+function Widget() {
+    this.name = "app-nested-widget-bind/foo";
+    window.addWidget("app-nested-widget-bind/foo", this);
 }
 
 Widget.prototype = {};
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/index.js
index 92d84c3d9..7f6057551 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/index.js
@@ -1,21 +1,21 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getInitialState: function (input) {
+    getInitialState: function(input) {
         return {
             name: input.name,
             count: input.count,
-            className: input['class']
+            className: input["class"]
         };
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             name: state.name,
             count: state.count,
-            foo: 'bar',
-            hello: 'world',
+            foo: "bar",
+            hello: "world",
             className: state.className
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/test.js
index 0db500bcc..e037e78ba 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered-setTimeout/test.js
@@ -1,32 +1,38 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers, done) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         count: 30
     });
 
     var targetEl = widget.el;
 
-    setTimeout(function () {
-        widget.setState('count', 100);
+    setTimeout(function() {
+        widget.setState("count", 100);
         widget.update();
         expect(widget.state.count).to.equal(100);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 100 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 100 new messages."
+        );
     }, 100);
 
-    setTimeout(function () {
-        widget.setState('count', 200);
+    setTimeout(function() {
+        widget.setState("count", 200);
         widget.update();
         expect(widget.state.count).to.equal(200);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 200 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 200 new messages."
+        );
         done();
     }, 200);
 
-    setTimeout(function () {
-        widget.setState('count', 0);
+    setTimeout(function() {
+        widget.setState("count", 0);
         widget.update();
         expect(widget.state.count).to.equal(0);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 0 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 0 new messages."
+        );
     }, 0);
 };
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/index.js
index 92d84c3d9..7f6057551 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/index.js
@@ -1,21 +1,21 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getInitialState: function (input) {
+    getInitialState: function(input) {
         return {
             name: input.name,
             count: input.count,
-            className: input['class']
+            className: input["class"]
         };
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             name: state.name,
             count: state.count,
-            foo: 'bar',
-            hello: 'world',
+            foo: "bar",
+            hello: "world",
             className: state.className
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/test.js
index 6a7a65fa3..05fe43f52 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-all-state-when-rerendered/test.js
@@ -1,25 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         count: 30
     });
 
     var targetEl = widget.el;
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 30 new messages.');
-    expect(targetEl.innerHTML).to.contain('foo: bar');
-    expect(targetEl.innerHTML).to.contain('hello: world');
-    expect(widget.state.name).to.equal('Frank');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 30 new messages."
+    );
+    expect(targetEl.innerHTML).to.contain("foo: bar");
+    expect(targetEl.innerHTML).to.contain("hello: world");
+    expect(widget.state.name).to.equal("Frank");
     expect(widget.state.count).to.equal(30);
 
-    widget.setState('name', 'John');
+    widget.setState("name", "John");
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 30 new messages.');
-    expect(targetEl.innerHTML).to.contain('foo: bar');
-    expect(targetEl.innerHTML).to.contain('hello: world');
-    expect(widget.state.name).to.equal('John');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 30 new messages."
+    );
+    expect(targetEl.innerHTML).to.contain("foo: bar");
+    expect(targetEl.innerHTML).to.contain("hello: world");
+    expect(widget.state.name).to.equal("John");
     expect(widget.state.count).to.equal(30);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/index.js
index 1ee8fd0db..6a96f213b 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/index.js
@@ -1,15 +1,13 @@
-var expect = require('chai').expect;
-
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    init: function () {},
-    getInitialState: function () {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    init: function() {},
+    getInitialState: function() {
         return {
-            name: 'Joe'
+            name: "Joe"
         };
     },
 
-    getTemplateData: function (state) {
+    getTemplateData: function(state) {
         return state;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/test.js
index 94448685e..d4005c834 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-attrs/test.js
@@ -1,26 +1,26 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var helloEl = widget.getEl('hello');
-    expect(helloEl.innerHTML).to.equal('Hello Joe!');
+    var helloEl = widget.getEl("hello");
+    expect(helloEl.innerHTML).to.equal("Hello Joe!");
 
     widget.el.style.border = "1px solid red";
     widget.el.className = "foo";
 
-    widget.el.querySelector('a').href = "http://www.foo.com/";
+    widget.el.querySelector("a").href = "http://www.foo.com/";
 
-    widget.getEl('hello2').removeAttribute('class');
+    widget.getEl("hello2").removeAttribute("class");
 
-    widget.setState('name', 'Frank');
+    widget.setState("name", "Frank");
     widget.update();
 
-    expect(helloEl.innerHTML).to.equal('Hello Frank!');
-    expect(widget.getEl('hello2').getAttribute('class')).to.equal(null);
+    expect(helloEl.innerHTML).to.equal("Hello Frank!");
+    expect(widget.getEl("hello2").getAttribute("class")).to.equal(null);
 
     // Make sure the preserved attributes did not change
     expect(widget.el.style.border).to.equal("1px solid red");
     expect(widget.el.className).to.equal("foo");
-    expect(widget.el.querySelector('a').href).to.equal("http://www.foo.com/");
-};
\ No newline at end of file
+    expect(widget.el.querySelector("a").href).to.equal("http://www.foo.com/");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/components/app-stateful-rerender/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/components/app-stateful-rerender/index.js
index 92d84c3d9..7f6057551 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/components/app-stateful-rerender/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/components/app-stateful-rerender/index.js
@@ -1,21 +1,21 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getInitialState: function (input) {
+    getInitialState: function(input) {
         return {
             name: input.name,
             count: input.count,
-            className: input['class']
+            className: input["class"]
         };
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             name: state.name,
             count: state.count,
-            foo: 'bar',
-            hello: 'world',
+            foo: "bar",
+            hello: "world",
             className: state.className
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/index.js
index 118ec8432..71264852f 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/index.js
@@ -1,10 +1,10 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getTemplateData: function (state, input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getTemplateData: function(state, input) {
         return {
             preserveCondition: input.preserveCondition,
             renderId: input.renderId || 0
         };
     },
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/marko.json b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/test.js
index e0f500f36..0aa5dd572 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-if/test.js
@@ -1,21 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     function getTimestamps() {
-
         return {
-            preserveId: widget.getEl('preserve').getAttribute('data-renderId'),
-            preserveIdBody: widget.getEl('preserve').innerHTML,
-            preserveBodyId: widget.getEl('preserveBody').getAttribute('data-renderId'),
-            preserveBodyIdBody: widget.getEl('preserveBody').innerHTML,
-            widgetId: widget.getWidget('widget').state.name,
-            preserveClass: widget.el.querySelector('.preserve').getAttribute('data-renderId'),
-            preserveClassBody: widget.el.querySelector('.preserve').innerHTML,
-            preserveBodyClass: widget.el.querySelector('.preserve-body').getAttribute('data-renderId'),
-            preserveBodyClassBody: widget.el.querySelector('.preserve-body').innerHTML,
-            widgetClass: require('marko/legacy-components').getWidgetForEl(widget.el.querySelector('.widget-no-id')).state.name
+            preserveId: widget.getEl("preserve").getAttribute("data-renderId"),
+            preserveIdBody: widget.getEl("preserve").innerHTML,
+            preserveBodyId: widget
+                .getEl("preserveBody")
+                .getAttribute("data-renderId"),
+            preserveBodyIdBody: widget.getEl("preserveBody").innerHTML,
+            widgetId: widget.getWidget("widget").state.name,
+            preserveClass: widget.el
+                .querySelector(".preserve")
+                .getAttribute("data-renderId"),
+            preserveClassBody: widget.el.querySelector(".preserve").innerHTML,
+            preserveBodyClass: widget.el
+                .querySelector(".preserve-body")
+                .getAttribute("data-renderId"),
+            preserveBodyClassBody: widget.el.querySelector(".preserve-body")
+                .innerHTML,
+            widgetClass: require("marko/legacy-components").getWidgetForEl(
+                widget.el.querySelector(".widget-no-id")
+            ).state.name
         };
     }
 
@@ -27,16 +35,16 @@ module.exports = function (helpers) {
     });
 
     var timestamps = getTimestamps();
-    expect(timestamps.preserveId).to.equal('0');
-    expect(timestamps.preserveIdBody).to.equal('0');
-    expect(timestamps.preserveBodyId).to.equal('10');
-    expect(timestamps.preserveBodyIdBody).to.equal('0');
-    expect(timestamps.widgetId).to.equal('0');
-    expect(timestamps.preserveClass).to.equal('0');
-    expect(timestamps.preserveClassBody).to.equal('0');
-    expect(timestamps.preserveBodyClass).to.equal('10');
-    expect(timestamps.preserveBodyClassBody).to.equal('0');
-    expect(timestamps.widgetClass).to.equal('0');
+    expect(timestamps.preserveId).to.equal("0");
+    expect(timestamps.preserveIdBody).to.equal("0");
+    expect(timestamps.preserveBodyId).to.equal("10");
+    expect(timestamps.preserveBodyIdBody).to.equal("0");
+    expect(timestamps.widgetId).to.equal("0");
+    expect(timestamps.preserveClass).to.equal("0");
+    expect(timestamps.preserveClassBody).to.equal("0");
+    expect(timestamps.preserveBodyClass).to.equal("10");
+    expect(timestamps.preserveBodyClassBody).to.equal("0");
+    expect(timestamps.widgetClass).to.equal("0");
 
     // expect(newEls1.el != null).to.equal(true);
     // expect(newEls1.el).to.equal(origEls.el);
@@ -64,14 +72,14 @@ module.exports = function (helpers) {
     });
 
     timestamps = getTimestamps();
-    expect(timestamps.preserveId).to.equal('100');
-    expect(timestamps.preserveIdBody).to.equal('100');
-    expect(timestamps.preserveBodyId).to.equal('100');
-    expect(timestamps.preserveBodyIdBody).to.equal('100');
-    expect(timestamps.widgetId).to.equal('100');
-    expect(timestamps.preserveClass).to.equal('100');
-    expect(timestamps.preserveClassBody).to.equal('100');
-    expect(timestamps.preserveBodyClass).to.equal('100');
-    expect(timestamps.preserveBodyClassBody).to.equal('100');
-    expect(timestamps.widgetClass).to.equal('100');
-};
\ No newline at end of file
+    expect(timestamps.preserveId).to.equal("100");
+    expect(timestamps.preserveIdBody).to.equal("100");
+    expect(timestamps.preserveBodyId).to.equal("100");
+    expect(timestamps.preserveBodyIdBody).to.equal("100");
+    expect(timestamps.widgetId).to.equal("100");
+    expect(timestamps.preserveClass).to.equal("100");
+    expect(timestamps.preserveClassBody).to.equal("100");
+    expect(timestamps.preserveBodyClass).to.equal("100");
+    expect(timestamps.preserveBodyClassBody).to.equal("100");
+    expect(timestamps.widgetClass).to.equal("100");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/index.js
index 60382064f..7898f9e95 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/index.js
@@ -1,4 +1,4 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    init: function () {}
-});
\ No newline at end of file
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/test.js
index 5e6f101b8..7c1c76ee4 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-repeated/test.js
@@ -1,5 +1,5 @@
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var oldChildren = helpers.nodeListToArray(widget.el.childNodes);
 
@@ -7,4 +7,4 @@ module.exports = function (helpers) {
 
     var newChildren = widget.el.childNodes;
     helpers.checkChildrenMatch(oldChildren, newChildren);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/index.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/index.js
index 17c806f68..df48360e8 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/index.js
@@ -1,21 +1,21 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getInitialState: function (input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	},
+    getInitialState: function(input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    },
 
-	getTemplateData: function (state, input) {
-		return {
-			name: state.name,
-			messageCount: state.messageCount
-		};
-	},
+    getTemplateData: function(state) {
+        return {
+            name: state.name,
+            messageCount: state.messageCount
+        };
+    },
 
-	setName: function (newName) {
-		this.setState('name', newName);
-	}
-});
\ No newline at end of file
+    setName: function(newName) {
+        this.setState("name", newName);
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/test.js b/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/test.js
index a29b7fc24..e731417f7 100644
--- a/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-preserve-dom-root/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 30
     });
 
-    expect(widget.el.innerHTML).to.contain('Frank');
-    expect(widget.el.innerHTML).to.contain('30');
+    expect(widget.el.innerHTML).to.contain("Frank");
+    expect(widget.el.innerHTML).to.contain("30");
 
-    widget.setName('John');
+    widget.setName("John");
     widget.update();
 
-    expect(widget.el.innerHTML).to.not.contain('John');
-    expect(widget.el.innerHTML).to.contain('Frank');
-    expect(widget.el.innerHTML).to.contain('30');
-};
\ No newline at end of file
+    expect(widget.el.innerHTML).to.not.contain("John");
+    expect(widget.el.innerHTML).to.contain("Frank");
+    expect(widget.el.innerHTML).to.contain("30");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-content/index.js b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-content/index.js
index 20b5a12e2..d7fcf5076 100644
--- a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-content/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-content/index.js
@@ -1,3 +1,3 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko')
-});
\ No newline at end of file
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko")
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-more-content/index.js b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-more-content/index.js
index b16b3f99d..6ca3466f6 100644
--- a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-more-content/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/components/app-iframe-more-content/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getValue: function () {
-		return this.getEl('input').value;
-	}
-});
\ No newline at end of file
+    getValue: function() {
+        return this.getEl("input").value;
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/index.js b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/index.js
index c5f706d94..ff9f2e23a 100644
--- a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/index.js
@@ -1,14 +1,17 @@
-var iframeContentComponent = require('./components/app-iframe-content');
+var iframeContentComponent = require("./components/app-iframe-content");
 
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	renderIntoIframe: function () {
-		var frameEl = this.getFrameEl();
-		return iframeContentComponent.renderSync({}).appendTo(frameEl.contentWindow.document.body).getWidget();
-	},
+    renderIntoIframe: function() {
+        var frameEl = this.getFrameEl();
+        return iframeContentComponent
+            .renderSync({})
+            .appendTo(frameEl.contentWindow.document.body)
+            .getWidget();
+    },
 
-	getFrameEl: function () {
-		return this.getEl('frame');
-	}
-});
\ No newline at end of file
+    getFrameEl: function() {
+        return this.getEl("frame");
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/marko.json b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/test.js b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/test.js
index 8c0aca38e..f2a7abb9f 100644
--- a/test/components-browser/fixtures-deprecated/widget-render-to-iframe/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-render-to-iframe/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     // expect(widget.___document).to.exist;
     // expect(widget.___document).to.equal(document);
 
     var contentWidget = widget.renderIntoIframe();
     // expect(contentWidget.___document).to.equal(widget.getFrameEl().contentWindow.document);
-    expect(contentWidget.getEl('input').value).to.equal('test');
+    expect(contentWidget.getEl("input").value).to.equal("test");
 
-    expect(contentWidget.getWidget('more').getValue()).to.equal('hello');
-};
\ No newline at end of file
+    expect(contentWidget.getWidget("more").getValue()).to.equal("hello");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-renderer-and-template/index.js b/test/components-browser/fixtures-deprecated/widget-renderer-and-template/index.js
index 6fe656a14..dacfe4992 100644
--- a/test/components-browser/fixtures-deprecated/widget-renderer-and-template/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-renderer-and-template/index.js
@@ -1,15 +1,18 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
-module.exports = require('marko/legacy-components').defineComponent({
+module.exports = require("marko/legacy-components").defineComponent({
     createOut: template.createOut,
 
-    renderer: function (input, out) {
-        template.render({
-            name: input.name
-        }, out);
+    renderer: function(input, out) {
+        template.render(
+            {
+                name: input.name
+            },
+            out
+        );
     },
 
-    setName: function (name) {
-        this.getEl('name').innerHTML = name;
+    setName: function(name) {
+        this.getEl("name").innerHTML = name;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-renderer-and-template/test.js b/test/components-browser/fixtures-deprecated/widget-renderer-and-template/test.js
index f90661f41..ed4aca472 100644
--- a/test/components-browser/fixtures-deprecated/widget-renderer-and-template/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-renderer-and-template/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
     var targetEl = widget.el.parentNode;
-    expect(targetEl.innerHTML).to.contain('Frank');
-    widget.setName('John');
-    expect(targetEl.innerHTML).to.contain('John');
-    expect(targetEl.innerHTML).to.not.contain('Frank');
+    expect(targetEl.innerHTML).to.contain("Frank");
+    widget.setName("John");
+    expect(targetEl.innerHTML).to.contain("John");
+    expect(targetEl.innerHTML).to.not.contain("Frank");
 
     widget.rerender({
-        name: 'Jane'
+        name: "Jane"
     });
 
-    expect(targetEl.innerHTML).to.contain('Jane');
-};
\ No newline at end of file
+    expect(targetEl.innerHTML).to.contain("Jane");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-renderer-only/index.js b/test/components-browser/fixtures-deprecated/widget-renderer-only/index.js
index cfefd679e..56d605f30 100644
--- a/test/components-browser/fixtures-deprecated/widget-renderer-only/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-renderer-only/index.js
@@ -1,7 +1,7 @@
-require('marko/runtime/vdom');
+require("marko/runtime/vdom");
 
-module.exports = require('marko/legacy-components').defineComponent({
-    renderer: function (input, out) {
-        out.text('Hello ' + input.name + '!');
+module.exports = require("marko/legacy-components").defineComponent({
+    renderer: function(input, out) {
+        out.text("Hello " + input.name + "!");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-renderer-only/test.js b/test/components-browser/fixtures-deprecated/widget-renderer-only/test.js
index 54051346c..8b42a78c3 100644
--- a/test/components-browser/fixtures-deprecated/widget-renderer-only/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-renderer-only/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
     var targetEl = helpers.targetEl;
-    expect(targetEl.innerHTML).to.equal('Hello Frank!');
-};
\ No newline at end of file
+    expect(targetEl.innerHTML).to.equal("Hello Frank!");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-simple/index.js b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-simple/index.js
index e8ab46839..c61db91a4 100644
--- a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-simple/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-simple/index.js
@@ -1,10 +1,10 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	}
-});
\ No newline at end of file
+    getTemplateData: function(state, input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-widgetless/renderer.js b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-widgetless/renderer.js
index df0f4a4b9..ecde690e1 100644
--- a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-widgetless/renderer.js
+++ b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/components/app-widgetless/renderer.js
@@ -1,5 +1,5 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
 module.exports = function renderer(input, out) {
     template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/index.js b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/index.js
index f354839f6..bc92fcf3a 100644
--- a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/index.js
@@ -1,12 +1,12 @@
-var widgetLessRenderer = require('./components/app-widgetless/renderer');
-var simpleRenderer = require('./components/app-simple').renderer;
+var widgetLessRenderer = require("./components/app-widgetless/renderer");
+var simpleRenderer = require("./components/app-simple").renderer;
 
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			renderers: [widgetLessRenderer, widgetLessRenderer, simpleRenderer]
-		};
-	}
-});
\ No newline at end of file
+    getTemplateData: function() {
+        return {
+            renderers: [widgetLessRenderer, widgetLessRenderer, simpleRenderer]
+        };
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/test.js b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/test.js
index 345a9442b..c530e2943 100644
--- a/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-repeated-id-widgetless/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    var childWidgets = widget.getWidgets('childWidget');
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    var childWidgets = widget.getWidgets("childWidget");
     expect(childWidgets.length).to.equal(3);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-replaceState/index.js b/test/components-browser/fixtures-deprecated/widget-replaceState/index.js
index 2432055c3..c233fe852 100644
--- a/test/components-browser/fixtures-deprecated/widget-replaceState/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-replaceState/index.js
@@ -1,17 +1,17 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            heading: input.heading || '',
-            message: input.message || '',
+            heading: input.heading || "",
+            message: input.message || "",
             colors: input.colors || []
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             heading: state.heading,
             message: state.message,
             colors: state.colors
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-replaceState/test.js b/test/components-browser/fixtures-deprecated/widget-replaceState/test.js
index 5de9f5513..86be2cef0 100644
--- a/test/components-browser/fixtures-deprecated/widget-replaceState/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-replaceState/test.js
@@ -1,20 +1,19 @@
-var expect = require('chai').expect;
-
-module.exports = function (helpers) {
+var expect = require("chai").expect;
 
+module.exports = function(helpers) {
     var states = {
         original: {
-            heading: 'original colors',
-            message: 'These are primary colors!',
-            colors: ['red', 'green', 'blue']
+            heading: "original colors",
+            message: "These are primary colors!",
+            colors: ["red", "green", "blue"]
         },
         new: {
-            heading: 'new colors',
-            colors: ['orange', 'yellow', 'purple']
+            heading: "new colors",
+            colors: ["orange", "yellow", "purple"]
         }
     };
 
-    var widget = helpers.mount(require.resolve('./index'), states.original);
+    var widget = helpers.mount(require.resolve("./index"), states.original);
 
     expect(widget.state.heading).to.equal(states.original.heading);
     expect(widget.state.message).to.equal(states.original.message);
@@ -26,4 +25,4 @@ module.exports = function (helpers) {
     expect(widget.state.heading).to.equal(states.new.heading);
     expect(widget.state.message).to.equal(states.new.message); // undefined
     expect(widget.state.colors).to.deep.equal(states.new.colors);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/components/app-rerender-init-order-child/index.js b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/components/app-rerender-init-order-child/index.js
index 8be731c68..fe064437e 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/components/app-rerender-init-order-child/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/components/app-rerender-init-order-child/index.js
@@ -1,24 +1,24 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getInitialState: function(input) {
         return {
             version: input.version,
             id: input.id
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             version: state.version,
             id: state.id
         };
     },
-    init: function () {
+    init: function() {
         // console.log(module.id, 'init()', this.state);
         window.rerenderInitOrder = window.rerenderInitOrder || [];
         window.rerenderInitOrder.push(this.state.id);
     },
-    onUpdate: function () {
+    onUpdate: function() {
         // console.log(module.id, 'init()', this.state);
         window.rerenderInitOrder.push(this.state.id);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/index.js b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/index.js
index b95fb5e32..ae5711f9f 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/index.js
@@ -1,20 +1,20 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getInitialState: function(input) {
         return {
             version: input.version
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             version: state.version
         };
     },
-    init: function () {
+    init: function() {
         window.rerenderInitOrder = window.rerenderInitOrder || [];
-        window.rerenderInitOrder.push('parent');
+        window.rerenderInitOrder.push("parent");
     },
-    onUpdate: function () {
-        window.rerenderInitOrder.push('parent');
+    onUpdate: function() {
+        window.rerenderInitOrder.push("parent");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/marko.json b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/test.js b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/test.js
index 80cbf1d46..5901636af 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-init-order/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-init-order/test.js
@@ -1,19 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
         version: 0
     });
 
-    expect(window.rerenderInitOrder).to.deep.equal(['childB', 'childA', 'parent']);
+    expect(window.rerenderInitOrder).to.deep.equal([
+        "childB",
+        "childA",
+        "parent"
+    ]);
 
     window.rerenderInitOrder = [];
 
-    widget.setState('version', 1);
+    widget.setState("version", 1);
     widget.update();
 
     // console.log('ACTUAL ORDER: ', window.rerenderInitOrder);
-    expect(window.rerenderInitOrder).to.deep.equal(['childB', 'childA', 'parent']);
+    expect(window.rerenderInitOrder).to.deep.equal([
+        "childB",
+        "childA",
+        "parent"
+    ]);
 
     window.rerenderInitOrder = null;
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/index.js b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/index.js
index e75aa3fac..3f37ab1dd 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/index.js
@@ -1,17 +1,17 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            buttonSize: input.buttonSize || 'normal'
+            buttonSize: input.buttonSize || "normal"
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             buttonSize: state.buttonSize
         };
     },
 
-    setButtonSize: function (size) {
-        this.setState('buttonSize', size);
+    setButtonSize: function(size) {
+        this.setState("buttonSize", size);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/marko.json b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/test.js b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/test.js
index a041f5f1d..edd7391b7 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-reuse-stateful/test.js
@@ -1,29 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var widget = helpers.mount(require.resolve('./index'), {});
-
-    var oldButton1Widget = widget.getWidget('button1');
-    var oldButton2Widget = widget.getWidget('button2');
+    var oldButton1Widget = widget.getWidget("button1");
+    var oldButton2Widget = widget.getWidget("button2");
     var oldButton1El = oldButton1Widget.el;
-    var oldButton2El = widget.getEl('button2');
+    var oldButton2El = widget.getEl("button2");
 
-    expect(widget.getWidget('button1').el.innerHTML).to.equal('normal');
+    expect(widget.getWidget("button1").el.innerHTML).to.equal("normal");
 
     var self = widget;
 
-    self.setButtonSize('small');
+    self.setButtonSize("small");
     self.rerender();
 
-    var newButton1El = widget.getWidget('button1').el;
-    var newButton2El = widget.getEl('button2');
+    var newButton1El = widget.getWidget("button1").el;
+    var newButton2El = widget.getEl("button2");
 
     // // Both button widgets should be reused
-    expect(widget.getWidget('button1')).to.equal(oldButton1Widget);
-    expect(widget.getWidget('button2')).to.equal(oldButton2Widget);
+    expect(widget.getWidget("button1")).to.equal(oldButton1Widget);
+    expect(widget.getWidget("button2")).to.equal(oldButton2Widget);
 
-    expect(widget.getWidget('button1').el.innerHTML).to.equal('small');
+    expect(widget.getWidget("button1").el.innerHTML).to.equal("small");
 
     // // State changed for button1 so it should have a new el
     // // since it re-renders to update its view
@@ -33,4 +32,4 @@ module.exports = function (helpers) {
     //
     // // State didn't change for button2 so it should be the same el
     expect(newButton2El).to.equal(oldButton2El);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/index.js b/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/index.js
index e8ab46839..c61db91a4 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/index.js
@@ -1,10 +1,10 @@
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function (state, input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	}
-});
\ No newline at end of file
+    getTemplateData: function(state, input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/test.js b/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/test.js
index 628a278e3..28236eae8 100644
--- a/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-rerender-stateless-new-props/test.js
@@ -1,29 +1,37 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var targetEl = helpers.targetEl;
 
-    var widget = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+    var widget = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 10
     });
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 10 new messages."
+    );
 
     widget.setProps({
-        name: 'John',
+        name: "John",
         messageCount: 20
     });
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 20 new messages."
+    );
 
     widget.setProps({
-        name: 'Jane',
+        name: "Jane",
         messageCount: 30
     });
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 20 new messages."
+    );
     widget.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello Jane! You have 30 new messages.');
-};
\ No newline at end of file
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Jane! You have 30 new messages."
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-setStateDirty/index.js b/test/components-browser/fixtures-deprecated/widget-setStateDirty/index.js
index e386e5548..4acc84385 100644
--- a/test/components-browser/fixtures-deprecated/widget-setStateDirty/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-setStateDirty/index.js
@@ -1,18 +1,18 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
             colors: input.colors || []
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             colors: state.colors
         };
     },
 
-    addColor: function (color) {
+    addColor: function(color) {
         this.state.colors.push(color);
-        this.setStateDirty('color');
+        this.setStateDirty("color");
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-setStateDirty/test.js b/test/components-browser/fixtures-deprecated/widget-setStateDirty/test.js
index 6f3a2e42f..0993965ef 100644
--- a/test/components-browser/fixtures-deprecated/widget-setStateDirty/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-setStateDirty/test.js
@@ -1,20 +1,20 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    expect(widget.el.innerHTML).to.contain('red');
-    expect(widget.el.innerHTML).to.contain('green');
-    expect(widget.el.innerHTML).to.contain('blue');
+    expect(widget.el.innerHTML).to.contain("red");
+    expect(widget.el.innerHTML).to.contain("green");
+    expect(widget.el.innerHTML).to.contain("blue");
 
     // NOTE: name does *not* have an update handler
-    widget.addColor('orange');
+    widget.addColor("orange");
     widget.update();
 
-    expect(widget.el.innerHTML).to.contain('red');
-    expect(widget.el.innerHTML).to.contain('green');
-    expect(widget.el.innerHTML).to.contain('blue');
-    expect(widget.el.innerHTML).to.contain('orange');
-};
\ No newline at end of file
+    expect(widget.el.innerHTML).to.contain("red");
+    expect(widget.el.innerHTML).to.contain("green");
+    expect(widget.el.innerHTML).to.contain("blue");
+    expect(widget.el.innerHTML).to.contain("orange");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/test.js
index 480d08e20..fa9e7a27b 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-copy-state-on-write/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var oldState = widget.state.toJSON();
-    widget.setState('foo', 'bar');
+    widget.setState("foo", "bar");
 
     expect(widget.state.toJSON()).to.not.equal(oldState);
 
     oldState = widget.state.toJSON();
-    widget.setState('hello', 'world');
+    widget.setState("hello", "world");
     expect(widget.state.toJSON()).to.equal(oldState);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/test.js
index cedb332fb..0d827a648 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-no-copy-state-on-write-if-same-value/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
     var oldState = widget.state;
-    widget.setState('size', 'large');
+    widget.setState("size", "large");
     expect(widget.state).to.equal(oldState);
     widget.update();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/test.js
index 8a8eaf784..36f2adac5 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-no-rerender-if-destroyed/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    expect(widget.el.className).to.contain('large');
+    expect(widget.el.className).to.contain("large");
 
     widget.destroy();
 
     expect(widget.update()).to.be.undefined;
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/index.js
index 4ce177e7b..e4766393e 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Component instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/index.js
index 90e9fe476..9cab65c70 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/index.js
@@ -1,8 +1,8 @@
-module.exports = require('marko/legacy-components').defineRenderer({
-    template: require.resolve('./template.marko'),
-    getTemplateData: function () {
+module.exports = require("marko/legacy-components").defineRenderer({
+    template: require.resolve("./template.marko"),
+    getTemplateData: function() {
         return {
-            buttonLabel: 'Initial Button Label'
+            buttonLabel: "Initial Button Label"
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/marko.json b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/test.js
index f0df5d436..f1cb1e9c2 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var button1Widget = widget.getWidget('button1');
+    var button1Widget = widget.getWidget("button1");
 
-    expect(button1Widget.el.innerHTML).to.include('Initial Button Label');
-    expect(button1Widget.el.className).to.contain('large');
+    expect(button1Widget.el.innerHTML).to.include("Initial Button Label");
+    expect(button1Widget.el.className).to.contain("large");
 
-    button1Widget.setSize('small');
+    button1Widget.setSize("small");
     button1Widget.update();
 
-    expect(button1Widget.el.innerHTML).to.include('Initial Button Label');
-    expect(button1Widget.el.className).to.contain('small');
-};
\ No newline at end of file
+    expect(button1Widget.el.innerHTML).to.include("Initial Button Label");
+    expect(button1Widget.el.className).to.contain("small");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/widget.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/widget.js
index 4ac0eaa70..3010f96d6 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/widget.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body-from-split-component/widget.js
@@ -1,3 +1,3 @@
-module.exports = require('marko/legacy-components').defineWidget({
+module.exports = require("marko/legacy-components").defineWidget({
     init: function() {}
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js
index 4ce177e7b..e4766393e 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Component instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/index.js
index 4215cefd6..1595bad8a 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/index.js
@@ -1,13 +1,13 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function() {
         return {
-            buttonLabel: 'Initial Button Label'
+            buttonLabel: "Initial Button Label"
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             buttonLabel: state.buttonLabel
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/marko.json b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/test.js
index 3dd91a21c..9768319c5 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-preserve-body/test.js
@@ -1,22 +1,22 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var button1Widget = widget.getWidget('button1');
+    var button1Widget = widget.getWidget("button1");
 
-    expect(button1Widget.el.innerHTML).to.equal('Initial Button Label');
-    expect(button1Widget.el.className).to.contain('large');
+    expect(button1Widget.el.innerHTML).to.equal("Initial Button Label");
+    expect(button1Widget.el.className).to.contain("large");
 
-    button1Widget.setSize('small');
+    button1Widget.setSize("small");
     button1Widget.update();
 
-    expect(button1Widget.el.innerHTML).to.equal('Initial Button Label');
-    expect(button1Widget.el.className).to.contain('small');
+    expect(button1Widget.el.innerHTML).to.equal("Initial Button Label");
+    expect(button1Widget.el.className).to.contain("small");
 
-    widget.setState('buttonLabel', 'New Button Label');
+    widget.setState("buttonLabel", "New Button Label");
     widget.update();
 
-    expect(button1Widget.el.innerHTML).to.equal('New Button Label');
-    expect(button1Widget.el.className).to.contain('large'); // Size will revert back to large since it was not driven by state
-};
\ No newline at end of file
+    expect(button1Widget.el.innerHTML).to.equal("New Button Label");
+    expect(button1Widget.el.className).to.contain("large"); // Size will revert back to large since it was not driven by state
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/index.js
index ca2c9672f..15ff76679 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/index.js
@@ -1,18 +1,18 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
+    getInitialState: function(input) {
         return {
-            buttonSize: input.buttonSize || 'normal'
+            buttonSize: input.buttonSize || "normal"
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             buttonSize: state.buttonSize
         };
     },
 
-    setButtonSize: function (size) {
-        this.setState('buttonSize', size);
+    setButtonSize: function(size) {
+        this.setState("buttonSize", size);
     },
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/marko.json b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/test.js
index fbb09e698..edd7391b7 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-reuse-widgets/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
-    var oldButton1Widget = widget.getWidget('button1');
-    var oldButton2Widget = widget.getWidget('button2');
+    var oldButton1Widget = widget.getWidget("button1");
+    var oldButton2Widget = widget.getWidget("button2");
     var oldButton1El = oldButton1Widget.el;
-    var oldButton2El = widget.getEl('button2');
+    var oldButton2El = widget.getEl("button2");
 
-    expect(widget.getWidget('button1').el.innerHTML).to.equal('normal');
+    expect(widget.getWidget("button1").el.innerHTML).to.equal("normal");
 
     var self = widget;
 
-    self.setButtonSize('small');
+    self.setButtonSize("small");
     self.rerender();
 
-    var newButton1El = widget.getWidget('button1').el;
-    var newButton2El = widget.getEl('button2');
+    var newButton1El = widget.getWidget("button1").el;
+    var newButton2El = widget.getEl("button2");
 
     // // Both button widgets should be reused
-    expect(widget.getWidget('button1')).to.equal(oldButton1Widget);
-    expect(widget.getWidget('button2')).to.equal(oldButton2Widget);
+    expect(widget.getWidget("button1")).to.equal(oldButton1Widget);
+    expect(widget.getWidget("button2")).to.equal(oldButton2Widget);
 
-    expect(widget.getWidget('button1').el.innerHTML).to.equal('small');
+    expect(widget.getWidget("button1").el.innerHTML).to.equal("small");
 
     // // State changed for button1 so it should have a new el
     // // since it re-renders to update its view
@@ -32,4 +32,4 @@ module.exports = function (helpers) {
     //
     // // State didn't change for button2 so it should be the same el
     expect(newButton2El).to.equal(oldButton2El);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/index.js
index 578275628..d059502fe 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/index.js
@@ -1,20 +1,20 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function() {
         return {
-            buttonSize: 'small',
-            buttonLabel: 'Initial Label'
+            buttonSize: "small",
+            buttonLabel: "Initial Label"
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             buttonSize: state.buttonSize,
             buttonLabel: state.buttonLabel
         };
     },
 
-    update_buttonSize: function (newSize) {
-        var button1Widget = this.getWidget('button1');
+    update_buttonSize: function(newSize) {
+        var button1Widget = this.getWidget("button1");
         button1Widget.setSize(newSize);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/marko.json b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/test.js
index acf03c815..618c0d7e1 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler-no-match/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var oldEl = widget.el;
 
-    var button1Widget = widget.getWidget('button1');
-    var button2Widget = widget.getWidget('button2');
+    var button1Widget = widget.getWidget("button1");
+    var button2Widget = widget.getWidget("button2");
 
-    expect(button1Widget.el.className).to.contain('small');
-    expect(button2Widget.el.className).to.contain('small');
+    expect(button1Widget.el.className).to.contain("small");
+    expect(button2Widget.el.className).to.contain("small");
 
-    expect(button1Widget.el.innerHTML).to.contain('Initial Label');
-    expect(button2Widget.el.innerHTML).to.contain('Initial Label');
+    expect(button1Widget.el.innerHTML).to.contain("Initial Label");
+    expect(button2Widget.el.innerHTML).to.contain("Initial Label");
 
-    widget.setState('buttonSize', 'large');
-    widget.setState('buttonLabel', 'New Label'); // buttonLabel does not have an update handler
+    widget.setState("buttonSize", "large");
+    widget.setState("buttonLabel", "New Label"); // buttonLabel does not have an update handler
     widget.update();
 
-    expect(button1Widget.el.className).to.contain('large');
-    expect(button2Widget.el.className).to.contain('large');
+    expect(button1Widget.el.className).to.contain("large");
+    expect(button2Widget.el.className).to.contain("large");
 
-    expect(button1Widget.el.innerHTML).to.contain('New Label');
-    expect(button2Widget.el.innerHTML).to.contain('New Label');
+    expect(button1Widget.el.innerHTML).to.contain("New Label");
+    expect(button2Widget.el.innerHTML).to.contain("New Label");
 
     expect(widget.el).to.equal(oldEl);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/index.js
index 68d672d3e..5c6ba9fc4 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/index.js
@@ -1,21 +1,21 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function() {
         return {
-            buttonSize: 'small',
-            buttonLabel: 'Initial Label'
+            buttonSize: "small",
+            buttonLabel: "Initial Label"
         };
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         return {
             buttonSize: state.buttonSize,
             buttonLabel: state.buttonLabel
         };
     },
 
-    update_buttonSize: function (newSize) {
-        var button1Widget = this.getWidget('button1');
+    update_buttonSize: function(newSize) {
+        var button1Widget = this.getWidget("button1");
         button1Widget.setSize(newSize);
         button1Widget.update();
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/marko.json b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/test.js
index 94ae2a988..9eb272c1c 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update-handler/test.js
@@ -1,30 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var oldEl = widget.el;
 
-    var button1Widget = widget.getWidget('button1');
-    var button2Widget = widget.getWidget('button2');
+    var button1Widget = widget.getWidget("button1");
+    var button2Widget = widget.getWidget("button2");
 
-    expect(button1Widget.el.className).to.contain('small');
-    expect(button2Widget.el.className).to.contain('small');
+    expect(button1Widget.el.className).to.contain("small");
+    expect(button2Widget.el.className).to.contain("small");
 
-    expect(button1Widget.el.innerHTML).to.contain('Initial Label');
-    expect(button2Widget.el.innerHTML).to.contain('Initial Label');
+    expect(button1Widget.el.innerHTML).to.contain("Initial Label");
+    expect(button2Widget.el.innerHTML).to.contain("Initial Label");
 
-    widget.setState('buttonSize', 'large');
+    widget.setState("buttonSize", "large");
     widget.update();
 
-    expect(button1Widget).to.equal(widget.getWidget('button1'));
-    expect(button2Widget).to.equal(widget.getWidget('button2'));
+    expect(button1Widget).to.equal(widget.getWidget("button1"));
+    expect(button2Widget).to.equal(widget.getWidget("button2"));
 
-    expect(button1Widget.el.className).to.contain('large');
-    expect(button2Widget.el.className).to.contain('small');
+    expect(button1Widget.el.className).to.contain("large");
+    expect(button2Widget.el.className).to.contain("small");
 
-    expect(button1Widget.el.innerHTML).to.contain('Initial Label');
-    expect(button2Widget.el.innerHTML).to.contain('Initial Label');
+    expect(button1Widget.el.innerHTML).to.contain("Initial Label");
+    expect(button2Widget.el.innerHTML).to.contain("Initial Label");
 
     expect(widget.el).to.equal(oldEl);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update/index.js b/test/components-browser/fixtures-deprecated/widget-stateful-update/index.js
index 9a3ad9ede..47972b93f 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update/index.js
@@ -1,32 +1,32 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require.resolve('./template.marko'),
-    getInitialState: function (input) {
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
+    getInitialState: function(input) {
         return {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
-            attrs: input['*']
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
+            attrs: input["*"]
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
         var variant = state.variant;
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
         var size = state.size;
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
         var className = state.className;
@@ -43,7 +43,7 @@ module.exports = require('marko/legacy-components').defineComponent({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
@@ -51,29 +51,29 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Widget instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stateful-update/test.js b/test/components-browser/fixtures-deprecated/widget-stateful-update/test.js
index 1ef45823f..f33eb364e 100644
--- a/test/components-browser/fixtures-deprecated/widget-stateful-update/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stateful-update/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    expect(widget.el.className).to.contain('large');
+    expect(widget.el.className).to.contain("large");
 
-    widget.setSize('small');
+    widget.setSize("small");
     widget.update();
 
-    expect(widget.el.className).to.contain('small');
-};
\ No newline at end of file
+    expect(widget.el.className).to.contain("small");
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-stopPropagation/index.js b/test/components-browser/fixtures-deprecated/widget-stopPropagation/index.js
index 1f33aa9fd..32ec924d0 100644
--- a/test/components-browser/fixtures-deprecated/widget-stopPropagation/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-stopPropagation/index.js
@@ -1,26 +1,24 @@
-var expect = require('chai').expect;
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require.resolve("./template.marko"),
 
-module.exports = require('marko/legacy-components').defineComponent({
-	template: require.resolve('./template.marko'),
+    getTemplateData: function(state, input) {
+        return {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    },
 
-	getTemplateData: function (state, input) {
-		return {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	},
+    init: function() {
+        this.divClicked = false;
+        this.buttonClicked = false;
+    },
 
-	init: function () {
-		this.divClicked = false;
-		this.buttonClicked = false;
-	},
+    handleDivClick: function() {
+        this.divClicked = true;
+    },
 
-	handleDivClick: function (event) {
-		this.divClicked = true;
-	},
-
-	handleButtonClick: function (event) {
-		this.buttonClicked = true;
-		event.stopPropagation();
-	}
-});
\ No newline at end of file
+    handleButtonClick: function(event) {
+        this.buttonClicked = true;
+        event.stopPropagation();
+    }
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-stopPropagation/test.js b/test/components-browser/fixtures-deprecated/widget-stopPropagation/test.js
index f0d1161f7..38a98a666 100644
--- a/test/components-browser/fixtures-deprecated/widget-stopPropagation/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-stopPropagation/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
-    helpers.triggerClick(widget.getEl('button'));
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
+    helpers.triggerClick(widget.getEl("button"));
     expect(widget.divClicked).to.equal(false);
     expect(widget.buttonClicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-subscribeTo/index.js b/test/components-browser/fixtures-deprecated/widget-subscribeTo/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-subscribeTo/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-subscribeTo/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-subscribeTo/test.js b/test/components-browser/fixtures-deprecated/widget-subscribeTo/test.js
index 344b15bae..24d45dd65 100644
--- a/test/components-browser/fixtures-deprecated/widget-subscribeTo/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-subscribeTo/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget1 = helpers.mount(require.resolve('./index'), {});
-    var widget2 = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget1 = helpers.mount(require.resolve("./index"), {});
+    var widget2 = helpers.mount(require.resolve("./index"), {});
 
     var fooEvent = null;
     var fooEventThis = null;
 
-    widget1.subscribeTo(widget2).on('foo', function fooListener() {
+    widget1.subscribeTo(widget2).on("foo", function fooListener() {
         fooEvent = arguments;
         fooEventThis = this;
     });
 
-    widget2.emit('foo', 'a', 'b');
+    widget2.emit("foo", "a", "b");
 
-    expect(fooEvent[0]).to.equal('a');
-    expect(fooEvent[1]).to.equal('b');
+    expect(fooEvent[0]).to.equal("a");
+    expect(fooEvent[1]).to.equal("b");
     expect(fooEventThis).to.equal(widget2);
 
     fooEvent = null;
 
     widget2.destroy();
 
-    widget2.emit('foo', 'a', 'b');
+    widget2.emit("foo", "a", "b");
 
     expect(fooEvent).to.equal(null);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/index.js b/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/index.js
index a6c76d865..c5cc76210 100644
--- a/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/index.js
@@ -1,22 +1,22 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getInitialState: function (input) {
-        var type = input.type || 'success';
+    getInitialState: function(input) {
+        var type = input.type || "success";
 
         return {
             type: type
         };
     },
 
-    getInitialBody: function (input) {
+    getInitialBody: function(input) {
         return input.message || input.renderBody;
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var type = state.type;
 
-        var className = 'alert alert-' + type;
+        var className = "alert alert-" + type;
 
         return {
             className: className,
@@ -24,7 +24,7 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    setType: function (newType) {
-        this.setState('type', newType);
+    setType: function(newType) {
+        this.setState("type", newType);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/marko-tag.json b/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/marko-tag.json
index bb0eb1be5..fba07b1be 100644
--- a/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/marko-tag.json
+++ b/test/components-browser/fixtures-deprecated/widget-transclusion/components/app-transclusion-alert/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "@type": "string",
     "@message": "string"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-transclusion/index.js b/test/components-browser/fixtures-deprecated/widget-transclusion/index.js
index 0f8d3cccb..00606affd 100644
--- a/test/components-browser/fixtures-deprecated/widget-transclusion/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-transclusion/index.js
@@ -1,9 +1,9 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    getInitialState: function (input) {
-        var alertType = input.alertType || 'success';
-        var alertMessage = input.alertMessage || 'Hello World!';
+    getInitialState: function(input) {
+        var alertType = input.alertType || "success";
+        var alertMessage = input.alertMessage || "Hello World!";
 
         return {
             alertType: alertType,
@@ -11,7 +11,7 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state) {
         var alertType = state.alertType;
         var alertMessage = state.alertMessage;
 
@@ -21,11 +21,11 @@ module.exports = require('marko/legacy-components').defineComponent({
         };
     },
 
-    setAlertType: function (newAlertType) {
-        this.setState('alertType', newAlertType);
+    setAlertType: function(newAlertType) {
+        this.setState("alertType", newAlertType);
     },
 
-    setAlertMessage: function (newAlertMessage) {
-        this.setState('alertMessage', newAlertMessage);
+    setAlertMessage: function(newAlertMessage) {
+        this.setState("alertMessage", newAlertMessage);
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-transclusion/marko.json b/test/components-browser/fixtures-deprecated/widget-transclusion/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures-deprecated/widget-transclusion/marko.json
+++ b/test/components-browser/fixtures-deprecated/widget-transclusion/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures-deprecated/widget-transclusion/test.js b/test/components-browser/fixtures-deprecated/widget-transclusion/test.js
index 9703e21ef..7dffb82a9 100644
--- a/test/components-browser/fixtures-deprecated/widget-transclusion/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-transclusion/test.js
@@ -1,26 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var widget = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var widget = helpers.mount(require.resolve("./index"), {});
 
     var el = widget.el;
-    var originalH1Html = el.querySelector('h1').innerHTML;
+    var originalH1Html = el.querySelector("h1").innerHTML;
 
-    expect(el.innerHTML).to.contain('alert alert-success');
+    expect(el.innerHTML).to.contain("alert alert-success");
 
     // The inner HTML for the H1 should not change since only the body content changed
-    widget.setAlertMessage('Hello Universe');
+    widget.setAlertMessage("Hello Universe");
     widget.update();
 
-    expect(el.querySelector('h1').innerHTML).to.equal(originalH1Html);
-    expect(el.querySelector('h1').innerHTML).to.contain('success');
-    expect(el.querySelector('.alert').className).to.contain('alert alert-success');
+    expect(el.querySelector("h1").innerHTML).to.equal(originalH1Html);
+    expect(el.querySelector("h1").innerHTML).to.contain("success");
+    expect(el.querySelector(".alert").className).to.contain(
+        "alert alert-success"
+    );
 
     // The inner HTML for the H1 should change since the state of the alert widget changed
-    widget.setAlertType('failure');
+    widget.setAlertType("failure");
     widget.update();
 
-    expect(el.querySelector('h1').innerHTML).to.not.equal(originalH1Html);
-    expect(el.querySelector('h1').innerHTML).to.contain('failure');
-    expect(el.querySelector('.alert').className).to.contain('alert alert-failure');
-};
\ No newline at end of file
+    expect(el.querySelector("h1").innerHTML).to.not.equal(originalH1Html);
+    expect(el.querySelector("h1").innerHTML).to.contain("failure");
+    expect(el.querySelector(".alert").className).to.contain(
+        "alert alert-failure"
+    );
+};
diff --git a/test/components-browser/fixtures-deprecated/widget-unique-id/index.js b/test/components-browser/fixtures-deprecated/widget-unique-id/index.js
index df79ebf58..7994e572a 100644
--- a/test/components-browser/fixtures-deprecated/widget-unique-id/index.js
+++ b/test/components-browser/fixtures-deprecated/widget-unique-id/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko/legacy-components').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko/legacy-components").defineComponent({
+    template: require("./template.marko"),
 
-    init: function () {}
-});
\ No newline at end of file
+    init: function() {}
+});
diff --git a/test/components-browser/fixtures-deprecated/widget-unique-id/test.js b/test/components-browser/fixtures-deprecated/widget-unique-id/test.js
index 9f11b0d8c..53382a359 100644
--- a/test/components-browser/fixtures-deprecated/widget-unique-id/test.js
+++ b/test/components-browser/fixtures-deprecated/widget-unique-id/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var widgets = [];
 
     function renderWidget() {
-        var widget = helpers.mount(require.resolve('./index'), {});
+        var widget = helpers.mount(require.resolve("./index"), {});
         widgets.push(widget);
     }
 
@@ -13,10 +13,10 @@ module.exports = function (helpers) {
     renderWidget();
 
     var ids = {};
-    widgets.forEach(function (widget) {
+    widgets.forEach(function(widget) {
         ids[widget.id] = true;
     });
 
     expect(widgets.length).to.equal(3);
     expect(Object.keys(ids).length).to.equal(widgets.length);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/class-named/test.js b/test/components-browser/fixtures/class-named/test.js
index b1df78b26..159f2c0c2 100644
--- a/test/components-browser/fixtures/class-named/test.js
+++ b/test/components-browser/fixtures/class-named/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.sayHello('Frank')).to.equal('Hello Frank!');
-};
\ No newline at end of file
+    expect(component.sayHello("Frank")).to.equal("Hello Frank!");
+};
diff --git a/test/components-browser/fixtures/component-api/component.js b/test/components-browser/fixtures/component-api/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/component-api/component.js
+++ b/test/components-browser/fixtures/component-api/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/component-api/test.js b/test/components-browser/fixtures/component-api/test.js
index 46023d88a..8b2d0f66e 100644
--- a/test/components-browser/fixtures/component-api/test.js
+++ b/test/components-browser/fixtures/component-api/test.js
@@ -1,23 +1,23 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.id).to.be.a('string');
-    expect(component.emit).to.be.a('function');
-    expect(component.on).to.be.a('function');
-    expect(component.once).to.be.a('function');
-    expect(component.subscribeTo).to.be.a('function');
-    expect(component.getElId).to.be.a('function');
-    expect(component.elId).to.be.a('function');
-    expect(component.getEl).to.be.a('function');
-    expect(component.destroy).to.be.a('function');
-    expect(component.isDestroyed).to.be.a('function');
-    expect(component.update).to.be.a('function');
-    expect(component.forceUpdate).to.be.a('function');
-    expect(component.appendTo).to.be.a('function');
-    expect(component.replace).to.be.a('function');
-    expect(component.replaceChildrenOf).to.be.a('function');
-    expect(component.insertBefore).to.be.a('function');
-    expect(component.insertAfter).to.be.a('function');
-    expect(component.prependTo).to.be.a('function');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.id).to.be.a("string");
+    expect(component.emit).to.be.a("function");
+    expect(component.on).to.be.a("function");
+    expect(component.once).to.be.a("function");
+    expect(component.subscribeTo).to.be.a("function");
+    expect(component.getElId).to.be.a("function");
+    expect(component.elId).to.be.a("function");
+    expect(component.getEl).to.be.a("function");
+    expect(component.destroy).to.be.a("function");
+    expect(component.isDestroyed).to.be.a("function");
+    expect(component.update).to.be.a("function");
+    expect(component.forceUpdate).to.be.a("function");
+    expect(component.appendTo).to.be.a("function");
+    expect(component.replace).to.be.a("function");
+    expect(component.replaceChildrenOf).to.be.a("function");
+    expect(component.insertBefore).to.be.a("function");
+    expect(component.insertAfter).to.be.a("function");
+    expect(component.prependTo).to.be.a("function");
 };
diff --git a/test/components-browser/fixtures/component-file-exports-class/component.js b/test/components-browser/fixtures/component-file-exports-class/component.js
index 6a4d3c3d5..ae46936ee 100644
--- a/test/components-browser/fixtures/component-file-exports-class/component.js
+++ b/test/components-browser/fixtures/component-file-exports-class/component.js
@@ -1,13 +1,13 @@
 function Component() {
-    throw new Error('THIS SHOULD NOT BE CALLED');
+    throw new Error("THIS SHOULD NOT BE CALLED");
 }
 
 Component.prototype = {
-    onCreate: function () {
+    onCreate: function() {
         this.state = {
-            name: 'Frank'
+            name: "Frank"
         };
     }
 };
 
-module.exports = Component;
\ No newline at end of file
+module.exports = Component;
diff --git a/test/components-browser/fixtures/component-file-exports-class/test.js b/test/components-browser/fixtures/component-file-exports-class/test.js
index ac3cde7fe..d844968cb 100644
--- a/test/components-browser/fixtures/component-file-exports-class/test.js
+++ b/test/components-browser/fixtures/component-file-exports-class/test.js
@@ -1,6 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.el.innerHTML).to.contain('Frank');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.el.innerHTML).to.contain("Frank");
+};
diff --git a/test/components-browser/fixtures/component-renderToString-callback-sync/component.js b/test/components-browser/fixtures/component-renderToString-callback-sync/component.js
index 5794c3b6e..6f8218410 100644
--- a/test/components-browser/fixtures/component-renderToString-callback-sync/component.js
+++ b/test/components-browser/fixtures/component-renderToString-callback-sync/component.js
@@ -1,16 +1,19 @@
-var helloComponent = require('./components/hello');
+var helloComponent = require("./components/hello");
 
 module.exports = {
-    onMount: function () {
+    onMount: function() {
         var self = this;
-        helloComponent.renderToString({
-            name: this.input.name
-        }, function (error, html) {
-            if (error) {
-                self.emit('renderError', error);
-            } else {
-                self.emit('html', html);
+        helloComponent.renderToString(
+            {
+                name: this.input.name
+            },
+            function(error, html) {
+                if (error) {
+                    self.emit("renderError", error);
+                } else {
+                    self.emit("html", html);
+                }
             }
-        });
+        );
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-renderToString-callback-sync/components/test-async/renderer.js b/test/components-browser/fixtures/component-renderToString-callback-sync/components/test-async/renderer.js
index b4159bc3f..dd4704826 100644
--- a/test/components-browser/fixtures/component-renderToString-callback-sync/components/test-async/renderer.js
+++ b/test/components-browser/fixtures/component-renderToString-callback-sync/components/test-async/renderer.js
@@ -1,7 +1,7 @@
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
-    setTimeout(function () {
-        asyncOut.write('[async] ' + input.name);
+    setTimeout(function() {
+        asyncOut.write("[async] " + input.name);
         asyncOut.end();
     }, 10);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-renderToString-callback-sync/test.js b/test/components-browser/fixtures/component-renderToString-callback-sync/test.js
index 661f271b1..b06a983ec 100644
--- a/test/components-browser/fixtures/component-renderToString-callback-sync/test.js
+++ b/test/components-browser/fixtures/component-renderToString-callback-sync/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'john'
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "john"
     });
 
-    component.on('html', function (renderedHtml) {
-        expect(renderedHtml).to.equal('<div>[async] john</div>');
+    component.on("html", function(renderedHtml) {
+        expect(renderedHtml).to.equal("<div>[async] john</div>");
         done();
     });
 
-    component.on('error', function (error) {
+    component.on("error", function(error) {
         done(error);
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-renderToString-text-node/component.js b/test/components-browser/fixtures/component-renderToString-text-node/component.js
index 8924bdb24..900ed088a 100644
--- a/test/components-browser/fixtures/component-renderToString-text-node/component.js
+++ b/test/components-browser/fixtures/component-renderToString-text-node/component.js
@@ -1,7 +1,7 @@
-var myTextNodeComponent = require('./components/my-text-node');
+var myTextNodeComponent = require("./components/my-text-node");
 
 module.exports = {
-    onMount: function () {
+    onMount: function() {
         this.renderedHtml = myTextNodeComponent.renderToString();
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-renderToString-text-node/test.js b/test/components-browser/fixtures/component-renderToString-text-node/test.js
index d6d1f3fda..0174998b2 100644
--- a/test/components-browser/fixtures/component-renderToString-text-node/test.js
+++ b/test/components-browser/fixtures/component-renderToString-text-node/test.js
@@ -1,6 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
-    expect(component.renderedHtml).to.equal('hello');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
+    expect(component.renderedHtml).to.equal("hello");
+};
diff --git a/test/components-browser/fixtures/component-renderToString/component.js b/test/components-browser/fixtures/component-renderToString/component.js
index 5fb29be7e..b6ca386ab 100644
--- a/test/components-browser/fixtures/component-renderToString/component.js
+++ b/test/components-browser/fixtures/component-renderToString/component.js
@@ -1,9 +1,9 @@
-var helloComponent = require('./components/hello');
+var helloComponent = require("./components/hello");
 
 module.exports = {
-    onMount: function () {
+    onMount: function() {
         this.renderedHtml = helloComponent.renderToString({
             name: this.input.name
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-renderToString/test.js b/test/components-browser/fixtures/component-renderToString/test.js
index de0e8b235..4f22a6805 100644
--- a/test/components-browser/fixtures/component-renderToString/test.js
+++ b/test/components-browser/fixtures/component-renderToString/test.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'john'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "john"
     });
 
-    expect(component.renderedHtml).to.equal('<div class="hello"><div>john</div></div>');
-};
\ No newline at end of file
+    expect(component.renderedHtml).to.equal(
+        '<div class="hello"><div>john</div></div>'
+    );
+};
diff --git a/test/components-browser/fixtures/component-unescaped-html/test.js b/test/components-browser/fixtures/component-unescaped-html/test.js
index ec49919c9..b1288d365 100644
--- a/test/components-browser/fixtures/component-unescaped-html/test.js
+++ b/test/components-browser/fixtures/component-unescaped-html/test.js
@@ -1,23 +1,24 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.el.childNodes.length).to.equal(1);
-    expect(component.el.firstChild.nodeName).to.equal('INPUT');
-    expect(component.el.firstChild.value).to.equal('x');
+    expect(component.el.firstChild.nodeName).to.equal("INPUT");
+    expect(component.el.firstChild.value).to.equal("x");
 
-    component.state.html = '<textarea>HELLO WORLD!</textarea>';
+    component.state.html = "<textarea>HELLO WORLD!</textarea>";
     component.update();
 
     expect(component.el.childNodes.length).to.equal(1);
-    expect(component.el.firstChild.nodeName).to.equal('TEXTAREA');
-    expect(component.el.firstChild.value).to.equal('HELLO WORLD!');
+    expect(component.el.firstChild.nodeName).to.equal("TEXTAREA");
+    expect(component.el.firstChild.value).to.equal("HELLO WORLD!");
 
-    component.state.html = '<select><option value="1">One</option><option value="2" selected>Two</option></select>';
+    component.state.html =
+        '<select><option value="1">One</option><option value="2" selected>Two</option></select>';
     component.update();
 
     expect(component.el.childNodes.length).to.equal(1);
-    expect(component.el.firstChild.nodeName).to.equal('SELECT');
+    expect(component.el.firstChild.nodeName).to.equal("SELECT");
     expect(component.el.firstChild.selectedIndex).to.equal(1);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/component-var/test.js b/test/components-browser/fixtures/component-var/test.js
index 497dad315..bc131c184 100644
--- a/test/components-browser/fixtures/component-var/test.js
+++ b/test/components-browser/fixtures/component-var/test.js
@@ -1,20 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        firstName: 'John',
-        lastName: 'Doe'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        firstName: "John",
+        lastName: "Doe"
     });
 
-    expect(component.el.innerHTML).to.contain('Hello John Doe!');
+    expect(component.el.innerHTML).to.contain("Hello John Doe!");
 
     component.input = {
-        firstName: 'Jane',
-        lastName: 'Doe'
+        firstName: "Jane",
+        lastName: "Doe"
     };
 
     component.update();
 
-    expect(component.el.innerHTML).to.contain('Hello Jane Doe!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Jane Doe!");
+};
diff --git a/test/components-browser/fixtures/custom-events-declarative-multiple-once/test.js b/test/components-browser/fixtures/custom-events-declarative-multiple-once/test.js
index 3bd5d86d4..86d74c565 100644
--- a/test/components-browser/fixtures/custom-events-declarative-multiple-once/test.js
+++ b/test/components-browser/fixtures/custom-events-declarative-multiple-once/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    component.getComponent('bar').emitTestEvent1();
-    component.getComponent('bar').emitTestEvent1();
+    component.getComponent("bar").emitTestEvent1();
+    component.getComponent("bar").emitTestEvent1();
 
     expect(component.testEvent1Fired).to.equal(1);
 
-    component.getComponent('bar').emitTestEvent2();
-    component.getComponent('bar').emitTestEvent2();
+    component.getComponent("bar").emitTestEvent2();
+    component.getComponent("bar").emitTestEvent2();
 
     expect(component.testEvent2Fired).to.equal(1);
 };
diff --git a/test/components-browser/fixtures/custom-events-declarative-multiple/test.js b/test/components-browser/fixtures/custom-events-declarative-multiple/test.js
index 729518fb9..944db597b 100644
--- a/test/components-browser/fixtures/custom-events-declarative-multiple/test.js
+++ b/test/components-browser/fixtures/custom-events-declarative-multiple/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    component.getComponent('bar').emitTestEvent1();
+    component.getComponent("bar").emitTestEvent1();
 
     expect(component.testEvent1Fired).to.equal(true);
 
-    component.getComponent('bar').emitTestEvent2();
+    component.getComponent("bar").emitTestEvent2();
 
     expect(component.testEvent2Fired).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events-declarative/component.js b/test/components-browser/fixtures/custom-events-declarative/component.js
index 18734df24..9c6c365eb 100644
--- a/test/components-browser/fixtures/custom-events-declarative/component.js
+++ b/test/components-browser/fixtures/custom-events-declarative/component.js
@@ -1,6 +1,6 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
-        this.getComponent('bar').appendHtml('FOO');
+    onMount: function() {
+        this.name = "app-foo";
+        this.getComponent("bar").appendHtml("FOO");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events-declarative/components/app-bar/renderer.js b/test/components-browser/fixtures/custom-events-declarative/components/app-bar/renderer.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/custom-events-declarative/components/app-bar/renderer.js
+++ b/test/components-browser/fixtures/custom-events-declarative/components/app-bar/renderer.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/custom-events-declarative/components/app-custom-events/component.js b/test/components-browser/fixtures/custom-events-declarative/components/app-custom-events/component.js
index e127304b3..725cf0e85 100644
--- a/test/components-browser/fixtures/custom-events-declarative/components/app-custom-events/component.js
+++ b/test/components-browser/fixtures/custom-events-declarative/components/app-custom-events/component.js
@@ -1,26 +1,26 @@
-var pubsub = require('../../../../../__util__/pubsub');
+var pubsub = require("../../../../../__util__/pubsub");
 
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.name = input.name;
         this.channel = input.channel;
     },
 
-    onMount: function () {
+    onMount: function() {
         var self = this;
 
         if (this.channel) {
-            pubsub.channel(this.channel).on('emitTestEvent2', function () {
+            pubsub.channel(this.channel).on("emitTestEvent2", function() {
                 self.emitTestEvent2();
             });
         }
     },
 
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
 };
diff --git a/test/components-browser/fixtures/custom-events-declarative/marko.json b/test/components-browser/fixtures/custom-events-declarative/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/custom-events-declarative/marko.json
+++ b/test/components-browser/fixtures/custom-events-declarative/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/custom-events-declarative/test.js b/test/components-browser/fixtures/custom-events-declarative/test.js
index 1076b3427..be10e989a 100644
--- a/test/components-browser/fixtures/custom-events-declarative/test.js
+++ b/test/components-browser/fixtures/custom-events-declarative/test.js
@@ -1,36 +1,38 @@
-var expect = require('chai').expect;
-var pubsub = require('../../../__util__/pubsub');
+var expect = require("chai").expect;
+var pubsub = require("../../../__util__/pubsub");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var received1 = [];
     var received2 = [];
 
-    component.handleTestEvent1 = function () {
+    component.handleTestEvent1 = function() {
         received1.push({
             args: arguments,
             component: arguments[arguments.length - 1]
         });
     };
 
-    component.handleTestEvent2 = function () {
+    component.handleTestEvent2 = function() {
         received2.push({
             args: arguments,
             component: arguments[arguments.length - 1]
         });
     };
 
-    component.getComponent('customEvents').emitTestEvent1();
+    component.getComponent("customEvents").emitTestEvent1();
     expect(received1.length).to.equal(1);
     expect(received1[0].args.length).to.equal(3); // ['a', 'b', sourceComponent]
-    expect(received1[0].component).to.equal(component.getComponent('customEvents'));
+    expect(received1[0].component).to.equal(
+        component.getComponent("customEvents")
+    );
 
-    pubsub.channel('customEvents-' + component.id).emit('emitTestEvent2');
+    pubsub.channel("customEvents-" + component.id).emit("emitTestEvent2");
 
     expect(received1.length).to.equal(1);
     expect(received2.length).to.equal(1);
 
     expect(received2[0].args.length).to.equal(1); // [sourceComponent]
-    expect(received2[0].component).to.be.an('object');
+    expect(received2[0].component).to.be.an("object");
 };
diff --git a/test/components-browser/fixtures/custom-events-declaritive-once/component.js b/test/components-browser/fixtures/custom-events-declaritive-once/component.js
index 18734df24..9c6c365eb 100644
--- a/test/components-browser/fixtures/custom-events-declaritive-once/component.js
+++ b/test/components-browser/fixtures/custom-events-declaritive-once/component.js
@@ -1,6 +1,6 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
-        this.getComponent('bar').appendHtml('FOO');
+    onMount: function() {
+        this.name = "app-foo";
+        this.getComponent("bar").appendHtml("FOO");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events-declaritive-once/components/app-bar/component.js b/test/components-browser/fixtures/custom-events-declaritive-once/components/app-bar/component.js
index 350e6aaf1..7c05a2b28 100644
--- a/test/components-browser/fixtures/custom-events-declaritive-once/components/app-bar/component.js
+++ b/test/components-browser/fixtures/custom-events-declaritive-once/components/app-bar/component.js
@@ -1,19 +1,19 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.label = input.label;
     },
 
-    onMount: function () {
-        this.name = 'app-bar';
+    onMount: function() {
+        this.name = "app-bar";
 
         var el = this.el;
 
-        this.appendHtml = function (html) {
+        this.appendHtml = function(html) {
             el.innerHTML += html;
         };
     },
 
-    emitTestEvent: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent: function() {
+        this.emit("testEvent", "a", "b");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events-declaritive-once/marko.json b/test/components-browser/fixtures/custom-events-declaritive-once/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/custom-events-declaritive-once/marko.json
+++ b/test/components-browser/fixtures/custom-events-declaritive-once/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/custom-events-declaritive-once/test.js b/test/components-browser/fixtures/custom-events-declaritive-once/test.js
index 527c29c95..de9f33a3b 100644
--- a/test/components-browser/fixtures/custom-events-declaritive-once/test.js
+++ b/test/components-browser/fixtures/custom-events-declaritive-once/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var numTestEventFired = 0;
 
-    component.handleTestEvent1 = function (a, b) {
-        expect(a).to.equal('a');
-        expect(b).to.equal('b');
+    component.handleTestEvent1 = function(a, b) {
+        expect(a).to.equal("a");
+        expect(b).to.equal("b");
         numTestEventFired++;
     };
 
-    component.getComponent('bar').emitTestEvent();
-    component.getComponent('bar').emitTestEvent();
+    component.getComponent("bar").emitTestEvent();
+    component.getComponent("bar").emitTestEvent();
 
     expect(numTestEventFired).to.equal(1);
 };
diff --git a/test/components-browser/fixtures/custom-events-repeated-component-once/lookup.js b/test/components-browser/fixtures/custom-events-repeated-component-once/lookup.js
index 7f86c0b3d..2c61754df 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component-once/lookup.js
+++ b/test/components-browser/fixtures/custom-events-repeated-component-once/lookup.js
@@ -1,7 +1,7 @@
 var componentsById = {};
 
-exports.addComponent = function (itemId, component) {
+exports.addComponent = function(itemId, component) {
     componentsById[itemId] = component;
 };
 
-exports.componentsById = componentsById;
\ No newline at end of file
+exports.componentsById = componentsById;
diff --git a/test/components-browser/fixtures/custom-events-repeated-component-once/marko.json b/test/components-browser/fixtures/custom-events-repeated-component-once/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component-once/marko.json
+++ b/test/components-browser/fixtures/custom-events-repeated-component-once/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/custom-events-repeated-component-once/test.js b/test/components-browser/fixtures/custom-events-repeated-component-once/test.js
index 8e4108fc6..da5110370 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component-once/test.js
+++ b/test/components-browser/fixtures/custom-events-repeated-component-once/test.js
@@ -1,51 +1,65 @@
-var expect = require('chai').expect;
-var lookup = require('./lookup');
+var expect = require("chai").expect;
+var lookup = require("./lookup");
 
-var items = [{
-    id: 0,
-    title: 'Item 1'
-}, {
-    id: 1,
-    title: 'Item 2'
-}, {
-    id: 2,
-    title: 'Item 3'
-}];
+var items = [
+    {
+        id: 0,
+        title: "Item 1"
+    },
+    {
+        id: 1,
+        title: "Item 2"
+    },
+    {
+        id: 2,
+        title: "Item 3"
+    }
+];
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
         items: items
     });
 
     // Test first one twice, should be the same
     lookup.componentsById[0].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }]);
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        }
+    ]);
 
     lookup.componentsById[0].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }]);
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        }
+    ]);
 
     // Test second one twice, should be the same
     lookup.componentsById[1].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }, {
-        id: 1,
-        title: 'Item 2'
-    }]);
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        },
+        {
+            id: 1,
+            title: "Item 2"
+        }
+    ]);
 
     lookup.componentsById[1].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }, {
-        id: 1,
-        title: 'Item 2'
-    }]);
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        },
+        {
+            id: 1,
+            title: "Item 2"
+        }
+    ]);
 };
diff --git a/test/components-browser/fixtures/custom-events-repeated-component/lookup.js b/test/components-browser/fixtures/custom-events-repeated-component/lookup.js
index 7f86c0b3d..2c61754df 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component/lookup.js
+++ b/test/components-browser/fixtures/custom-events-repeated-component/lookup.js
@@ -1,7 +1,7 @@
 var componentsById = {};
 
-exports.addComponent = function (itemId, component) {
+exports.addComponent = function(itemId, component) {
     componentsById[itemId] = component;
 };
 
-exports.componentsById = componentsById;
\ No newline at end of file
+exports.componentsById = componentsById;
diff --git a/test/components-browser/fixtures/custom-events-repeated-component/marko.json b/test/components-browser/fixtures/custom-events-repeated-component/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component/marko.json
+++ b/test/components-browser/fixtures/custom-events-repeated-component/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/custom-events-repeated-component/test.js b/test/components-browser/fixtures/custom-events-repeated-component/test.js
index ea1f257a2..3adc6ead9 100644
--- a/test/components-browser/fixtures/custom-events-repeated-component/test.js
+++ b/test/components-browser/fixtures/custom-events-repeated-component/test.js
@@ -1,38 +1,49 @@
-var expect = require('chai').expect;
-var lookup = require('./lookup');
+var expect = require("chai").expect;
+var lookup = require("./lookup");
 
-var items = [{
-    id: 0,
-    title: 'Item 1'
-}, {
-    id: 1,
-    title: 'Item 2'
-}, {
-    id: 2,
-    title: 'Item 3'
-}];
+var items = [
+    {
+        id: 0,
+        title: "Item 1"
+    },
+    {
+        id: 1,
+        title: "Item 2"
+    },
+    {
+        id: 2,
+        title: "Item 3"
+    }
+];
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
         items: items
     });
 
     expect(Object.keys(lookup.componentsById).length).to.equal(3);
 
-    expect(lookup.componentsById[0].id).to.not.equal(lookup.componentsById[1].id);
+    expect(lookup.componentsById[0].id).to.not.equal(
+        lookup.componentsById[1].id
+    );
 
     lookup.componentsById[0].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }]);
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        }
+    ]);
 
     lookup.componentsById[1].emitPurchase();
-    expect(component.purchaseEvents).to.deep.equal([{
-        id: 0,
-        title: 'Item 1'
-    }, {
-        id: 1,
-        title: 'Item 2'
-    }]);
-};
\ No newline at end of file
+    expect(component.purchaseEvents).to.deep.equal([
+        {
+            id: 0,
+            title: "Item 1"
+        },
+        {
+            id: 1,
+            title: "Item 2"
+        }
+    ]);
+};
diff --git a/test/components-browser/fixtures/custom-events/component.js b/test/components-browser/fixtures/custom-events/component.js
index 18734df24..9c6c365eb 100644
--- a/test/components-browser/fixtures/custom-events/component.js
+++ b/test/components-browser/fixtures/custom-events/component.js
@@ -1,6 +1,6 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
-        this.getComponent('bar').appendHtml('FOO');
+    onMount: function() {
+        this.name = "app-foo";
+        this.getComponent("bar").appendHtml("FOO");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events/components/app-bar/component.js b/test/components-browser/fixtures/custom-events/components/app-bar/component.js
index 350e6aaf1..7c05a2b28 100644
--- a/test/components-browser/fixtures/custom-events/components/app-bar/component.js
+++ b/test/components-browser/fixtures/custom-events/components/app-bar/component.js
@@ -1,19 +1,19 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.label = input.label;
     },
 
-    onMount: function () {
-        this.name = 'app-bar';
+    onMount: function() {
+        this.name = "app-bar";
 
         var el = this.el;
 
-        this.appendHtml = function (html) {
+        this.appendHtml = function(html) {
             el.innerHTML += html;
         };
     },
 
-    emitTestEvent: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent: function() {
+        this.emit("testEvent", "a", "b");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/custom-events/components/app-custom-events/component.js b/test/components-browser/fixtures/custom-events/components/app-custom-events/component.js
index 310a665fe..725cf0e85 100644
--- a/test/components-browser/fixtures/custom-events/components/app-custom-events/component.js
+++ b/test/components-browser/fixtures/custom-events/components/app-custom-events/component.js
@@ -1,27 +1,26 @@
-var pubsub = require('../../../../../__util__/pubsub');
+var pubsub = require("../../../../../__util__/pubsub");
 
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.name = input.name;
         this.channel = input.channel;
     },
 
-    onMount: function () {
-
+    onMount: function() {
         var self = this;
 
         if (this.channel) {
-            pubsub.channel(this.channel).on('emitTestEvent2', function () {
+            pubsub.channel(this.channel).on("emitTestEvent2", function() {
                 self.emitTestEvent2();
             });
         }
     },
 
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
 };
diff --git a/test/components-browser/fixtures/custom-events/marko.json b/test/components-browser/fixtures/custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/custom-events/marko.json
+++ b/test/components-browser/fixtures/custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/custom-events/test.js b/test/components-browser/fixtures/custom-events/test.js
index d772e6615..34cef8b9a 100644
--- a/test/components-browser/fixtures/custom-events/test.js
+++ b/test/components-browser/fixtures/custom-events/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var testEventFired = false;
 
-    component.getComponent('bar').on('testEvent', function (a, b) {
-        expect(a).to.equal('a');
-        expect(b).to.equal('b');
+    component.getComponent("bar").on("testEvent", function(a, b) {
+        expect(a).to.equal("a");
+        expect(b).to.equal("b");
         testEventFired = true;
     });
 
-    component.getComponent('bar').emitTestEvent();
+    component.getComponent("bar").emitTestEvent();
 
     expect(testEventFired).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-detach/component.js b/test/components-browser/fixtures/destroy-detach/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/destroy-detach/component.js
+++ b/test/components-browser/fixtures/destroy-detach/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/destroy-detach/test.js b/test/components-browser/fixtures/destroy-detach/test.js
index 1dd737420..4bc0d89b4 100644
--- a/test/components-browser/fixtures/destroy-detach/test.js
+++ b/test/components-browser/fixtures/destroy-detach/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var el = component.el;
 
     expect(component.el.parentNode).to.equal(helpers.targetEl);
     component.destroy();
     expect(component.el == null).to.equal(true);
     expect(el.parentNode == null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-legacy/component.js b/test/components-browser/fixtures/destroy-legacy/component.js
index 18734df24..9c6c365eb 100644
--- a/test/components-browser/fixtures/destroy-legacy/component.js
+++ b/test/components-browser/fixtures/destroy-legacy/component.js
@@ -1,6 +1,6 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
-        this.getComponent('bar').appendHtml('FOO');
+    onMount: function() {
+        this.name = "app-foo";
+        this.getComponent("bar").appendHtml("FOO");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-legacy/components/app-bar/component.js b/test/components-browser/fixtures/destroy-legacy/components/app-bar/component.js
index 61c2adf0d..bdad10e80 100644
--- a/test/components-browser/fixtures/destroy-legacy/components/app-bar/component.js
+++ b/test/components-browser/fixtures/destroy-legacy/components/app-bar/component.js
@@ -1,16 +1,16 @@
 module.exports = {
-    onInput: function (input) {
-        var label = input.label || 'BAR';
+    onInput: function(input) {
+        var label = input.label || "BAR";
         this.label = label;
     },
 
-    onMount: function () {
-        this.name = 'app-bar';
+    onMount: function() {
+        this.name = "app-bar";
 
         var el = this.el;
 
-        this.appendHtml = function (html) {
+        this.appendHtml = function(html) {
             el.innerHTML += html;
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-legacy/components/app-custom-events/component.js b/test/components-browser/fixtures/destroy-legacy/components/app-custom-events/component.js
index 6165ebf1d..37d9a4165 100644
--- a/test/components-browser/fixtures/destroy-legacy/components/app-custom-events/component.js
+++ b/test/components-browser/fixtures/destroy-legacy/components/app-custom-events/component.js
@@ -1,6 +1,6 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.name = input.name;
         this.channel = input.channel;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-legacy/marko.json b/test/components-browser/fixtures/destroy-legacy/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/destroy-legacy/marko.json
+++ b/test/components-browser/fixtures/destroy-legacy/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/destroy-legacy/test.js b/test/components-browser/fixtures/destroy-legacy/test.js
index 21c1e3204..bcf313999 100644
--- a/test/components-browser/fixtures/destroy-legacy/test.js
+++ b/test/components-browser/fixtures/destroy-legacy/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.getComponent('bar') == null).to.equal(false);
+    expect(component.getComponent("bar") == null).to.equal(false);
 
-    component.getComponent('bar').destroy();
+    component.getComponent("bar").destroy();
 
-    expect(component.getComponent('bar') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(component.getComponent("bar") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/destroy-multiple-root-els/component.js b/test/components-browser/fixtures/destroy-multiple-root-els/component.js
index 1d16561dd..87af5a58d 100644
--- a/test/components-browser/fixtures/destroy-multiple-root-els/component.js
+++ b/test/components-browser/fixtures/destroy-multiple-root-els/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             age: input.age
         };
     },
-    setName: function (newName) {
-        this.setState('name', newName);
+    setName: function(newName) {
+        this.setState("name", newName);
     },
-    setAge: function (newAge) {
-        this.setState('age', newAge);
+    setAge: function(newAge) {
+        this.setState("age", newAge);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-multiple-root-els/test.js b/test/components-browser/fixtures/destroy-multiple-root-els/test.js
index 0cbb8c538..a33cea2ac 100644
--- a/test/components-browser/fixtures/destroy-multiple-root-els/test.js
+++ b/test/components-browser/fixtures/destroy-multiple-root-els/test.js
@@ -1,11 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        age: 30
+    });
 
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank', age: 30 });
-
-    var nameEl = component.getEl('name');
-    var ageEl = component.getEl('age');
+    var nameEl = component.getEl("name");
+    var ageEl = component.getEl("age");
     var linkEl = component.els[2];
 
     expect(nameEl.parentNode != null).to.equal(true);
@@ -17,4 +19,4 @@ module.exports = function (helpers) {
     expect(nameEl.parentNode == null).to.equal(true);
     expect(ageEl.parentNode == null).to.equal(true);
     expect(linkEl.parentNode == null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/destroy-widget/component.js b/test/components-browser/fixtures/destroy-widget/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/destroy-widget/component.js
+++ b/test/components-browser/fixtures/destroy-widget/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/destroy-widget/components/app-simple/component.js b/test/components-browser/fixtures/destroy-widget/components/app-simple/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/destroy-widget/components/app-simple/component.js
+++ b/test/components-browser/fixtures/destroy-widget/components/app-simple/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/destroy-widget/test.js b/test/components-browser/fixtures/destroy-widget/test.js
index 12d339845..3eed186d7 100644
--- a/test/components-browser/fixtures/destroy-widget/test.js
+++ b/test/components-browser/fixtures/destroy-widget/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
         showSimple: true
     });
 
-    var simple = component.getComponent('simple');
+    var simple = component.getComponent("simple");
     var simpleDestroyed = false;
 
-    simple.onDestroy = function () {
+    simple.onDestroy = function() {
         simpleDestroyed = true;
     };
 
@@ -23,5 +23,5 @@ module.exports = function (helpers) {
     expect(simpleDestroyed).to.equal(true);
     expect(simple.isDestroyed()).to.equal(true);
 
-    expect(component.getComponent('simple') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(component.getComponent("simple") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/diffpatch-boundary-inner-component-only/test.js b/test/components-browser/fixtures/diffpatch-boundary-inner-component-only/test.js
index 57498ffe7..0ec9920e9 100644
--- a/test/components-browser/fixtures/diffpatch-boundary-inner-component-only/test.js
+++ b/test/components-browser/fixtures/diffpatch-boundary-inner-component-only/test.js
@@ -1,21 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var innerComponent = component.getComponent('inner');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var innerComponent = component.getComponent("inner");
 
-    expect(innerComponent.___startNode.className).to.equal('inner');
+    expect(innerComponent.___startNode.className).to.equal("inner");
     expect(component.___startNode).to.not.equal(innerComponent.___startNode);
     expect(component.___endNode).to.not.equal(innerComponent.___endNode);
-    expect(helpers.targetEl.querySelector('.inner').innerHTML).to.equal('0');
+    expect(helpers.targetEl.querySelector(".inner").innerHTML).to.equal("0");
 
     component.state.count++;
     component.update();
 
-    innerComponent = component.getComponent('inner');
+    innerComponent = component.getComponent("inner");
 
-    expect(innerComponent.___startNode.className).to.equal('inner');
+    expect(innerComponent.___startNode.className).to.equal("inner");
     expect(component.___startNode).to.not.equal(innerComponent.___startNode);
     expect(component.___endNode).to.not.equal(innerComponent.___endNode);
-    expect(helpers.targetEl.querySelector('.inner').innerHTML).to.equal('1');
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelector(".inner").innerHTML).to.equal("1");
+};
diff --git a/test/components-browser/fixtures/diffpatch-component-mismatch-append/test.js b/test/components-browser/fixtures/diffpatch-component-mismatch-append/test.js
index 7885222c8..f74cc3adf 100644
--- a/test/components-browser/fixtures/diffpatch-component-mismatch-append/test.js
+++ b/test/components-browser/fixtures/diffpatch-component-mismatch-append/test.js
@@ -1,21 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var children;
 
-    children = component.getEl('root').children;
+    children = component.getEl("root").children;
     expect(children.length).to.equal(2);
-    expect(children[0].innerHTML).to.equal('foo-a');
-    expect(children[1].innerHTML).to.equal('bar-b');
+    expect(children[0].innerHTML).to.equal("foo-a");
+    expect(children[1].innerHTML).to.equal("bar-b");
 
     component.state.count++;
     component.update();
 
-    children = component.getEl('root').children;
+    children = component.getEl("root").children;
     expect(children.length).to.equal(3);
-    expect(children[0].innerHTML).to.equal('foo-a');
-    expect(children[1].innerHTML).to.equal('foo-b');
-    expect(children[2].innerHTML).to.equal('bar-c');
-};
\ No newline at end of file
+    expect(children[0].innerHTML).to.equal("foo-a");
+    expect(children[1].innerHTML).to.equal("foo-b");
+    expect(children[2].innerHTML).to.equal("bar-c");
+};
diff --git a/test/components-browser/fixtures/diffpatch-component-mismatch/test.js b/test/components-browser/fixtures/diffpatch-component-mismatch/test.js
index 5fb61b250..d69b62677 100644
--- a/test/components-browser/fixtures/diffpatch-component-mismatch/test.js
+++ b/test/components-browser/fixtures/diffpatch-component-mismatch/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var children;
 
-    children = component.getEl('root').children;
+    children = component.getEl("root").children;
     expect(children.length).to.equal(3);
 
     component.state.count++;
     component.update();
 
-    children = component.getEl('root').children;
+    children = component.getEl("root").children;
     expect(children.length).to.equal(2);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-component-toplevel-surrounded/test.js b/test/components-browser/fixtures/diffpatch-component-toplevel-surrounded/test.js
index 25342ca74..a3b61fdf4 100644
--- a/test/components-browser/fixtures/diffpatch-component-toplevel-surrounded/test.js
+++ b/test/components-browser/fixtures/diffpatch-component-toplevel-surrounded/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     component.incrementBar();
 
-    var children = component.getEl('root').children;
-    expect(children[children.length - 1].nodeName).to.equal('SPAN');
-};
\ No newline at end of file
+    var children = component.getEl("root").children;
+    expect(children[children.length - 1].nodeName).to.equal("SPAN");
+};
diff --git a/test/components-browser/fixtures/diffpatch-destroy-child/test.js b/test/components-browser/fixtures/diffpatch-destroy-child/test.js
index 182919935..29c57a9c8 100644
--- a/test/components-browser/fixtures/diffpatch-destroy-child/test.js
+++ b/test/components-browser/fixtures/diffpatch-destroy-child/test.js
@@ -1,21 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var rootEl = component.el;
-    var helloCountEl = rootEl.querySelector('span.hello-count');
-    var helloComponent = component.getComponent('hello');
+    var helloCountEl = rootEl.querySelector("span.hello-count");
+    var helloComponent = component.getComponent("hello");
 
     component.state.count = 1;
     component.update();
 
     expect(component.el).to.equal(rootEl);
-    expect(rootEl.querySelector('span.hello-count').innerHTML).to.equal('1');
-    expect(rootEl.querySelector('span.hello-count')).to.equal(helloCountEl);
+    expect(rootEl.querySelector("span.hello-count").innerHTML).to.equal("1");
+    expect(rootEl.querySelector("span.hello-count")).to.equal(helloCountEl);
 
     component.state.renderHello = false;
     component.update();
 
     expect(helloComponent.isDestroyed()).to.equal(true);
     expect(helloComponent.el == null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js b/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js
index cea8a8d68..c5a8edceb 100644
--- a/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js
+++ b/test/components-browser/fixtures/diffpatch-insert-el-before-component/test.js
@@ -1,17 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     // var rootEl = component.el;
-    var helloComponent = component.getComponent('hello');
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    var helloComponent = component.getComponent("hello");
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
     // expect(helloComponent.el.parentNode).to.equal(rootEl);
 
     component.state.insertEl = true;
     component.state.count++;
     component.update();
 
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
 
-    expect(component.getComponent('hello')).to.equal(helloComponent);
-};
\ No newline at end of file
+    expect(component.getComponent("hello")).to.equal(helloComponent);
+};
diff --git a/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js b/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js
index cea8a8d68..c5a8edceb 100644
--- a/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js
+++ b/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-component/test.js
@@ -1,17 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     // var rootEl = component.el;
-    var helloComponent = component.getComponent('hello');
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    var helloComponent = component.getComponent("hello");
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
     // expect(helloComponent.el.parentNode).to.equal(rootEl);
 
     component.state.insertEl = true;
     component.state.count++;
     component.update();
 
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
 
-    expect(component.getComponent('hello')).to.equal(helloComponent);
-};
\ No newline at end of file
+    expect(component.getComponent("hello")).to.equal(helloComponent);
+};
diff --git a/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js b/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js
index cea8a8d68..c5a8edceb 100644
--- a/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js
+++ b/test/components-browser/fixtures/diffpatch-insert-unkeyed-el-before-preserved-component/test.js
@@ -1,17 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     // var rootEl = component.el;
-    var helloComponent = component.getComponent('hello');
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    var helloComponent = component.getComponent("hello");
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
     // expect(helloComponent.el.parentNode).to.equal(rootEl);
 
     component.state.insertEl = true;
     component.state.count++;
     component.update();
 
-    expect(component.getEl('root').querySelector('.hello') != null).to.equal(true);
+    expect(component.getEl("root").querySelector(".hello") != null).to.equal(
+        true
+    );
 
-    expect(component.getComponent('hello')).to.equal(helloComponent);
-};
\ No newline at end of file
+    expect(component.getComponent("hello")).to.equal(helloComponent);
+};
diff --git a/test/components-browser/fixtures/diffpatch-rearrange-keyed-components/test.js b/test/components-browser/fixtures/diffpatch-rearrange-keyed-components/test.js
index aba13fefd..240d28f76 100644
--- a/test/components-browser/fixtures/diffpatch-rearrange-keyed-components/test.js
+++ b/test/components-browser/fixtures/diffpatch-rearrange-keyed-components/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var previousComponents = {};
 
@@ -9,7 +9,7 @@ module.exports = function (helpers) {
         component.input = { letters: letters };
         component.update();
 
-        var divs = component.getEl('root').querySelectorAll('div');
+        var divs = component.getEl("root").querySelectorAll("div");
 
         expect(divs.length).to.equal(letters.length);
 
@@ -30,7 +30,7 @@ module.exports = function (helpers) {
             expect(divs[i].innerHTML).to.equal(letter);
         }
 
-        Object.keys(previousComponents).forEach(function (letter) {
+        Object.keys(previousComponents).forEach(function(letter) {
             if (!(letter in newComponents)) {
                 expect(previousComponents[letter].isDestroyed()).to.equal(true);
             }
@@ -39,56 +39,56 @@ module.exports = function (helpers) {
         previousComponents = newComponents;
     }
 
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single component swap
-    checkOrder(['a', 'c', 'b', 'd', 'e']);
+    checkOrder(["a", "c", "b", "d", "e"]);
 
     // Single component removal (remove 'C')
-    checkOrder(['a', 'b', 'd', 'e']);
+    checkOrder(["a", "b", "d", "e"]);
 
     // Single component addition
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Double component addition
-    checkOrder(['a', 'b', 'b1', 'b2', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "b1", "b2", "c", "d", "e"]);
 
     // Double component removal
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Swap b and d
-    checkOrder(['a', 'd', 'c', 'b', 'e']);
+    checkOrder(["a", "d", "c", "b", "e"]);
 
     // Swap b and d back to normal
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Swap a and c
-    checkOrder(['c', 'b', 'a', 'd', 'e']);
+    checkOrder(["c", "b", "a", "d", "e"]);
 
     // Swap c and a back to normal
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single component addition to START
-    checkOrder(['1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["1", "a", "b", "c", "d", "e"]);
 
     // Double component addition to START
-    checkOrder(['3', '2', '1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["3", "2", "1", "a", "b", "c", "d", "e"]);
 
     // Single component removal from START
-    checkOrder(['2', '1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["2", "1", "a", "b", "c", "d", "e"]);
 
     // Double component removal from START
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single component addition to END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f']);
+    checkOrder(["a", "b", "c", "d", "e", "f"]);
 
     // Double component addition to END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
+    checkOrder(["a", "b", "c", "d", "e", "f", "g", "h"]);
 
     // Single component removal from END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f', 'g']);
+    checkOrder(["a", "b", "c", "d", "e", "f", "g"]);
 
     // Double component removal from END
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
-};
\ No newline at end of file
+    checkOrder(["a", "b", "c", "d", "e"]);
+};
diff --git a/test/components-browser/fixtures/diffpatch-rearrange-keyed-els/test.js b/test/components-browser/fixtures/diffpatch-rearrange-keyed-els/test.js
index c06889ffd..d388dd063 100644
--- a/test/components-browser/fixtures/diffpatch-rearrange-keyed-els/test.js
+++ b/test/components-browser/fixtures/diffpatch-rearrange-keyed-els/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(helpers.targetEl.querySelectorAll('div').length).to.equal(0);
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(helpers.targetEl.querySelectorAll("div").length).to.equal(0);
 
     function checkOrder(letters) {
         component.input = { letters: letters };
         component.update();
 
-        var divs = helpers.targetEl.querySelectorAll('div');
+        var divs = helpers.targetEl.querySelectorAll("div");
 
         expect(divs.length).to.equal(letters.length);
 
@@ -18,50 +18,50 @@ module.exports = function (helpers) {
         }
     }
 
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single element swap
-    checkOrder(['a', 'c', 'b', 'd', 'e']);
+    checkOrder(["a", "c", "b", "d", "e"]);
 
     // Single element removal
-    checkOrder(['a', 'b', 'd', 'e']);
+    checkOrder(["a", "b", "d", "e"]);
 
     // Single element addition
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Double element addition
-    checkOrder(['a', 'b', 'b1', 'b2', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "b1", "b2", "c", "d", "e"]);
 
     // Double element removal
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Swap b and d
-    checkOrder(['a', 'd', 'c', 'b', 'e']);
+    checkOrder(["a", "d", "c", "b", "e"]);
 
     // Swap b and d back to normal
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single element addition to START
-    checkOrder(['1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["1", "a", "b", "c", "d", "e"]);
 
     // Double element addition to START
-    checkOrder(['3', '2', '1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["3", "2", "1", "a", "b", "c", "d", "e"]);
 
     // Single element removal from START
-    checkOrder(['2', '1', 'a', 'b', 'c', 'd', 'e']);
+    checkOrder(["2", "1", "a", "b", "c", "d", "e"]);
 
     // Double element removal from START
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
+    checkOrder(["a", "b", "c", "d", "e"]);
 
     // Single element addition to END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f']);
+    checkOrder(["a", "b", "c", "d", "e", "f"]);
 
     // Double element addition to END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']);
+    checkOrder(["a", "b", "c", "d", "e", "f", "g", "h"]);
 
     // Single element removal from END
-    checkOrder(['a', 'b', 'c', 'd', 'e', 'f', 'g']);
+    checkOrder(["a", "b", "c", "d", "e", "f", "g"]);
 
     // Double element removal from END
-    checkOrder(['a', 'b', 'c', 'd', 'e']);
-};
\ No newline at end of file
+    checkOrder(["a", "b", "c", "d", "e"]);
+};
diff --git a/test/components-browser/fixtures/diffpatch-remove-all-els/test.js b/test/components-browser/fixtures/diffpatch-remove-all-els/test.js
index 49993d70e..2e9c6b247 100644
--- a/test/components-browser/fixtures/diffpatch-remove-all-els/test.js
+++ b/test/components-browser/fixtures/diffpatch-remove-all-els/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(helpers.targetEl.querySelector('h1') != null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("h1") != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") != null).to.equal(true);
 
     component.state.show = false;
     component.update();
 
-    expect(helpers.targetEl.querySelector('h1') == null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') == null).to.equal(true);
+    expect(helpers.targetEl.querySelector("h1") == null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") == null).to.equal(true);
 
     expect(component.isDestroyed()).to.equal(false);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-remove-end-el/test.js b/test/components-browser/fixtures/diffpatch-remove-end-el/test.js
index a44371eed..98132a0eb 100644
--- a/test/components-browser/fixtures/diffpatch-remove-end-el/test.js
+++ b/test/components-browser/fixtures/diffpatch-remove-end-el/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(helpers.targetEl.querySelector('footer') != null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("footer") != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") != null).to.equal(true);
 
     component.state.showFooter = false;
     component.update();
 
-    expect(helpers.targetEl.querySelector('footer') == null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') != null).to.equal(true);
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelector("footer") == null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") != null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/diffpatch-remove-start-el/test.js b/test/components-browser/fixtures/diffpatch-remove-start-el/test.js
index 78379abb2..e915b64d5 100644
--- a/test/components-browser/fixtures/diffpatch-remove-start-el/test.js
+++ b/test/components-browser/fixtures/diffpatch-remove-start-el/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(helpers.targetEl.querySelector('h1') != null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("h1") != null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") != null).to.equal(true);
 
     component.state.showHeader = false;
     component.update();
 
-    expect(helpers.targetEl.querySelector('h1') == null).to.equal(true);
-    expect(helpers.targetEl.querySelector('div') != null).to.equal(true);
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelector("h1") == null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") != null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/diffpatch-simple/test.js b/test/components-browser/fixtures/diffpatch-simple/test.js
index 03728f076..766fe96e2 100644
--- a/test/components-browser/fixtures/diffpatch-simple/test.js
+++ b/test/components-browser/fixtures/diffpatch-simple/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var rootEl = component.el;
-    var spanEl = rootEl.querySelector('span');
+    var spanEl = rootEl.querySelector("span");
 
     component.state.count = 1;
     component.update();
 
     expect(component.el).to.equal(rootEl);
-    expect(rootEl.querySelector('span').innerHTML).to.equal('1');
-    expect(rootEl.querySelector('span')).to.equal(spanEl);
-};
\ No newline at end of file
+    expect(rootEl.querySelector("span").innerHTML).to.equal("1");
+    expect(rootEl.querySelector("span")).to.equal(spanEl);
+};
diff --git a/test/components-browser/fixtures/diffpatch-swap-components-dynamic/test.js b/test/components-browser/fixtures/diffpatch-swap-components-dynamic/test.js
index 9d4272588..6a8c851a3 100644
--- a/test/components-browser/fixtures/diffpatch-swap-components-dynamic/test.js
+++ b/test/components-browser/fixtures/diffpatch-swap-components-dynamic/test.js
@@ -1,24 +1,24 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var rootEl = component.el;
 
-    var nestedDivs = rootEl.querySelectorAll('div');
-    expect(nestedDivs[0].className).to.equal('hello');
-    expect(nestedDivs[1].className).to.equal('world');
-    expect(nestedDivs[0].innerHTML).to.equal('0');
-    expect(nestedDivs[1].innerHTML).to.equal('0');
+    var nestedDivs = rootEl.querySelectorAll("div");
+    expect(nestedDivs[0].className).to.equal("hello");
+    expect(nestedDivs[1].className).to.equal("world");
+    expect(nestedDivs[0].innerHTML).to.equal("0");
+    expect(nestedDivs[1].innerHTML).to.equal("0");
 
     component.state.swapped = true;
     component.state.count = 1;
     component.update();
 
-    var nestedDivsAfter = rootEl.querySelectorAll('div');
-    expect(nestedDivsAfter[0].className).to.equal('world');
-    expect(nestedDivsAfter[1].className).to.equal('hello');
-    expect(nestedDivsAfter[0].innerHTML).to.equal('1');
-    expect(nestedDivsAfter[1].innerHTML).to.equal('1');
+    var nestedDivsAfter = rootEl.querySelectorAll("div");
+    expect(nestedDivsAfter[0].className).to.equal("world");
+    expect(nestedDivsAfter[1].className).to.equal("hello");
+    expect(nestedDivsAfter[0].innerHTML).to.equal("1");
+    expect(nestedDivsAfter[1].innerHTML).to.equal("1");
     expect(nestedDivsAfter[0]).to.not.equal(nestedDivs[1]);
     expect(nestedDivsAfter[1]).to.not.equal(nestedDivs[0]);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-swap-components-keyed-dynamic/test.js b/test/components-browser/fixtures/diffpatch-swap-components-keyed-dynamic/test.js
index 793184225..6e5bb7d59 100644
--- a/test/components-browser/fixtures/diffpatch-swap-components-keyed-dynamic/test.js
+++ b/test/components-browser/fixtures/diffpatch-swap-components-keyed-dynamic/test.js
@@ -1,32 +1,32 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var rootEl = component.el;
-    var helloComponent = component.getComponent('hello');
-    var worldComponent = component.getComponent('world');
+    var helloComponent = component.getComponent("hello");
+    var worldComponent = component.getComponent("world");
     expect(helloComponent.el.parentNode).to.equal(rootEl);
     expect(worldComponent.el.parentNode).to.equal(rootEl);
 
-    var nestedDivs = rootEl.querySelectorAll('div');
-    expect(nestedDivs[0].className).to.equal('hello');
-    expect(nestedDivs[1].className).to.equal('world');
-    expect(nestedDivs[0].innerHTML).to.equal('0');
-    expect(nestedDivs[1].innerHTML).to.equal('0');
+    var nestedDivs = rootEl.querySelectorAll("div");
+    expect(nestedDivs[0].className).to.equal("hello");
+    expect(nestedDivs[1].className).to.equal("world");
+    expect(nestedDivs[0].innerHTML).to.equal("0");
+    expect(nestedDivs[1].innerHTML).to.equal("0");
 
     component.state.swapped = true;
     component.state.count = 1;
     component.update();
 
-    expect(component.getComponent('hello')).to.equal(helloComponent);
-    expect(component.getComponent('world')).to.equal(worldComponent);
+    expect(component.getComponent("hello")).to.equal(helloComponent);
+    expect(component.getComponent("world")).to.equal(worldComponent);
 
-    var nestedDivsAfter = rootEl.querySelectorAll('div');
-    expect(nestedDivsAfter[0].className).to.equal('world');
-    expect(nestedDivsAfter[1].className).to.equal('hello');
-    expect(nestedDivs[0].innerHTML).to.equal('1');
-    expect(nestedDivs[1].innerHTML).to.equal('1');
+    var nestedDivsAfter = rootEl.querySelectorAll("div");
+    expect(nestedDivsAfter[0].className).to.equal("world");
+    expect(nestedDivsAfter[1].className).to.equal("hello");
+    expect(nestedDivs[0].innerHTML).to.equal("1");
+    expect(nestedDivs[1].innerHTML).to.equal("1");
 
     expect(nestedDivsAfter[0]).to.equal(nestedDivs[1]);
     expect(nestedDivsAfter[1]).to.equal(nestedDivs[0]);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-swap-components-keyed/test.js b/test/components-browser/fixtures/diffpatch-swap-components-keyed/test.js
index a783e8b4f..6d22532a1 100644
--- a/test/components-browser/fixtures/diffpatch-swap-components-keyed/test.js
+++ b/test/components-browser/fixtures/diffpatch-swap-components-keyed/test.js
@@ -1,27 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var rootEl = component.el;
-    var helloComponent = component.getComponent('hello');
-    var worldComponent = component.getComponent('world');
+    var helloComponent = component.getComponent("hello");
+    var worldComponent = component.getComponent("world");
     expect(helloComponent.el.parentNode).to.equal(rootEl);
     expect(worldComponent.el.parentNode).to.equal(rootEl);
 
-    var nestedDivs = rootEl.querySelectorAll('div');
-    expect(nestedDivs[0].className).to.equal('hello');
-    expect(nestedDivs[1].className).to.equal('world');
+    var nestedDivs = rootEl.querySelectorAll("div");
+    expect(nestedDivs[0].className).to.equal("hello");
+    expect(nestedDivs[1].className).to.equal("world");
 
     component.state.swapped = true;
     component.update();
 
-    expect(component.getComponent('hello')).to.equal(helloComponent);
-    expect(component.getComponent('world')).to.equal(worldComponent);
+    expect(component.getComponent("hello")).to.equal(helloComponent);
+    expect(component.getComponent("world")).to.equal(worldComponent);
 
-    var nestedDivsAfter = rootEl.querySelectorAll('div');
-    expect(nestedDivsAfter[0].className).to.equal('world');
-    expect(nestedDivsAfter[1].className).to.equal('hello');
+    var nestedDivsAfter = rootEl.querySelectorAll("div");
+    expect(nestedDivsAfter[0].className).to.equal("world");
+    expect(nestedDivsAfter[1].className).to.equal("hello");
 
     expect(nestedDivsAfter[0]).to.equal(nestedDivs[1]);
     expect(nestedDivsAfter[1]).to.equal(nestedDivs[0]);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-swap-keyed-el/test.js b/test/components-browser/fixtures/diffpatch-swap-keyed-el/test.js
index d5498ea0e..f99e903b4 100644
--- a/test/components-browser/fixtures/diffpatch-swap-keyed-el/test.js
+++ b/test/components-browser/fixtures/diffpatch-swap-keyed-el/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var fooEl = component.getEl('foo');
-    var barEl = component.getEl('bar');
+    var fooEl = component.getEl("foo");
+    var barEl = component.getEl("bar");
 
     expect(fooEl.nextSibling).to.equal(barEl);
 
     component.state.swapped = true;
     component.update();
 
-    expect(component.getEl('foo')).to.equal(fooEl);
-    expect(component.getEl('bar')).to.equal(barEl);
+    expect(component.getEl("foo")).to.equal(fooEl);
+    expect(component.getEl("bar")).to.equal(barEl);
 
     expect(barEl.nextSibling).to.equal(fooEl);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/diffpatch-swap-unkeyed-el/test.js b/test/components-browser/fixtures/diffpatch-swap-unkeyed-el/test.js
index 330edf0ae..6574b4569 100644
--- a/test/components-browser/fixtures/diffpatch-swap-unkeyed-el/test.js
+++ b/test/components-browser/fixtures/diffpatch-swap-unkeyed-el/test.js
@@ -1,26 +1,26 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var children = component.getEl('root').children;
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var children = component.getEl("root").children;
     expect(children.length).to.equal(2);
 
-    expect(children[0].getAttribute('data-foo')).to.equal('true');
-    expect(children[0].getAttribute('data-bar')).to.equal(null);
+    expect(children[0].getAttribute("data-foo")).to.equal("true");
+    expect(children[0].getAttribute("data-bar")).to.equal(null);
 
-    expect(children[1].getAttribute('data-foo')).to.equal(null);
-    expect(children[1].getAttribute('data-bar')).to.equal('true');
+    expect(children[1].getAttribute("data-foo")).to.equal(null);
+    expect(children[1].getAttribute("data-bar")).to.equal("true");
 
     component.state.swapped = true;
     component.update();
 
-    children = component.getEl('root').children;
+    children = component.getEl("root").children;
 
     expect(children.length).to.equal(2);
 
-    expect(children[0].getAttribute('data-foo')).to.equal(null);
-    expect(children[0].getAttribute('data-bar')).to.equal('true');
+    expect(children[0].getAttribute("data-foo")).to.equal(null);
+    expect(children[0].getAttribute("data-bar")).to.equal("true");
 
-    expect(children[1].getAttribute('data-foo')).to.equal('true');
-    expect(children[1].getAttribute('data-bar')).to.equal(null);
+    expect(children[1].getAttribute("data-foo")).to.equal("true");
+    expect(children[1].getAttribute("data-bar")).to.equal(null);
 };
diff --git a/test/components-browser/fixtures/dom-event-handlers-alternate/test.js b/test/components-browser/fixtures/dom-event-handlers-alternate/test.js
index 7d26f880d..a5d16731c 100644
--- a/test/components-browser/fixtures/dom-event-handlers-alternate/test.js
+++ b/test/components-browser/fixtures/dom-event-handlers-alternate/test.js
@@ -1,26 +1,26 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     // We are initially on the "sign-in" page
-    expect(component.el.querySelector('a').innerHTML).to.equal('Sign up');
+    expect(component.el.querySelector("a").innerHTML).to.equal("Sign up");
 
-    helpers.triggerMouseEvent(component.el.querySelector('a'), 'click');
+    helpers.triggerMouseEvent(component.el.querySelector("a"), "click");
 
     component.update();
 
-    expect(component.el.querySelector('a').innerHTML).to.equal('Sign in');
+    expect(component.el.querySelector("a").innerHTML).to.equal("Sign in");
 
-    helpers.triggerMouseEvent(component.el.querySelector('a'), 'click');
+    helpers.triggerMouseEvent(component.el.querySelector("a"), "click");
 
     component.update();
 
-    expect(component.el.querySelector('a').innerHTML).to.equal('Sign up');
+    expect(component.el.querySelector("a").innerHTML).to.equal("Sign up");
 
-    helpers.triggerMouseEvent(component.el.querySelector('a'), 'click');
+    helpers.triggerMouseEvent(component.el.querySelector("a"), "click");
 
     component.update();
 
-    expect(component.el.querySelector('a').innerHTML).to.equal('Sign in');
-};
\ No newline at end of file
+    expect(component.el.querySelector("a").innerHTML).to.equal("Sign in");
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/component.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/component.js
index 68570e8ce..0ad54b099 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/component.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-	handleColorClick: function (color) {
-		this.color = color;
-	}
-};
\ No newline at end of file
+    handleColorClick: function(color) {
+        this.color = color;
+    }
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/test.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/test.js
index 9686f980c..a479c0ed8 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/test.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-one-arg/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = component.el.querySelectorAll('li');
+    var liEls = component.el.querySelectorAll("li");
 
-    helpers.triggerMouseEvent(liEls[0], 'click');
-    expect(component.color).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "click");
+    expect(component.color).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'click');
-    expect(component.color).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "click");
+    expect(component.color).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'click');
-    expect(component.color).to.equal('blue');
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "click");
+    expect(component.color).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/component.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/component.js
index 257740197..2c21db225 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/component.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-	handleColorClick: function (color, type) {
-		this.color = { color: color, type: type };
-	}
-};
\ No newline at end of file
+    handleColorClick: function(color, type) {
+        this.color = { color: color, type: type };
+    }
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/test.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/test.js
index 520dd3593..cd4aff075 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/test.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling-two-args/test.js
@@ -1,29 +1,32 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = component.el.querySelectorAll('ul.primary li');
+    var liEls = component.el.querySelectorAll("ul.primary li");
 
-    helpers.triggerMouseEvent(liEls[0], 'click');
-    expect(component.color).to.deep.equal({ color: 'red', type: 'primary' });
+    helpers.triggerMouseEvent(liEls[0], "click");
+    expect(component.color).to.deep.equal({ color: "red", type: "primary" });
 
-    helpers.triggerMouseEvent(liEls[1], 'click');
-    expect(component.color).to.deep.equal({ color: 'green', type: 'primary' });
+    helpers.triggerMouseEvent(liEls[1], "click");
+    expect(component.color).to.deep.equal({ color: "green", type: "primary" });
 
-    helpers.triggerMouseEvent(liEls[2], 'click');
-    expect(component.color).to.deep.equal({ color: 'blue', type: 'primary' });
+    helpers.triggerMouseEvent(liEls[2], "click");
+    expect(component.color).to.deep.equal({ color: "blue", type: "primary" });
 
-    liEls = component.el.querySelectorAll('ul.secondary li');
+    liEls = component.el.querySelectorAll("ul.secondary li");
 
-    helpers.triggerMouseEvent(liEls[0], 'click');
-    expect(component.color).to.deep.equal({ color: 'red', type: 'secondary' });
+    helpers.triggerMouseEvent(liEls[0], "click");
+    expect(component.color).to.deep.equal({ color: "red", type: "secondary" });
 
-    helpers.triggerMouseEvent(liEls[1], 'click');
-    expect(component.color).to.deep.equal({ color: 'green', type: 'secondary' });
+    helpers.triggerMouseEvent(liEls[1], "click");
+    expect(component.color).to.deep.equal({
+        color: "green",
+        type: "secondary"
+    });
 
-    helpers.triggerMouseEvent(liEls[2], 'click');
-    expect(component.color).to.deep.equal({ color: 'blue', type: 'secondary' });
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "click");
+    expect(component.color).to.deep.equal({ color: "blue", type: "secondary" });
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling/component.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling/component.js
index 6ef98a966..8d234487d 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling/component.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling/component.js
@@ -1,8 +1,8 @@
 module.exports = {
-  onCreate: function () {
-    this.clicked = false;
-  },
-  handleButtonClick: function () {
-    this.clicked = true;
-  }
-};
\ No newline at end of file
+    onCreate: function() {
+        this.clicked = false;
+    },
+    handleButtonClick: function() {
+        this.clicked = true;
+    }
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-bubbling/test.js b/test/components-browser/fixtures/dom-events-repeated-el-bubbling/test.js
index 1f4a1c7b4..3c48ff642 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-bubbling/test.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-bubbling/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.clicked).to.equal(false);
-    helpers.triggerMouseEvent(component.getEl('button'), 'click');
+    helpers.triggerMouseEvent(component.getEl("button"), "click");
     expect(component.clicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling-multiple/test.js b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling-multiple/test.js
index 15b237e78..44235e26d 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling-multiple/test.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling-multiple/test.js
@@ -1,27 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = component.el.querySelectorAll('li');
+    var liEls = component.el.querySelectorAll("li");
 
-    helpers.triggerMouseEvent(liEls[0], 'mouseover');
-    expect(component.mouseOverColor).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "mouseover");
+    expect(component.mouseOverColor).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'mouseover');
-    expect(component.mouseOverColor).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "mouseover");
+    expect(component.mouseOverColor).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'mouseover');
-    expect(component.mouseOverColor).to.equal('blue');
+    helpers.triggerMouseEvent(liEls[2], "mouseover");
+    expect(component.mouseOverColor).to.equal("blue");
 
-    helpers.triggerMouseEvent(liEls[0], 'mouseout');
-    expect(component.mouseOutColor).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "mouseout");
+    expect(component.mouseOutColor).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'mouseout');
-    expect(component.mouseOutColor).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "mouseout");
+    expect(component.mouseOutColor).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'mouseout');
-    expect(component.mouseOutColor).to.equal('blue');
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "mouseout");
+    expect(component.mouseOutColor).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/component.js b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/component.js
index e00de6adb..9d03e11e6 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/component.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-	handleColorMouseOver: function (color) {
-		this.color = color;
-	}
-};
\ No newline at end of file
+    handleColorMouseOver: function(color) {
+        this.color = color;
+    }
+};
diff --git a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/test.js b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/test.js
index a4988f72f..d4ff1c502 100644
--- a/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/test.js
+++ b/test/components-browser/fixtures/dom-events-repeated-el-non-bubbling/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    var liEls = component.el.querySelectorAll('li');
+    var liEls = component.el.querySelectorAll("li");
 
-    helpers.triggerMouseEvent(liEls[0], 'mouseover');
-    expect(component.color).to.equal('red');
+    helpers.triggerMouseEvent(liEls[0], "mouseover");
+    expect(component.color).to.equal("red");
 
-    helpers.triggerMouseEvent(liEls[1], 'mouseover');
-    expect(component.color).to.equal('green');
+    helpers.triggerMouseEvent(liEls[1], "mouseover");
+    expect(component.color).to.equal("green");
 
-    helpers.triggerMouseEvent(liEls[2], 'mouseover');
-    expect(component.color).to.equal('blue');
-};
\ No newline at end of file
+    helpers.triggerMouseEvent(liEls[2], "mouseover");
+    expect(component.color).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures/event-attach-el-once/test.js b/test/components-browser/fixtures/event-attach-el-once/test.js
index cf6483538..db0f861ea 100644
--- a/test/components-browser/fixtures/event-attach-el-once/test.js
+++ b/test/components-browser/fixtures/event-attach-el-once/test.js
@@ -1,27 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red"]
     });
 
     // When hydrating, the first color item was rendered on the
     // server so there is no corresponding attach event fired
     var OFFSET = helpers.isHydrate ? -1 : 0;
 
-    expect(component.numberOfInvocations).to.equal(OFFSET+1);
+    expect(component.numberOfInvocations).to.equal(OFFSET + 1);
 
     component.input = {
-        colors: ['red', 'blue']
+        colors: ["red", "blue"]
     };
     component.update();
 
-    expect(component.numberOfInvocations).to.equal(OFFSET+2);
+    expect(component.numberOfInvocations).to.equal(OFFSET + 2);
 
     component.input = {
-        colors: ['red', 'green', 'blue']
+        colors: ["red", "green", "blue"]
     };
     component.update();
 
-    expect(component.numberOfInvocations).to.equal(OFFSET+3);
+    expect(component.numberOfInvocations).to.equal(OFFSET + 3);
 };
diff --git a/test/components-browser/fixtures/event-attach-el/test.js b/test/components-browser/fixtures/event-attach-el/test.js
index 6eca3f24b..9890858db 100644
--- a/test/components-browser/fixtures/event-attach-el/test.js
+++ b/test/components-browser/fixtures/event-attach-el/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red"]
     });
 
     // When hydrating, the first color item was rendered on the
@@ -10,27 +10,33 @@ module.exports = function (helpers) {
     var OFFSET = helpers.isHydrate ? -1 : 0;
     if (!helpers.isHydrate) {
         expect(component.events.length).to.equal(1);
-        expect(component.events[0].color).to.equal('red');
-        expect(component.events[0].node).to.equal(component.el.querySelectorAll('li')[0]);
+        expect(component.events[0].color).to.equal("red");
+        expect(component.events[0].node).to.equal(
+            component.el.querySelectorAll("li")[0]
+        );
     }
 
     component.input = {
-        colors: ['red', 'blue']
+        colors: ["red", "blue"]
     };
 
     component.update();
 
-    expect(component.events.length).to.equal(OFFSET+2);
-    expect(component.events[OFFSET+1].color).to.equal('blue');
-    expect(component.events[OFFSET+1].node).to.equal(component.el.querySelectorAll('li')[1]);
+    expect(component.events.length).to.equal(OFFSET + 2);
+    expect(component.events[OFFSET + 1].color).to.equal("blue");
+    expect(component.events[OFFSET + 1].node).to.equal(
+        component.el.querySelectorAll("li")[1]
+    );
 
     component.input = {
-        colors: ['red', 'green', 'blue']
+        colors: ["red", "green", "blue"]
     };
 
     component.update();
 
-    expect(component.events.length).to.equal(OFFSET+3);
-    expect(component.events[OFFSET+2].color).to.equal('green');
-    expect(component.events[OFFSET+2].node).to.equal(component.el.querySelectorAll('li')[1]);
-};
\ No newline at end of file
+    expect(component.events.length).to.equal(OFFSET + 3);
+    expect(component.events[OFFSET + 2].color).to.equal("green");
+    expect(component.events[OFFSET + 2].node).to.equal(
+        component.el.querySelectorAll("li")[1]
+    );
+};
diff --git a/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js b/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js
index 0f57bebb6..eb6b4601c 100644
--- a/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js
+++ b/test/components-browser/fixtures/event-attach-if-else-nested-component/test.js
@@ -1,40 +1,50 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var colors = ['blue', 'green', 'red'];
-    var component = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var colors = ["blue", "green", "red"];
+    var component = helpers.mount(require.resolve("./index"), {
         color: colors[0]
     });
 
     expect(component.events.length).to.equal(1);
-    expect(component.events[0].color).to.equal('blue');
-    expect(component.events[0].node).to.equal(component.el.querySelectorAll('li')[0]);
+    expect(component.events[0].color).to.equal("blue");
+    expect(component.events[0].node).to.equal(
+        component.el.querySelectorAll("li")[0]
+    );
 
-    component.input = {color: colors[1]};
+    component.input = { color: colors[1] };
     component.update();
 
     expect(component.events.length).to.equal(2);
     expect(component.events[1].color).to.equal(colors[1]);
-    expect(component.events[1].node).to.equal(component.el.querySelectorAll('li')[0]);
+    expect(component.events[1].node).to.equal(
+        component.el.querySelectorAll("li")[0]
+    );
 
-    component.input = {color: colors[2]};
+    component.input = { color: colors[2] };
     component.update();
 
     expect(component.events.length).to.equal(3);
     expect(component.events[2].color).to.equal(colors[2]);
-    expect(component.events[2].node).to.equal(component.el.querySelectorAll('li')[0]);
+    expect(component.events[2].node).to.equal(
+        component.el.querySelectorAll("li")[0]
+    );
 
-    component.input = {color: colors[0]};
+    component.input = { color: colors[0] };
     component.update();
 
     expect(component.events.length).to.equal(4);
     expect(component.events[3].color).to.equal(colors[0]);
-    expect(component.events[3].node).to.equal(component.el.querySelectorAll('li')[0]);
+    expect(component.events[3].node).to.equal(
+        component.el.querySelectorAll("li")[0]
+    );
 
-    component.input = {color: colors[2]};
+    component.input = { color: colors[2] };
     component.update();
 
     expect(component.events.length).to.equal(5);
     expect(component.events[4].color).to.equal(colors[2]);
-    expect(component.events[4].node).to.equal(component.el.querySelectorAll('li')[0]);
+    expect(component.events[4].node).to.equal(
+        component.el.querySelectorAll("li")[0]
+    );
 };
diff --git a/test/components-browser/fixtures/event-detach-component-destroy/test.js b/test/components-browser/fixtures/event-detach-component-destroy/test.js
index 1eac5c80b..4b18735e5 100644
--- a/test/components-browser/fixtures/event-detach-component-destroy/test.js
+++ b/test/components-browser/fixtures/event-detach-component-destroy/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(helpers.targetEl.querySelector('.root') != null).to.equal(true);
+    expect(helpers.targetEl.querySelector(".root") != null).to.equal(true);
 
     expect(component.detachEvent).to.equal(undefined);
     component.destroy();
 
-    expect(helpers.targetEl.querySelector('.root') != null).to.equal(true);
+    expect(helpers.targetEl.querySelector(".root") != null).to.equal(true);
     expect(component.detachEvent != null).to.equal(true);
 
     component.detachEvent.detach();
-    expect(helpers.targetEl.querySelector('.root') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelector(".root") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/event-detach-el-once/test.js b/test/components-browser/fixtures/event-detach-el-once/test.js
index 71ccaeeec..c43c400aa 100644
--- a/test/components-browser/fixtures/event-detach-el-once/test.js
+++ b/test/components-browser/fixtures/event-detach-el-once/test.js
@@ -1,21 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
     expect(component.numberOfInvocations).to.equal(0);
 
     component.input = {
-        colors: ['red', 'blue']
+        colors: ["red", "blue"]
     };
     component.update();
 
     expect(component.numberOfInvocations).to.equal(1);
 
     component.input = {
-        colors: ['red']
+        colors: ["red"]
     };
     component.update();
 
diff --git a/test/components-browser/fixtures/event-detach-el-preventDefault/test.js b/test/components-browser/fixtures/event-detach-el-preventDefault/test.js
index 40b0452c5..5b5427764 100644
--- a/test/components-browser/fixtures/event-detach-el-preventDefault/test.js
+++ b/test/components-browser/fixtures/event-detach-el-preventDefault/test.js
@@ -1,31 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
     expect(component.events.length).to.equal(0);
 
     var finishDetach;
 
-    component.handleDetach = function (color, event) {
-        expect(color).to.equal('green');
+    component.handleDetach = function(color, event) {
+        expect(color).to.equal("green");
         finishDetach = event.detach;
         event.preventDefault();
     };
 
     component.input = {
-        colors: ['red', 'blue']
+        colors: ["red", "blue"]
     };
 
     component.update();
 
-    expect(component.el.querySelectorAll('li').length).to.equal(3);
-    expect(component.el.querySelectorAll('li')[1].innerHTML).to.contain('green');
+    expect(component.el.querySelectorAll("li").length).to.equal(3);
+    expect(component.el.querySelectorAll("li")[1].innerHTML).to.contain(
+        "green"
+    );
 
     finishDetach();
 
-    expect(component.el.querySelectorAll('li').length).to.equal(2);
-    expect(component.el.querySelectorAll('li')[1].innerHTML).to.contain('blue');
-};
\ No newline at end of file
+    expect(component.el.querySelectorAll("li").length).to.equal(2);
+    expect(component.el.querySelectorAll("li")[1].innerHTML).to.contain("blue");
+};
diff --git a/test/components-browser/fixtures/event-detach-el/test.js b/test/components-browser/fixtures/event-detach-el/test.js
index 6c1d56166..5150c7a39 100644
--- a/test/components-browser/fixtures/event-detach-el/test.js
+++ b/test/components-browser/fixtures/event-detach-el/test.js
@@ -1,29 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
     expect(component.events.length).to.equal(0);
 
     component.input = {
-        colors: ['red', 'blue']
+        colors: ["red", "blue"]
     };
 
     component.update();
 
     expect(component.events.length).to.equal(1);
-    expect(component.events[0].color).to.equal('green');
-    expect(component.events[0].node.innerHTML).to.contain('green');
+    expect(component.events[0].color).to.equal("green");
+    expect(component.events[0].node.innerHTML).to.contain("green");
 
     component.input = {
-        colors: ['red']
+        colors: ["red"]
     };
 
     component.update();
 
     expect(component.events.length).to.equal(2);
-    expect(component.events[1].color).to.equal('blue');
-    expect(component.events[1].node.innerHTML).to.contain('blue');
-};
\ No newline at end of file
+    expect(component.events[1].color).to.equal("blue");
+    expect(component.events[1].node.innerHTML).to.contain("blue");
+};
diff --git a/test/components-browser/fixtures/event-detach-remove-nested-component-last/test.js b/test/components-browser/fixtures/event-detach-remove-nested-component-last/test.js
index e0c2d2d28..94cf29821 100644
--- a/test/components-browser/fixtures/event-detach-remove-nested-component-last/test.js
+++ b/test/components-browser/fixtures/event-detach-remove-nested-component-last/test.js
@@ -1,35 +1,35 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(3);
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(3);
 
-    var redComponent = component.getComponent('red');
-    var greenComponent = component.getComponent('green');
-    var blueComponent = component.getComponent('blue');
+    var redComponent = component.getComponent("red");
+    var greenComponent = component.getComponent("green");
+    var blueComponent = component.getComponent("blue");
 
-    var redEl = redComponent.getEl('root');
-    var greenEl = greenComponent.getEl('root');
-    var blueEl = blueComponent.getEl('root');
+    var redEl = redComponent.getEl("root");
+    var greenEl = greenComponent.getEl("root");
+    var blueEl = blueComponent.getEl("root");
 
-    var ul = component.getEl('root');
+    var ul = component.getEl("root");
     expect(ul != null).to.equal(true);
 
     expect(redEl.parentNode).to.equal(ul);
     expect(greenEl.parentNode).to.equal(ul);
     expect(blueEl.parentNode).to.equal(ul);
 
-    component.input = { colors: ['red', 'green'] };
+    component.input = { colors: ["red", "green"] };
     component.update();
 
     expect(redEl.parentNode).to.equal(ul);
     expect(greenEl.parentNode).to.equal(ul);
     expect(blueEl.parentNode).to.equal(ul);
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(3);
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(3);
 
     expect(redComponent.detachEvent == null).to.equal(true);
     expect(greenComponent.detachEvent == null).to.equal(true);
@@ -37,5 +37,5 @@ module.exports = function (helpers) {
 
     blueComponent.detachEvent.detach();
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(2);
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(2);
+};
diff --git a/test/components-browser/fixtures/event-detach-remove-nested-component-middle/test.js b/test/components-browser/fixtures/event-detach-remove-nested-component-middle/test.js
index fbcea48b3..1eff42f06 100644
--- a/test/components-browser/fixtures/event-detach-remove-nested-component-middle/test.js
+++ b/test/components-browser/fixtures/event-detach-remove-nested-component-middle/test.js
@@ -1,35 +1,35 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(3);
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(3);
 
-    var redComponent = component.getComponent('red');
-    var greenComponent = component.getComponent('green');
-    var blueComponent = component.getComponent('blue');
+    var redComponent = component.getComponent("red");
+    var greenComponent = component.getComponent("green");
+    var blueComponent = component.getComponent("blue");
 
-    var redEl = redComponent.getEl('root');
-    var greenEl = greenComponent.getEl('root');
-    var blueEl = blueComponent.getEl('root');
+    var redEl = redComponent.getEl("root");
+    var greenEl = greenComponent.getEl("root");
+    var blueEl = blueComponent.getEl("root");
 
-    var ul = component.getEl('root');
+    var ul = component.getEl("root");
     expect(ul != null).to.equal(true);
 
     expect(redEl.parentNode).to.equal(ul);
     expect(greenEl.parentNode).to.equal(ul);
     expect(blueEl.parentNode).to.equal(ul);
 
-    component.input = { colors: ['red', 'blue'] };
+    component.input = { colors: ["red", "blue"] };
     component.update();
 
     expect(redEl.parentNode).to.equal(ul);
     expect(greenEl.parentNode).to.equal(ul);
     expect(blueEl.parentNode).to.equal(ul);
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(3);
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(3);
 
     expect(redComponent.detachEvent == null).to.equal(true);
     expect(greenComponent.detachEvent != null).to.equal(true);
@@ -37,5 +37,5 @@ module.exports = function (helpers) {
 
     greenComponent.detachEvent.detach();
 
-    expect(helpers.targetEl.querySelectorAll('.color').length).to.equal(2);
-};
\ No newline at end of file
+    expect(helpers.targetEl.querySelectorAll(".color").length).to.equal(2);
+};
diff --git a/test/components-browser/fixtures/event-handler-bubbling-once-split/component-browser.js b/test/components-browser/fixtures/event-handler-bubbling-once-split/component-browser.js
index 2dbe65980..3d7873ac1 100644
--- a/test/components-browser/fixtures/event-handler-bubbling-once-split/component-browser.js
+++ b/test/components-browser/fixtures/event-handler-bubbling-once-split/component-browser.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.numOfInvocations = 0;
-	},
+    onMount: function() {
+        this.numOfInvocations = 0;
+    },
 
-	onceClick: function () {
-		this.numOfInvocations++;
-	}
+    onceClick: function() {
+        this.numOfInvocations++;
+    }
 };
diff --git a/test/components-browser/fixtures/event-handler-bubbling-once-split/test.js b/test/components-browser/fixtures/event-handler-bubbling-once-split/test.js
index ad6be7422..f840a3c4b 100644
--- a/test/components-browser/fixtures/event-handler-bubbling-once-split/test.js
+++ b/test/components-browser/fixtures/event-handler-bubbling-once-split/test.js
@@ -1,12 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var numOfInvocations = 0;
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    helpers.triggerClick(component.getEl('foo'));
+    helpers.triggerClick(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 
-    helpers.triggerClick(component.getEl('foo'));
+    helpers.triggerClick(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 };
diff --git a/test/components-browser/fixtures/event-handler-bubbling-once/component.js b/test/components-browser/fixtures/event-handler-bubbling-once/component.js
index 2dbe65980..3d7873ac1 100644
--- a/test/components-browser/fixtures/event-handler-bubbling-once/component.js
+++ b/test/components-browser/fixtures/event-handler-bubbling-once/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.numOfInvocations = 0;
-	},
+    onMount: function() {
+        this.numOfInvocations = 0;
+    },
 
-	onceClick: function () {
-		this.numOfInvocations++;
-	}
+    onceClick: function() {
+        this.numOfInvocations++;
+    }
 };
diff --git a/test/components-browser/fixtures/event-handler-bubbling-once/test.js b/test/components-browser/fixtures/event-handler-bubbling-once/test.js
index ad6be7422..f840a3c4b 100644
--- a/test/components-browser/fixtures/event-handler-bubbling-once/test.js
+++ b/test/components-browser/fixtures/event-handler-bubbling-once/test.js
@@ -1,12 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var numOfInvocations = 0;
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    helpers.triggerClick(component.getEl('foo'));
+    helpers.triggerClick(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 
-    helpers.triggerClick(component.getEl('foo'));
+    helpers.triggerClick(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 };
diff --git a/test/components-browser/fixtures/event-handler-custom-args/component.js b/test/components-browser/fixtures/event-handler-custom-args/component.js
index f6a670f5f..8ec7fc95e 100644
--- a/test/components-browser/fixtures/event-handler-custom-args/component.js
+++ b/test/components-browser/fixtures/event-handler-custom-args/component.js
@@ -1,10 +1,9 @@
 module.exports = {
+    onMount: function() {
+        this.pressEvent = undefined;
+    },
 
-	onMount: function () {
-		this.pressEvent = undefined;
-	},
-
-	handleButtonPress: function () {
-		this.pressEvent = arguments;
-	}
-};
\ No newline at end of file
+    handleButtonPress: function() {
+        this.pressEvent = arguments;
+    }
+};
diff --git a/test/components-browser/fixtures/event-handler-custom-args/components/app-fancy-button/component.js b/test/components-browser/fixtures/event-handler-custom-args/components/app-fancy-button/component.js
index d62e121f9..bc60c264d 100644
--- a/test/components-browser/fixtures/event-handler-custom-args/components/app-fancy-button/component.js
+++ b/test/components-browser/fixtures/event-handler-custom-args/components/app-fancy-button/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    getTemplateData: function (state, input) {
+    getTemplateData: function(state, input) {
         return {
             label: input.label
         };
     },
 
-    emitPressEvent: function () {
-        this.emit('press', { component: this });
+    emitPressEvent: function() {
+        this.emit("press", { component: this });
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/event-handler-custom-args/test.js b/test/components-browser/fixtures/event-handler-custom-args/test.js
index dbcd46ad2..ae9bb18d9 100644
--- a/test/components-browser/fixtures/event-handler-custom-args/test.js
+++ b/test/components-browser/fixtures/event-handler-custom-args/test.js
@@ -1,15 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    component.getComponent('ok').emitPressEvent();
+    component.getComponent("ok").emitPressEvent();
 
-    expect(component.pressEvent[0].type).to.equal('ok');
-    expect(component.pressEvent[1].component).to.equal(component.getComponent('ok'));
+    expect(component.pressEvent[0].type).to.equal("ok");
+    expect(component.pressEvent[1].component).to.equal(
+        component.getComponent("ok")
+    );
 
-    component.getComponent('cancel').emitPressEvent();
+    component.getComponent("cancel").emitPressEvent();
 
-    expect(component.pressEvent[0].type).to.equal('cancel');
-    expect(component.pressEvent[1].component).to.equal(component.getComponent('cancel'));
-};
\ No newline at end of file
+    expect(component.pressEvent[0].type).to.equal("cancel");
+    expect(component.pressEvent[1].component).to.equal(
+        component.getComponent("cancel")
+    );
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/component.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/component.js
index 4b26991a2..a05f5c7cb 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/component.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.buttonClickCalls = [];
-	},
+    onMount: function() {
+        this.buttonClickCalls = [];
+    },
 
-	handleButtonClick: function () {
-		this.buttonClickCalls.push(arguments);
-	}
-};
\ No newline at end of file
+    handleButtonClick: function() {
+        this.buttonClickCalls.push(arguments);
+    }
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js
index 29a198c7c..e80286562 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js
@@ -1,23 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.buttonClickCalls.length).to.equal(0);
 
-    helpers.triggerClick(component.getEl('ok'));
+    helpers.triggerClick(component.getEl("ok"));
 
     expect(component.buttonClickCalls.length).to.equal(1);
 
-    expect(component.buttonClickCalls[0][0]).to.equal('ok');
-    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[0][2].innerHTML).to.equal('OK');
+    expect(component.buttonClickCalls[0][0]).to.equal("ok");
+    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[0][2].innerHTML).to.equal("OK");
 
-    helpers.triggerClick(component.getEl('cancel'));
+    helpers.triggerClick(component.getEl("cancel"));
 
     expect(component.buttonClickCalls.length).to.equal(2);
 
-    expect(component.buttonClickCalls[1][0]).to.equal('cancel');
-    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[1][2].innerHTML).to.equal('Cancel');
-};
\ No newline at end of file
+    expect(component.buttonClickCalls[1][0]).to.equal("cancel");
+    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[1][2].innerHTML).to.equal("Cancel");
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/component.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/component.js
index da57d8359..a05f5c7cb 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/component.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.buttonClickCalls = [];
-	},
+    onMount: function() {
+        this.buttonClickCalls = [];
+    },
 
-	handleButtonClick: function () {
-		this.buttonClickCalls.push(arguments);
-	}
+    handleButtonClick: function() {
+        this.buttonClickCalls.push(arguments);
+    }
 };
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/test.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/test.js
index d839579a3..8a2e60948 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/test.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling-once/test.js
@@ -1,33 +1,37 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.buttonClickCalls.length).to.equal(0);
 
     // First button
-    helpers.triggerClick(component.getEl('ok'));
+    helpers.triggerClick(component.getEl("ok"));
 
     expect(component.buttonClickCalls.length).to.equal(1);
 
-    expect(component.buttonClickCalls[0][0]).to.equal('ok');
-    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[0][2].innerHTML).to.equal('OK');
+    expect(component.buttonClickCalls[0][0]).to.equal("ok");
+    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[0][2].innerHTML).to.equal("OK");
 
-    helpers.triggerClick(component.getEl('ok'));
+    helpers.triggerClick(component.getEl("ok"));
 
     expect(component.buttonClickCalls.length).to.equal(1);
 
     // Second button
-    helpers.triggerClick(component.getEl('cancel'));
+    helpers.triggerClick(component.getEl("cancel"));
 
     expect(component.buttonClickCalls.length).to.equal(2);
 
-    expect(component.buttonClickCalls[1][0]).to.equal('cancel');
-    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[1][2].innerHTML).to.equal('Cancel');
+    expect(component.buttonClickCalls[1][0]).to.equal("cancel");
+    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[1][2].innerHTML).to.equal("Cancel");
 
-    helpers.triggerClick(component.getEl('cancel'));
+    helpers.triggerClick(component.getEl("cancel"));
 
     expect(component.buttonClickCalls.length).to.equal(2);
 };
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling/component.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling/component.js
index 4b26991a2..a05f5c7cb 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling/component.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.buttonClickCalls = [];
-	},
+    onMount: function() {
+        this.buttonClickCalls = [];
+    },
 
-	handleButtonClick: function () {
-		this.buttonClickCalls.push(arguments);
-	}
-};
\ No newline at end of file
+    handleButtonClick: function() {
+        this.buttonClickCalls.push(arguments);
+    }
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-bubbling/test.js b/test/components-browser/fixtures/event-handler-dom-args-bubbling/test.js
index 29a198c7c..e80286562 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-bubbling/test.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-bubbling/test.js
@@ -1,23 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.buttonClickCalls.length).to.equal(0);
 
-    helpers.triggerClick(component.getEl('ok'));
+    helpers.triggerClick(component.getEl("ok"));
 
     expect(component.buttonClickCalls.length).to.equal(1);
 
-    expect(component.buttonClickCalls[0][0]).to.equal('ok');
-    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[0][2].innerHTML).to.equal('OK');
+    expect(component.buttonClickCalls[0][0]).to.equal("ok");
+    expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[0][2].innerHTML).to.equal("OK");
 
-    helpers.triggerClick(component.getEl('cancel'));
+    helpers.triggerClick(component.getEl("cancel"));
 
     expect(component.buttonClickCalls.length).to.equal(2);
 
-    expect(component.buttonClickCalls[1][0]).to.equal('cancel');
-    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a('function');
-    expect(component.buttonClickCalls[1][2].innerHTML).to.equal('Cancel');
-};
\ No newline at end of file
+    expect(component.buttonClickCalls[1][0]).to.equal("cancel");
+    expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.buttonClickCalls[1][2].innerHTML).to.equal("Cancel");
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/component.js b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/component.js
index ee12b1089..1b831a60e 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/component.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.mouseMoveEventCalls = [];
-	},
+    onMount: function() {
+        this.mouseMoveEventCalls = [];
+    },
 
-	handleButtonMouseMove: function () {
+    handleButtonMouseMove: function() {
         this.mouseMoveEventCalls.push(arguments);
-	}
+    }
 };
diff --git a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js
index 1ec06e76a..842fee012 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling-once/test.js
@@ -1,29 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.mouseMoveEvent).to.equal(undefined);
 
     // First button
-    helpers.triggerMouseMove(component.getEl('ok'));
+    helpers.triggerMouseMove(component.getEl("ok"));
 
     expect(component.mouseMoveEventCalls.length).to.equal(1);
-    expect(component.mouseMoveEventCalls[0][0]).to.equal('ok');
-    expect(component.mouseMoveEventCalls[0][1].stopPropagation).to.be.a('function');
-    expect(component.mouseMoveEventCalls[0][2].innerHTML).to.equal('OK');
+    expect(component.mouseMoveEventCalls[0][0]).to.equal("ok");
+    expect(component.mouseMoveEventCalls[0][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.mouseMoveEventCalls[0][2].innerHTML).to.equal("OK");
 
-    helpers.triggerMouseMove(component.getEl('ok'));
+    helpers.triggerMouseMove(component.getEl("ok"));
     expect(component.mouseMoveEventCalls.length).to.equal(1);
 
     // Second button
-    helpers.triggerMouseMove(component.getEl('cancel'));
+    helpers.triggerMouseMove(component.getEl("cancel"));
 
     expect(component.mouseMoveEventCalls.length).to.equal(2);
-    expect(component.mouseMoveEventCalls[1][0]).to.equal('cancel');
-    expect(component.mouseMoveEventCalls[1][1].stopPropagation).to.be.a('function');
-    expect(component.mouseMoveEventCalls[1][2].innerHTML).to.equal('Cancel');
+    expect(component.mouseMoveEventCalls[1][0]).to.equal("cancel");
+    expect(component.mouseMoveEventCalls[1][1].stopPropagation).to.be.a(
+        "function"
+    );
+    expect(component.mouseMoveEventCalls[1][2].innerHTML).to.equal("Cancel");
 
-    helpers.triggerMouseMove(component.getEl('cancel'));
+    helpers.triggerMouseMove(component.getEl("cancel"));
     expect(component.mouseMoveEventCalls.length).to.equal(2);
 };
diff --git a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/component.js b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/component.js
index 1fd572ff9..50483ea6c 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/component.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.mouseMoveEvent = undefined;
-	},
+    onMount: function() {
+        this.mouseMoveEvent = undefined;
+    },
 
-	handleButtonMouseMove: function () {
-		this.mouseMoveEvent = arguments;
-	}
-};
\ No newline at end of file
+    handleButtonMouseMove: function() {
+        this.mouseMoveEvent = arguments;
+    }
+};
diff --git a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/test.js b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/test.js
index ba9b00f55..fe8dbe9c5 100644
--- a/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/test.js
+++ b/test/components-browser/fixtures/event-handler-dom-args-non-bubbling/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.mouseMoveEvent).to.equal(undefined);
 
-    helpers.triggerMouseMove(component.getEl('ok'));
+    helpers.triggerMouseMove(component.getEl("ok"));
 
-    expect(component.mouseMoveEvent[0]).to.equal('ok');
-    expect(component.mouseMoveEvent[1].stopPropagation).to.be.a('function');
-    expect(component.mouseMoveEvent[2].innerHTML).to.equal('OK');
+    expect(component.mouseMoveEvent[0]).to.equal("ok");
+    expect(component.mouseMoveEvent[1].stopPropagation).to.be.a("function");
+    expect(component.mouseMoveEvent[2].innerHTML).to.equal("OK");
 
-    helpers.triggerMouseMove(component.getEl('cancel'));
+    helpers.triggerMouseMove(component.getEl("cancel"));
 
-    expect(component.mouseMoveEvent[0]).to.equal('cancel');
-    expect(component.mouseMoveEvent[1].stopPropagation).to.be.a('function');
-    expect(component.mouseMoveEvent[2].innerHTML).to.equal('Cancel');
-};
\ No newline at end of file
+    expect(component.mouseMoveEvent[0]).to.equal("cancel");
+    expect(component.mouseMoveEvent[1].stopPropagation).to.be.a("function");
+    expect(component.mouseMoveEvent[2].innerHTML).to.equal("Cancel");
+};
diff --git a/test/components-browser/fixtures/event-handler-non-bubbling-once/component.js b/test/components-browser/fixtures/event-handler-non-bubbling-once/component.js
index 51024c2ca..ee4a3582c 100644
--- a/test/components-browser/fixtures/event-handler-non-bubbling-once/component.js
+++ b/test/components-browser/fixtures/event-handler-non-bubbling-once/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.numOfInvocations = 0;
-	},
+    onMount: function() {
+        this.numOfInvocations = 0;
+    },
 
-	onceMouseMove: function () {
-		this.numOfInvocations++;
-	}
+    onceMouseMove: function() {
+        this.numOfInvocations++;
+    }
 };
diff --git a/test/components-browser/fixtures/event-handler-non-bubbling-once/test.js b/test/components-browser/fixtures/event-handler-non-bubbling-once/test.js
index c68ddd133..2ced44b29 100644
--- a/test/components-browser/fixtures/event-handler-non-bubbling-once/test.js
+++ b/test/components-browser/fixtures/event-handler-non-bubbling-once/test.js
@@ -1,12 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var numOfInvocations = 0;
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    helpers.triggerMouseMove(component.getEl('foo'));
+    helpers.triggerMouseMove(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 
-    helpers.triggerMouseMove(component.getEl('foo'));
+    helpers.triggerMouseMove(component.getEl("foo"));
     expect(component.numOfInvocations).to.equal(1);
 };
diff --git a/test/components-browser/fixtures/event-handler-non-bubbling-rerender-el-mismatch/test.js b/test/components-browser/fixtures/event-handler-non-bubbling-rerender-el-mismatch/test.js
index c177094e5..3decac40a 100644
--- a/test/components-browser/fixtures/event-handler-non-bubbling-rerender-el-mismatch/test.js
+++ b/test/components-browser/fixtures/event-handler-non-bubbling-rerender-el-mismatch/test.js
@@ -1,22 +1,22 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-   var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-   expect(component.mouseMoveEvent).to.equal(undefined);
+    expect(component.mouseMoveEvent).to.equal(undefined);
 
-   var rootEl = helpers.targetEl.querySelector('div');
-   helpers.triggerMouseMove(rootEl);
-   expect(component.mouseMoveEvent).to.equal(true);
+    var rootEl = helpers.targetEl.querySelector("div");
+    helpers.triggerMouseMove(rootEl);
+    expect(component.mouseMoveEvent).to.equal(true);
 
-   component.state.div = false;
-   component.update();
+    component.state.div = false;
+    component.update();
 
-   expect(helpers.targetEl.querySelector('div') == null).to.equal(true);
+    expect(helpers.targetEl.querySelector("div") == null).to.equal(true);
 
-   component.mouseMoveEvent = undefined;
+    component.mouseMoveEvent = undefined;
 
-   rootEl = helpers.targetEl.querySelector('span');
-   helpers.triggerMouseMove(rootEl);
-   expect(component.mouseMoveEvent).to.equal(true);
-};
\ No newline at end of file
+    rootEl = helpers.targetEl.querySelector("span");
+    helpers.triggerMouseMove(rootEl);
+    expect(component.mouseMoveEvent).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/event-handler-non-bubbling-root-el/test.js b/test/components-browser/fixtures/event-handler-non-bubbling-root-el/test.js
index debe14fbf..eb15f15e6 100644
--- a/test/components-browser/fixtures/event-handler-non-bubbling-root-el/test.js
+++ b/test/components-browser/fixtures/event-handler-non-bubbling-root-el/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.mouseMoveEvent).to.equal(undefined);
 
-    var rootEl = helpers.targetEl.querySelector('div');
+    var rootEl = helpers.targetEl.querySelector("div");
 
     helpers.triggerMouseMove(rootEl);
 
     expect(component.mouseMoveEvent).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/extend-component/components/app-button/component.js b/test/components-browser/fixtures/extend-component/components/app-button/component.js
index 4d649ae57..9c8e7dd52 100644
--- a/test/components-browser/fixtures/extend-component/components/app-button/component.js
+++ b/test/components-browser/fixtures/extend-component/components/app-button/component.js
@@ -1,32 +1,32 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary',
-            className: input['class'],
+            size: input.size || "normal",
+            variant: input.variant || "primary",
+            className: input["class"],
             body: input.label || input.renderBody
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Component instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    setLabel: function (label) {
-        this.setState('label', label);
+    setLabel: function(label) {
+        this.setState("label", label);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/extend-component/components/app-button/marko-tag.json b/test/components-browser/fixtures/extend-component/components/app-button/marko-tag.json
index be051d1e0..53ff1965e 100644
--- a/test/components-browser/fixtures/extend-component/components/app-button/marko-tag.json
+++ b/test/components-browser/fixtures/extend-component/components/app-button/marko-tag.json
@@ -3,22 +3,15 @@
     "@href": "string",
     "@variant": {
         "type": "string",
-        "enum": [
-            "primary",
-            "secondary"
-        ]
+        "enum": ["primary", "secondary"]
     },
     "@size": {
         "type": "string",
-        "enum": [
-            "small",
-            "normal",
-            "large"
-        ]
+        "enum": ["small", "normal", "large"]
     },
     "@class": {
         "type": "string",
         "description": "Additional CSS class names"
     },
     "@*": "string"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/extend-component/components/app-checkbox/component.js b/test/components-browser/fixtures/extend-component/components/app-checkbox/component.js
index 8fa0051f4..baf3ced3c 100644
--- a/test/components-browser/fixtures/extend-component/components/app-checkbox/component.js
+++ b/test/components-browser/fixtures/extend-component/components/app-checkbox/component.js
@@ -1,46 +1,46 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             checked: input.checked === true,
-            className: input['class'],
+            className: input["class"],
             data: input.data,
             body: input.label || input.renderBody
         };
     },
 
-    isChecked: function () {
+    isChecked: function() {
         return this.state.checked === true;
     },
 
-    setChecked: function (newChecked) {
+    setChecked: function(newChecked) {
         if (newChecked !== this.state.checked) {
-            this.setState('checked', !this.state.checked);
+            this.setState("checked", !this.state.checked);
         }
     },
 
-    toggle: function () {
+    toggle: function() {
         this.setChecked(!this.state.checked);
     },
 
-    getData: function () {
+    getData: function() {
         return this.state.data;
     },
 
-    handleClick: function () {
+    handleClick: function() {
         var newChecked = !this.state.checked;
 
         var defaultPrevented = false;
 
-        this.emit('toggle', {
+        this.emit("toggle", {
             checked: newChecked,
             data: this.state.data,
-            preventDefault: function () {
+            preventDefault: function() {
                 defaultPrevented = true;
             }
         });
 
         if (!defaultPrevented) {
-            this.setState('checked', newChecked);
+            this.setState("checked", newChecked);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/extend-component/components/app-checkbox/marko-tag.json b/test/components-browser/fixtures/extend-component/components/app-checkbox/marko-tag.json
index 2162b6d62..4221d5166 100644
--- a/test/components-browser/fixtures/extend-component/components/app-checkbox/marko-tag.json
+++ b/test/components-browser/fixtures/extend-component/components/app-checkbox/marko-tag.json
@@ -3,4 +3,4 @@
     "@data": "expression",
     "@checked": "boolean",
     "@class": "string"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/extend-component/test.js b/test/components-browser/fixtures/extend-component/test.js
index 49f674514..574e60389 100644
--- a/test/components-browser/fixtures/extend-component/test.js
+++ b/test/components-browser/fixtures/extend-component/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    helpers.mount(require.resolve('./components/app-checkbox'), {
+module.exports = function(helpers) {
+    helpers.mount(require.resolve("./components/app-checkbox"), {
         checked: true,
-        'class': 'my-checkbox',
+        class: "my-checkbox",
         data: 123
     });
 
     expect(helpers.targetEl.children.length).to.equal(1);
-    expect(helpers.targetEl.children[0].nodeName).to.equal('BUTTON');
+    expect(helpers.targetEl.children[0].nodeName).to.equal("BUTTON");
 
-    var el = helpers.targetEl.querySelector('.my-checkbox');
+    var el = helpers.targetEl.querySelector(".my-checkbox");
     expect(el != null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/forceUpdate/test.js b/test/components-browser/fixtures/forceUpdate/test.js
index 1b06ee677..d0458056b 100644
--- a/test/components-browser/fixtures/forceUpdate/test.js
+++ b/test/components-browser/fixtures/forceUpdate/test.js
@@ -1,4 +1,4 @@
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index.marko'), {});
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index.marko"), {});
     component.test(done);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/global-rerender-nested/test.js b/test/components-browser/fixtures/global-rerender-nested/test.js
index ab3700ecd..759d3297f 100644
--- a/test/components-browser/fixtures/global-rerender-nested/test.js
+++ b/test/components-browser/fixtures/global-rerender-nested/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
         $global: {
-            name: 'Frank',
-            serializedGlobals: { name:true }
+            name: "Frank",
+            serializedGlobals: { name: true }
         }
     });
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.el.querySelector('.count').innerHTML).to.equal('1');
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.el.querySelector(".count").innerHTML).to.equal("1");
 
     component.state.count++;
     component.update();
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.el.querySelector('.count').innerHTML).to.equal('2');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.el.querySelector(".count").innerHTML).to.equal("2");
+};
diff --git a/test/components-browser/fixtures/global-rerender/test.js b/test/components-browser/fixtures/global-rerender/test.js
index ab3700ecd..759d3297f 100644
--- a/test/components-browser/fixtures/global-rerender/test.js
+++ b/test/components-browser/fixtures/global-rerender/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
         $global: {
-            name: 'Frank',
-            serializedGlobals: { name:true }
+            name: "Frank",
+            serializedGlobals: { name: true }
         }
     });
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.el.querySelector('.count').innerHTML).to.equal('1');
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.el.querySelector(".count").innerHTML).to.equal("1");
 
     component.state.count++;
     component.update();
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.el.querySelector('.count').innerHTML).to.equal('2');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.el.querySelector(".count").innerHTML).to.equal("2");
+};
diff --git a/test/components-browser/fixtures/implicit-component-keys/test.js b/test/components-browser/fixtures/implicit-component-keys/test.js
index fcb2b3374..256020af5 100644
--- a/test/components-browser/fixtures/implicit-component-keys/test.js
+++ b/test/components-browser/fixtures/implicit-component-keys/test.js
@@ -1,22 +1,24 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { swapped: false });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        swapped: false
+    });
 
-    var els = helpers.targetEl.querySelectorAll('div');
-    expect(els[0].className).to.equal('a');
-    expect(els[1].className).to.equal('b');
+    var els = helpers.targetEl.querySelectorAll("div");
+    expect(els[0].className).to.equal("a");
+    expect(els[1].className).to.equal("b");
 
     component.input = { swapped: true };
     component.update();
 
-    var elsAfter = helpers.targetEl.querySelectorAll('div');
-    expect(elsAfter[0].className).to.equal('b');
-    expect(elsAfter[1].className).to.equal('a');
+    var elsAfter = helpers.targetEl.querySelectorAll("div");
+    expect(elsAfter[0].className).to.equal("b");
+    expect(elsAfter[1].className).to.equal("a");
 
     // Make sure the same element was swapped
     expect(els[0]).to.equal(elsAfter[1]);
     expect(els[1]).to.equal(elsAfter[0]);
 };
 
-module.exports.skipHydrate = 'Implicit components do not get hydrated';
\ No newline at end of file
+module.exports.skipHydrate = "Implicit components do not get hydrated";
diff --git a/test/components-browser/fixtures/implicit-component/test.js b/test/components-browser/fixtures/implicit-component/test.js
index 2f76cbe1d..428f76334 100644
--- a/test/components-browser/fixtures/implicit-component/test.js
+++ b/test/components-browser/fixtures/implicit-component/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(helpers.targetEl.querySelector('.hello') != null).to.equal(true);
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(helpers.targetEl.querySelector(".hello") != null).to.equal(true);
     component.destroy();
-    expect(helpers.targetEl.querySelector('.hello') == null).to.equal(true);
+    expect(helpers.targetEl.querySelector(".hello") == null).to.equal(true);
 };
 
-module.exports.skipHydrate = 'Implicit components do not get hydrated';
\ No newline at end of file
+module.exports.skipHydrate = "Implicit components do not get hydrated";
diff --git a/test/components-browser/fixtures/include-event-handler/test.js b/test/components-browser/fixtures/include-event-handler/test.js
index f070db57e..78da2faff 100644
--- a/test/components-browser/fixtures/include-event-handler/test.js
+++ b/test/components-browser/fixtures/include-event-handler/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.helloReceived).to.equal(false);
 
-    component.el.querySelector('button').click();
+    component.el.querySelector("button").click();
 
     expect(component.helloReceived).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/include-preserve-old/test.js b/test/components-browser/fixtures/include-preserve-old/test.js
index 1459c21c0..842673511 100644
--- a/test/components-browser/fixtures/include-preserve-old/test.js
+++ b/test/components-browser/fixtures/include-preserve-old/test.js
@@ -1,20 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         index: 0
     });
 
-    var fooComponent = component.getComponent('foo');
+    var fooComponent = component.getComponent("foo");
 
-    expect(fooComponent.el.querySelector('.body').innerHTML).to.equal('Current index: 0');
-    expect(fooComponent.el.querySelector('span').innerHTML).to.equal('Hello Frank!');
+    expect(fooComponent.el.querySelector(".body").innerHTML).to.equal(
+        "Current index: 0"
+    );
+    expect(fooComponent.el.querySelector("span").innerHTML).to.equal(
+        "Hello Frank!"
+    );
 
-    fooComponent.state.name = 'Jane';
+    fooComponent.state.name = "Jane";
 
     fooComponent.update();
 
-    expect(fooComponent.el.querySelector('.body').innerHTML).to.equal('Current index: 0');
-    expect(fooComponent.el.querySelector('span').innerHTML).to.equal('Hello Jane!');
-};
\ No newline at end of file
+    expect(fooComponent.el.querySelector(".body").innerHTML).to.equal(
+        "Current index: 0"
+    );
+    expect(fooComponent.el.querySelector("span").innerHTML).to.equal(
+        "Hello Jane!"
+    );
+};
diff --git a/test/components-browser/fixtures/include-root/test.js b/test/components-browser/fixtures/include-root/test.js
index 416cbae18..4c615ca9f 100644
--- a/test/components-browser/fixtures/include-root/test.js
+++ b/test/components-browser/fixtures/include-root/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    helpers.triggerMouseEvent(component.getEl('button'), 'click');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    helpers.triggerMouseEvent(component.getEl("button"), "click");
     expect(component.clicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/input-checkbox/test.js b/test/components-browser/fixtures/input-checkbox/test.js
index 6e725ce5e..c103fe378 100644
--- a/test/components-browser/fixtures/input-checkbox/test.js
+++ b/test/components-browser/fixtures/input-checkbox/test.js
@@ -1,26 +1,26 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"));
 
-    var firstCheckbox = component.getEl('first');
-    var secondCheckbox = component.getEl('second');
+    var firstCheckbox = component.getEl("first");
+    var secondCheckbox = component.getEl("second");
 
     expect(firstCheckbox.checked).to.equal(true);
     expect(secondCheckbox.checked).to.equal(false);
 
-    helpers.triggerMouseEvent(firstCheckbox, 'click');
+    helpers.triggerMouseEvent(firstCheckbox, "click");
 
     expect(firstCheckbox.checked).to.equal(false);
     expect(secondCheckbox.checked).to.equal(false);
 
-    helpers.triggerMouseEvent(firstCheckbox, 'click');
+    helpers.triggerMouseEvent(firstCheckbox, "click");
 
     expect(firstCheckbox.checked).to.equal(true);
     expect(secondCheckbox.checked).to.equal(false);
 
-    helpers.triggerMouseEvent(secondCheckbox, 'click');
+    helpers.triggerMouseEvent(secondCheckbox, "click");
 
     expect(firstCheckbox.checked).to.equal(true);
     expect(secondCheckbox.checked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/input-global/test.js b/test/components-browser/fixtures/input-global/test.js
index c3cb13d4a..e6bfe9eef 100644
--- a/test/components-browser/fixtures/input-global/test.js
+++ b/test/components-browser/fixtures/input-global/test.js
@@ -1,22 +1,23 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
         $global: {
-            pathname: '/'
+            pathname: "/"
         }
     });
 
-    expect(component.getEl('current').innerHTML).to.equal('Pathname: /');
+    expect(component.getEl("current").innerHTML).to.equal("Pathname: /");
 
     component.input = {
         $global: {
-            pathname: '/test'
+            pathname: "/test"
         }
     };
     component.update();
 
-    expect(component.getEl('current').innerHTML).to.equal('Pathname: /test');
+    expect(component.getEl("current").innerHTML).to.equal("Pathname: /test");
 };
 
-module.exports.skipHydrate = 'When hydrating, only one $global value can be passed.  This test uses 2.';
\ No newline at end of file
+module.exports.skipHydrate =
+    "When hydrating, only one $global value can be passed.  This test uses 2.";
diff --git a/test/components-browser/fixtures/input-no-change-nested/components/foo/test.js b/test/components-browser/fixtures/input-no-change-nested/components/foo/test.js
index 87ad11425..05020904e 100644
--- a/test/components-browser/fixtures/input-no-change-nested/components/foo/test.js
+++ b/test/components-browser/fixtures/input-no-change-nested/components/foo/test.js
@@ -1,30 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
     });
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'Frank'
+        name: "Frank"
     };
 
     component.update();
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'John'
+        name: "John"
     };
 
     component.update();
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('1');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('John');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("1");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("John");
+};
diff --git a/test/components-browser/fixtures/input-no-change-nested/test.js b/test/components-browser/fixtures/input-no-change-nested/test.js
index 3cfc49fdc..46c817d2f 100644
--- a/test/components-browser/fixtures/input-no-change-nested/test.js
+++ b/test/components-browser/fixtures/input-no-change-nested/test.js
@@ -1,30 +1,45 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
     });
 
-    expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(
+        component.getComponent("foo").el.querySelector(".render-count")
+            .innerHTML
+    ).to.equal("0");
+    expect(
+        component.getComponent("foo").el.querySelector(".name").innerHTML
+    ).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'Frank'
+        name: "Frank"
     };
 
     component.update();
 
-    expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(
+        component.getComponent("foo").el.querySelector(".render-count")
+            .innerHTML
+    ).to.equal("0");
+    expect(
+        component.getComponent("foo").el.querySelector(".name").innerHTML
+    ).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'John'
+        name: "John"
     };
 
     component.update();
 
-    expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('1');
-    expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('John');
-};
\ No newline at end of file
+    expect(
+        component.getComponent("foo").el.querySelector(".render-count")
+            .innerHTML
+    ).to.equal("1");
+    expect(
+        component.getComponent("foo").el.querySelector(".name").innerHTML
+    ).to.equal("John");
+};
diff --git a/test/components-browser/fixtures/input-no-change/test.js b/test/components-browser/fixtures/input-no-change/test.js
index 87ad11425..05020904e 100644
--- a/test/components-browser/fixtures/input-no-change/test.js
+++ b/test/components-browser/fixtures/input-no-change/test.js
@@ -1,30 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
     });
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'Frank'
+        name: "Frank"
     };
 
     component.update();
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
     // Rerender with a new props object that has the shallow properties
     component.input = {
-        name: 'John'
+        name: "John"
     };
 
     component.update();
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('1');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('John');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("1");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("John");
+};
diff --git a/test/components-browser/fixtures/input-no-value/test.js b/test/components-browser/fixtures/input-no-value/test.js
index 29fc911a9..7b7233cf5 100644
--- a/test/components-browser/fixtures/input-no-value/test.js
+++ b/test/components-browser/fixtures/input-no-value/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"));
 
-    expect(component.getEl('searchInput').value).to.equal('');
+    expect(component.getEl("searchInput").value).to.equal("");
 
     component.increment();
     component.update();
 
-    expect(component.getEl('searchInput').value).to.equal('');
-};
\ No newline at end of file
+    expect(component.getEl("searchInput").value).to.equal("");
+};
diff --git a/test/components-browser/fixtures/input-persisted-nested-component/test.js b/test/components-browser/fixtures/input-persisted-nested-component/test.js
index c5b43105f..63fc13ada 100644
--- a/test/components-browser/fixtures/input-persisted-nested-component/test.js
+++ b/test/components-browser/fixtures/input-persisted-nested-component/test.js
@@ -1,31 +1,43 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        color: 'red'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        color: "red"
     });
 
-    expect(component.el.getAttribute('style')).to.equal('color:red;');
-    expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color:red;');
-    expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('0');
+    expect(component.el.getAttribute("style")).to.equal("color:red;");
+    expect(component.getComponent("counter").el.getAttribute("style")).to.equal(
+        "color:red;"
+    );
+    expect(
+        component.getComponent("counter").el.querySelector(".count").innerHTML
+    ).to.equal("0");
 
-    component.getComponent('counter').increment();
-    component.getComponent('counter').update();
+    component.getComponent("counter").increment();
+    component.getComponent("counter").update();
 
-    expect(component.el.getAttribute('style')).to.equal('color:red;');
-    expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color:red;');
-    expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('1');
+    expect(component.el.getAttribute("style")).to.equal("color:red;");
+    expect(component.getComponent("counter").el.getAttribute("style")).to.equal(
+        "color:red;"
+    );
+    expect(
+        component.getComponent("counter").el.querySelector(".count").innerHTML
+    ).to.equal("1");
 
-    component.updateColor('green');
+    component.updateColor("green");
     component.update();
 
-    expect(component.el.getAttribute('style')).to.equal('color: green;');
-    expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color: green;');
-    expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('1');
+    expect(component.el.getAttribute("style")).to.equal("color: green;");
+    expect(component.getComponent("counter").el.getAttribute("style")).to.equal(
+        "color: green;"
+    );
+    expect(
+        component.getComponent("counter").el.querySelector(".count").innerHTML
+    ).to.equal("1");
 
     //
     // expect(component.el.style.color).to.equal('#09c;');
     // expect(component.getComponent('counter').el.style.color).to.equal('#09c;');
     //
     // expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;');
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/input-persisted/test.js b/test/components-browser/fixtures/input-persisted/test.js
index d9ac902de..dcc045f94 100644
--- a/test/components-browser/fixtures/input-persisted/test.js
+++ b/test/components-browser/fixtures/input-persisted/test.js
@@ -1,14 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        color: '#09c'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        color: "#09c"
     });
 
-    expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;');
+    expect(component.getEl("current").getAttribute("style")).to.equal(
+        "color:#09c;"
+    );
 
     component.increment();
     component.update();
 
-    expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;');
-};
\ No newline at end of file
+    expect(component.getEl("current").getAttribute("style")).to.equal(
+        "color:#09c;"
+    );
+};
diff --git a/test/components-browser/fixtures/input-value-zero/test.js b/test/components-browser/fixtures/input-value-zero/test.js
index bb9a97a29..3f1790c66 100644
--- a/test/components-browser/fixtures/input-value-zero/test.js
+++ b/test/components-browser/fixtures/input-value-zero/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
         value: 1
     });
 
-    expect(component.getEl('input').value).to.equal('1');
+    expect(component.getEl("input").value).to.equal("1");
 
     component.state.value = 0;
     component.update();
 
-    expect(component.getEl('input').value).to.equal('0');
-};
\ No newline at end of file
+    expect(component.getEl("input").value).to.equal("0");
+};
diff --git a/test/components-browser/fixtures/key-transcluded-content/test.js b/test/components-browser/fixtures/key-transcluded-content/test.js
index b72fb8c77..e890c222a 100644
--- a/test/components-browser/fixtures/key-transcluded-content/test.js
+++ b/test/components-browser/fixtures/key-transcluded-content/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var passwordInput = component.getEl('passwordInput');
-    expect(passwordInput.type).to.equal('password');
-};
\ No newline at end of file
+    var passwordInput = component.getEl("passwordInput");
+    expect(passwordInput.type).to.equal("password");
+};
diff --git a/test/components-browser/fixtures/keyed-matching-transcluded/test.js b/test/components-browser/fixtures/keyed-matching-transcluded/test.js
index 39a78225d..dc3bd65dc 100644
--- a/test/components-browser/fixtures/keyed-matching-transcluded/test.js
+++ b/test/components-browser/fixtures/keyed-matching-transcluded/test.js
@@ -1,8 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    helpers.mount(require.resolve("./index"), {});
     var targetEl = helpers.targetEl;
     var innerHTML = targetEl.innerHTML;
-    expect(innerHTML).to.equal('<!--$marko--><div class="card"><div class="body"><span>1</span></div></div><div class="card"><div class="body"><span>2</span></div></div><div class="card"><div class="body"><span>3</span></div></div><div class="card"><div class="body"><span>4</span></div></div><!--$marko-->');
-};
\ No newline at end of file
+    expect(innerHTML).to.equal(
+        '<!--$marko--><div class="card"><div class="body"><span>1</span></div></div><div class="card"><div class="body"><span>2</span></div></div><div class="card"><div class="body"><span>3</span></div></div><div class="card"><div class="body"><span>4</span></div></div><!--$marko-->'
+    );
+};
diff --git a/test/components-browser/fixtures/label-for-scoped-repeated/test.js b/test/components-browser/fixtures/label-for-scoped-repeated/test.js
index 3ca377f9f..d365d962c 100644
--- a/test/components-browser/fixtures/label-for-scoped-repeated/test.js
+++ b/test/components-browser/fixtures/label-for-scoped-repeated/test.js
@@ -1,29 +1,32 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var fields = [{
-        value: 'name',
-        label: 'Name'
-    }, {
-        value: 'age',
-        label: 'Age'
-    }];
+module.exports = function(helpers) {
+    var fields = [
+        {
+            value: "name",
+            label: "Name"
+        },
+        {
+            value: "age",
+            label: "Age"
+        }
+    ];
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         fields: fields
     });
 
-    var inputs = component.getEl('root').querySelectorAll('input');
-    var labels = component.getEl('root').querySelectorAll('label');
+    var inputs = component.getEl("root").querySelectorAll("input");
+    var labels = component.getEl("root").querySelectorAll("label");
 
     expect(inputs.length).to.equal(fields.length);
 
     for (var i = 0; i < fields.length; i++) {
         var input = inputs[i];
         var label = labels[i];
-        expect(input.id).to.equal(component.id + '-field_' + i);
-        expect(label.getAttribute('for')).to.equal(input.id);
+        expect(input.id).to.equal(component.id + "-field_" + i);
+        expect(label.getAttribute("for")).to.equal(input.id);
         expect(input.value).to.equal(fields[i].value);
         expect(label.innerHTML).to.equal(fields[i].label);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/label-for/component.js b/test/components-browser/fixtures/label-for/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/label-for/component.js
+++ b/test/components-browser/fixtures/label-for/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/label-for/test.js b/test/components-browser/fixtures/label-for/test.js
index 7b3ff1496..5d6219301 100644
--- a/test/components-browser/fixtures/label-for/test.js
+++ b/test/components-browser/fixtures/label-for/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var label = component.getEl('root').querySelector('label');
-    var forElId = label.getAttribute('for');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var label = component.getEl("root").querySelector("label");
+    var forElId = label.getAttribute("for");
     var inputEl = document.getElementById(forElId);
 
     expect(!!forElId).to.equal(true);
-    expect(inputEl.value).to.equal('test');
-    expect(label.getAttribute('for:scoped')).to.equal(null);
-};
\ No newline at end of file
+    expect(inputEl.value).to.equal("test");
+    expect(label.getAttribute("for:scoped")).to.equal(null);
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-constructor/test.js b/test/components-browser/fixtures/lifecyle-hooks-constructor/test.js
index 1abd1c74c..ec78a7196 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-constructor/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-constructor/test.js
@@ -1,22 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.onInputCalls).to.deep.equal([{
-        name: 'INITIAL'
-    }]);
-    expect(component.name).to.equal('Frank');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.onInputCalls).to.deep.equal([
+        {
+            name: "INITIAL"
+        }
+    ]);
+    expect(component.name).to.equal("Frank");
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(component.onInputCalls).to.deep.equal([{
-        name: 'INITIAL'
-    }, {
-        name: 'Frank'
-    }]);
+    expect(component.onInputCalls).to.deep.equal([
+        {
+            name: "INITIAL"
+        },
+        {
+            name: "Frank"
+        }
+    ]);
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('John');
-    expect(component.name).to.equal('John');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".name").innerHTML).to.equal("John");
+    expect(component.name).to.equal("John");
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-destroy/hooks.js b/test/components-browser/fixtures/lifecyle-hooks-destroy/hooks.js
index 13205719d..f03e1d356 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-destroy/hooks.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-destroy/hooks.js
@@ -1,15 +1,15 @@
 var hooks = [];
 
 module.exports = {
-    record: function (name) {
+    record: function(name) {
         hooks.push(name);
     },
 
-    reset: function () {
+    reset: function() {
         hooks.length = 0;
     },
 
-    getHookNames: function (component) {
+    getHookNames: function() {
         return hooks;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-destroy/test.js b/test/components-browser/fixtures/lifecyle-hooks-destroy/test.js
index a17e686c4..aa565a196 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-destroy/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-destroy/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
-var hooks = require('./hooks');
+var expect = require("chai").expect;
+var hooks = require("./hooks");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
 
     component.destroy();
 
-    expect(hooks.getHookNames()).deep.equal(['root:destroy', 'foo:destroy']);
-};
\ No newline at end of file
+    expect(hooks.getHookNames()).deep.equal(["root:destroy", "foo:destroy"]);
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/hooks.js b/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/hooks.js
index 750af7f71..56cfac781 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/hooks.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/hooks.js
@@ -1,8 +1,10 @@
 module.exports = {
-    record: function (component, name, args, thisObj) {
-        var hooksByComponent = this.hooksByComponent || (this.hooksByComponent = {});
+    record: function(component, name, args, thisObj) {
+        var hooksByComponent =
+            this.hooksByComponent || (this.hooksByComponent = {});
 
-        var hooksArray = hooksByComponent[component] || (hooksByComponent[component] = []);
+        var hooksArray =
+            hooksByComponent[component] || (hooksByComponent[component] = []);
 
         hooksArray.push({
             name: name,
@@ -11,15 +13,15 @@ module.exports = {
         });
     },
 
-    reset: function () {
+    reset: function() {
         this.hooksByComponent = {};
     },
 
-    getHookNames: function (component) {
+    getHookNames: function(component) {
         var hooksArray = this.hooksByComponent[component];
 
-        return hooksArray.map(function (hook) {
+        return hooksArray.map(function(hook) {
             return hook.name;
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/test.js b/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/test.js
index f86a5f5fc..5c71ac224 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-nested-no-id/test.js
@@ -1,19 +1,31 @@
-var expect = require('chai').expect;
-var hooks = require('./hooks');
+var expect = require("chai").expect;
+var hooks = require("./hooks");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
 
-    expect(component.el.querySelector('.foo .name').innerHTML).to.equal('Frank');
-    expect(hooks.getHookNames('foo')).to.deep.equal(['create', 'render', 'mount']);
-    expect(hooks.getHookNames('root')).to.deep.equal(['create', 'render', 'mount']);
+    expect(component.el.querySelector(".foo .name").innerHTML).to.equal(
+        "Frank"
+    );
+    expect(hooks.getHookNames("foo")).to.deep.equal([
+        "create",
+        "render",
+        "mount"
+    ]);
+    expect(hooks.getHookNames("root")).to.deep.equal([
+        "create",
+        "render",
+        "mount"
+    ]);
 
     hooks.reset();
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(component.el.querySelector('.foo .name').innerHTML).to.equal('John');
-    expect(hooks.getHookNames('foo')).to.deep.equal(['render', 'update']);
-    expect(hooks.getHookNames('root')).to.deep.equal(['render', 'update']);
+    expect(component.el.querySelector(".foo .name").innerHTML).to.equal("John");
+    expect(hooks.getHookNames("foo")).to.deep.equal(["render", "update"]);
+    expect(hooks.getHookNames("root")).to.deep.equal(["render", "update"]);
 };
diff --git a/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/hooks.js b/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/hooks.js
index 750af7f71..56cfac781 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/hooks.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/hooks.js
@@ -1,8 +1,10 @@
 module.exports = {
-    record: function (component, name, args, thisObj) {
-        var hooksByComponent = this.hooksByComponent || (this.hooksByComponent = {});
+    record: function(component, name, args, thisObj) {
+        var hooksByComponent =
+            this.hooksByComponent || (this.hooksByComponent = {});
 
-        var hooksArray = hooksByComponent[component] || (hooksByComponent[component] = []);
+        var hooksArray =
+            hooksByComponent[component] || (hooksByComponent[component] = []);
 
         hooksArray.push({
             name: name,
@@ -11,15 +13,15 @@ module.exports = {
         });
     },
 
-    reset: function () {
+    reset: function() {
         this.hooksByComponent = {};
     },
 
-    getHookNames: function (component) {
+    getHookNames: function(component) {
         var hooksArray = this.hooksByComponent[component];
 
-        return hooksArray.map(function (hook) {
+        return hooksArray.map(function(hook) {
             return hook.name;
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/test.js b/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/test.js
index f86a5f5fc..5c71ac224 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-nested-with-id/test.js
@@ -1,19 +1,31 @@
-var expect = require('chai').expect;
-var hooks = require('./hooks');
+var expect = require("chai").expect;
+var hooks = require("./hooks");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
 
-    expect(component.el.querySelector('.foo .name').innerHTML).to.equal('Frank');
-    expect(hooks.getHookNames('foo')).to.deep.equal(['create', 'render', 'mount']);
-    expect(hooks.getHookNames('root')).to.deep.equal(['create', 'render', 'mount']);
+    expect(component.el.querySelector(".foo .name").innerHTML).to.equal(
+        "Frank"
+    );
+    expect(hooks.getHookNames("foo")).to.deep.equal([
+        "create",
+        "render",
+        "mount"
+    ]);
+    expect(hooks.getHookNames("root")).to.deep.equal([
+        "create",
+        "render",
+        "mount"
+    ]);
 
     hooks.reset();
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(component.el.querySelector('.foo .name').innerHTML).to.equal('John');
-    expect(hooks.getHookNames('foo')).to.deep.equal(['render', 'update']);
-    expect(hooks.getHookNames('root')).to.deep.equal(['render', 'update']);
+    expect(component.el.querySelector(".foo .name").innerHTML).to.equal("John");
+    expect(hooks.getHookNames("foo")).to.deep.equal(["render", "update"]);
+    expect(hooks.getHookNames("root")).to.deep.equal(["render", "update"]);
 };
diff --git a/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/hooks.js b/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/hooks.js
index 13205719d..f03e1d356 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/hooks.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/hooks.js
@@ -1,15 +1,15 @@
 var hooks = [];
 
 module.exports = {
-    record: function (name) {
+    record: function(name) {
         hooks.push(name);
     },
 
-    reset: function () {
+    reset: function() {
         hooks.length = 0;
     },
 
-    getHookNames: function (component) {
+    getHookNames: function() {
         return hooks;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/test.js b/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/test.js
index 21fc26a49..5b97515e6 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-parent-child-ordering/test.js
@@ -1,14 +1,28 @@
-var expect = require('chai').expect;
-var hooks = require('./hooks');
+var expect = require("chai").expect;
+var hooks = require("./hooks");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
-    expect(hooks.getHookNames()).deep.equal(["root:create", "root:render", "foo:create", "foo:render", "foo:mount", "root:mount"]);
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
+    expect(hooks.getHookNames()).deep.equal([
+        "root:create",
+        "root:render",
+        "foo:create",
+        "foo:render",
+        "foo:mount",
+        "root:mount"
+    ]);
 
     hooks.reset();
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(hooks.getHookNames()).deep.equal(["root:render", "foo:render", "foo:update", "root:update"]);
+    expect(hooks.getHookNames()).deep.equal([
+        "root:render",
+        "foo:render",
+        "foo:update",
+        "root:update"
+    ]);
 };
diff --git a/test/components-browser/fixtures/lifecyle-hooks-render-arg/test.js b/test/components-browser/fixtures/lifecyle-hooks-render-arg/test.js
index dda3679a0..49f7836b3 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-render-arg/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-render-arg/test.js
@@ -1,16 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
 
     var out1 = component.renderArg;
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
     var out2 = component.renderArg;
 
     expect(out1).to.not.equal(out2);
-    expect(out1.element).to.be.a('function');
-    expect(out2.element).to.be.a('function');
-};
\ No newline at end of file
+    expect(out1.element).to.be.a("function");
+    expect(out2.element).to.be.a("function");
+};
diff --git a/test/components-browser/fixtures/lifecyle-hooks-root/test.js b/test/components-browser/fixtures/lifecyle-hooks-root/test.js
index 808e24604..d8dbd5d05 100644
--- a/test/components-browser/fixtures/lifecyle-hooks-root/test.js
+++ b/test/components-browser/fixtures/lifecyle-hooks-root/test.js
@@ -1,14 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
-    expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
-    expect(component.hookNames).to.deep.equal(['create', 'render', 'mount']);
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
+    expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
+    expect(component.hookNames).to.deep.equal(["create", "render", "mount"]);
     component.reset();
 
-    component.input = { name: 'John' };
+    component.input = { name: "John" };
     component.update();
 
-    expect(component.el.querySelector('.name').innerHTML).to.equal('John');
-    expect(component.hookNames).to.deep.equal(['render', 'update']);
+    expect(component.el.querySelector(".name").innerHTML).to.equal("John");
+    expect(component.hookNames).to.deep.equal(["render", "update"]);
 };
diff --git a/test/components-browser/fixtures/morphdom-node-added-nested-keyed/test.js b/test/components-browser/fixtures/morphdom-node-added-nested-keyed/test.js
index 23b331819..2442f2e62 100644
--- a/test/components-browser/fixtures/morphdom-node-added-nested-keyed/test.js
+++ b/test/components-browser/fixtures/morphdom-node-added-nested-keyed/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.getEl('nameInput').parentNode.nodeName).to.equal('DIV');
+    expect(component.getEl("nameInput").parentNode.nodeName).to.equal("DIV");
 
     component.state.renderCount++;
     component.update();
 
-    expect(component.getEl('nameInput').parentNode.nodeName).to.equal('P');
-    expect(component.getEl('nameInput').value).to.equal('2');
-};
\ No newline at end of file
+    expect(component.getEl("nameInput").parentNode.nodeName).to.equal("P");
+    expect(component.getEl("nameInput").value).to.equal("2");
+};
diff --git a/test/components-browser/fixtures/multiple-roots-rerender-root-child/test.js b/test/components-browser/fixtures/multiple-roots-rerender-root-child/test.js
index 25d856131..408a57578 100644
--- a/test/components-browser/fixtures/multiple-roots-rerender-root-child/test.js
+++ b/test/components-browser/fixtures/multiple-roots-rerender-root-child/test.js
@@ -1,16 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {});
 
-    var component = helpers.mount(require.resolve('./index.marko'), {});
-
-    var foo = component.getComponent('foo');
-    expect(foo.el.innerHTML).to.contain('count:0');
+    var foo = component.getComponent("foo");
+    expect(foo.el.innerHTML).to.contain("count:0");
 
     foo.state.count++;
     foo.update();
 
     expect(component.isDestroyed()).to.equal(false);
     expect(foo.isDestroyed()).to.equal(false);
-    expect(foo.el.innerHTML).to.contain('count:1');
-};
\ No newline at end of file
+    expect(foo.el.innerHTML).to.contain("count:1");
+};
diff --git a/test/components-browser/fixtures/onCreate/test.js b/test/components-browser/fixtures/onCreate/test.js
index f9ac3eaca..b943894c5 100644
--- a/test/components-browser/fixtures/onCreate/test.js
+++ b/test/components-browser/fixtures/onCreate/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank",
         $global: {
-            name: 'Frank',
-            serializedGlobals: { name:true }
+            name: "Frank",
+            serializedGlobals: { name: true }
         }
     });
 
@@ -13,6 +13,6 @@ module.exports = function (helpers) {
     var onCreateInput = onCreateArgs[0];
     var onCreateOut = onCreateArgs[1];
 
-    expect(onCreateInput.name).to.equal('Frank');
-    expect(onCreateOut.global.name).to.equal('Frank');
-};
\ No newline at end of file
+    expect(onCreateInput.name).to.equal("Frank");
+    expect(onCreateOut.global.name).to.equal("Frank");
+};
diff --git a/test/components-browser/fixtures/onInput-instance-data/component.js b/test/components-browser/fixtures/onInput-instance-data/component.js
index 1725ab514..7e1db0b1d 100644
--- a/test/components-browser/fixtures/onInput-instance-data/component.js
+++ b/test/components-browser/fixtures/onInput-instance-data/component.js
@@ -1,15 +1,15 @@
 module.exports = {
-    onInput: function () {
-        this.string = 'world';
+    onInput: function() {
+        this.string = "world";
         this.number = 12;
         this.boolean = true;
         this.complex = {
-            a: '<\"hello">',
-            b: 'test'
+            a: '<"hello">',
+            b: "test"
         };
     },
 
-    onMount: function () {
-        this.name = 'app-component-config';
+    onMount: function() {
+        this.name = "app-component-config";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/onInput-instance-data/test.js b/test/components-browser/fixtures/onInput-instance-data/test.js
index 215faf14c..3122ee1f3 100644
--- a/test/components-browser/fixtures/onInput-instance-data/test.js
+++ b/test/components-browser/fixtures/onInput-instance-data/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-require('./component');
+require("./component");
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.string).to.equal('world');
+    expect(component.string).to.equal("world");
     expect(component.number).to.equal(12);
     expect(component.boolean).to.equal(true);
     expect(component.complex).to.deep.equal({
-        a: '<\"hello">',
-        b: 'test'
+        a: '<"hello">',
+        b: "test"
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/onInput-return/test.js b/test/components-browser/fixtures/onInput-return/test.js
index 15cc043bf..f83dc2810 100644
--- a/test/components-browser/fixtures/onInput-return/test.js
+++ b/test/components-browser/fixtures/onInput-return/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    expect(component.input.name).to.equal('FRANK');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK');
+    expect(component.input.name).to.equal("FRANK");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("FRANK");
 
     component.input = {
-        name: 'John'
+        name: "John"
     };
 
     component.update();
 
-    expect(component.input.name).to.equal('JOHN');
-    expect(component.el.querySelector('.name').innerHTML).to.equal('JOHN');
-};
\ No newline at end of file
+    expect(component.input.name).to.equal("JOHN");
+    expect(component.el.querySelector(".name").innerHTML).to.equal("JOHN");
+};
diff --git a/test/components-browser/fixtures/onInput/component.js b/test/components-browser/fixtures/onInput/component.js
index dcd72d8b7..2eb75ac22 100644
--- a/test/components-browser/fixtures/onInput/component.js
+++ b/test/components-browser/fixtures/onInput/component.js
@@ -1,21 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
-    onInput: function (input) {
-        expect(input.name).to.eql('Frank');
+    onInput: function(input) {
+        expect(input.name).to.eql("Frank");
         this.state = { count: 0 };
         this.setUpTest();
     },
 
-    onMount: function (config) {
+    onMount: function() {
         expect(this.state.count).to.eql(0);
-        expect(this.foo).to.eql('bar');
+        expect(this.foo).to.eql("bar");
         expect(this.array).to.eql([1, 2, 3]);
         this.onMountCalled = true;
     },
 
-    setUpTest: function () {
-        this.foo = 'bar';
+    setUpTest: function() {
+        this.foo = "bar";
         this.array = [1, 2, 3];
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/onInput/test.js b/test/components-browser/fixtures/onInput/test.js
index 1dc3e2ab5..bb9de8c63 100644
--- a/test/components-browser/fixtures/onInput/test.js
+++ b/test/components-browser/fixtures/onInput/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
     });
 
     expect(component.onMountCalled).to.eql(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/preserve-dom-body-no-id/component.js b/test/components-browser/fixtures/preserve-dom-body-no-id/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/preserve-dom-body-no-id/component.js
+++ b/test/components-browser/fixtures/preserve-dom-body-no-id/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/preserve-dom-body-no-id/test.js b/test/components-browser/fixtures/preserve-dom-body-no-id/test.js
index 3151e67a1..977264edc 100644
--- a/test/components-browser/fixtures/preserve-dom-body-no-id/test.js
+++ b/test/components-browser/fixtures/preserve-dom-body-no-id/test.js
@@ -1,22 +1,34 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("0");
+    expect(
+        component.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     component.input = {
         counter: ++counter
     };
     component.update();
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('1');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("1");
+    expect(
+        component.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("1");
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures/preserve-dom-body/component.js b/test/components-browser/fixtures/preserve-dom-body/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/preserve-dom-body/component.js
+++ b/test/components-browser/fixtures/preserve-dom-body/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/preserve-dom-body/test.js b/test/components-browser/fixtures/preserve-dom-body/test.js
index 38b76324b..5e99f8746 100644
--- a/test/components-browser/fixtures/preserve-dom-body/test.js
+++ b/test/components-browser/fixtures/preserve-dom-body/test.js
@@ -1,15 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("0");
+    expect(component.getEl("preserve").getAttribute("data-counter")).to.equal(
+        "0"
+    );
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     component.input = {
         counter: ++counter
@@ -17,7 +23,13 @@ module.exports = function (helpers) {
 
     component.update();
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('1');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("1");
+    expect(component.getEl("preserve").getAttribute("data-counter")).to.equal(
+        "1"
+    );
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures/preserve-dom-no-id/component.js b/test/components-browser/fixtures/preserve-dom-no-id/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/preserve-dom-no-id/component.js
+++ b/test/components-browser/fixtures/preserve-dom-no-id/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/preserve-dom-no-id/test.js b/test/components-browser/fixtures/preserve-dom-no-id/test.js
index cb14489ff..10fb67fd1 100644
--- a/test/components-browser/fixtures/preserve-dom-no-id/test.js
+++ b/test/components-browser/fixtures/preserve-dom-no-id/test.js
@@ -1,22 +1,34 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("0");
+    expect(
+        component.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     component.input = {
         counter: ++counter
     };
     component.update();
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("1");
+    expect(
+        component.el.querySelector(".preserve").getAttribute("data-counter")
+    ).to.equal("0");
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures/preserve-dom/component.js b/test/components-browser/fixtures/preserve-dom/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/preserve-dom/component.js
+++ b/test/components-browser/fixtures/preserve-dom/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/preserve-dom/test.js b/test/components-browser/fixtures/preserve-dom/test.js
index 75bf77973..022f705b0 100644
--- a/test/components-browser/fixtures/preserve-dom/test.js
+++ b/test/components-browser/fixtures/preserve-dom/test.js
@@ -1,22 +1,34 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var counter = 0;
 
-    var component = helpers.mount(require.resolve('./index'), {
+    var component = helpers.mount(require.resolve("./index"), {
         counter: counter
     });
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0');
-    expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("0");
+    expect(component.getEl("preserve").getAttribute("data-counter")).to.equal(
+        "0"
+    );
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
 
     component.input = {
         counter: ++counter
     };
     component.update();
 
-    expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1');
-    expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0');
-    expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(
+        component.el.querySelector(".unpreserved-counter").innerHTML
+    ).to.equal("1");
+    expect(component.getEl("preserve").getAttribute("data-counter")).to.equal(
+        "0"
+    );
+    expect(component.el.querySelector(".preserved-counter").innerHTML).to.equal(
+        "0"
+    );
+};
diff --git a/test/components-browser/fixtures/preserve-nested/test.js b/test/components-browser/fixtures/preserve-nested/test.js
index 40e558354..db8dee696 100644
--- a/test/components-browser/fixtures/preserve-nested/test.js
+++ b/test/components-browser/fixtures/preserve-nested/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
 
     component.forceUpdate();
     component.update();
 
-    expect(component.el.querySelector('.render-count').innerHTML).to.equal('0');
-};
\ No newline at end of file
+    expect(component.el.querySelector(".render-count").innerHTML).to.equal("0");
+};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/component.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/component.js
index 1d16561dd..87af5a58d 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/component.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             age: input.age
         };
     },
-    setName: function (newName) {
-        this.setState('name', newName);
+    setName: function(newName) {
+        this.setState("name", newName);
     },
-    setAge: function (newAge) {
-        this.setState('age', newAge);
+    setAge: function(newAge) {
+        this.setState("age", newAge);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/components/multiple-root-els/component.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/components/multiple-root-els/component.js
index e8b187eda..99b41958a 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/components/multiple-root-els/component.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/components/multiple-root-els/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             age: input.age
         };
     },
-    getName: function () {
-        return this.getEl('name').innerHTML;
+    getName: function() {
+        return this.getEl("name").innerHTML;
     },
-    getAge: function () {
-        return this.getEl('age').innerHTML;
+    getAge: function() {
+        return this.getEl("age").innerHTML;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/test.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/test.js
index 758eb046f..40a3320b6 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/test.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els-with-refs/test.js
@@ -1,9 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank', age: 30 });
-    var fooComponent = component.getComponent('foo');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        age: 30
+    });
+    var fooComponent = component.getComponent("foo");
     expect(fooComponent != null).to.equal(true);
-    expect(fooComponent.getName()).to.equal('Frank');
-    expect(fooComponent.getAge()).to.equal('30');
-};
\ No newline at end of file
+    expect(fooComponent.getName()).to.equal("Frank");
+    expect(fooComponent.getAge()).to.equal("30");
+};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/component.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/component.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/components/multiple-root-els/component.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/components/multiple-root-els/component.js
index b97c0a82b..f5074bedc 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/components/multiple-root-els/component.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/components/multiple-root-els/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             age: input.age
         };
     },
-    getName: function () {
+    getName: function() {
         return this.els[0].innerHTML;
     },
-    getAge: function () {
+    getAge: function() {
         return this.els[1].innerHTML;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/test.js b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/test.js
index 758eb046f..40a3320b6 100644
--- a/test/components-browser/fixtures/ref-nested-component-multiple-root-els/test.js
+++ b/test/components-browser/fixtures/ref-nested-component-multiple-root-els/test.js
@@ -1,9 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank', age: 30 });
-    var fooComponent = component.getComponent('foo');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        age: 30
+    });
+    var fooComponent = component.getComponent("foo");
     expect(fooComponent != null).to.equal(true);
-    expect(fooComponent.getName()).to.equal('Frank');
-    expect(fooComponent.getAge()).to.equal('30');
-};
\ No newline at end of file
+    expect(fooComponent.getName()).to.equal("Frank");
+    expect(fooComponent.getAge()).to.equal("30");
+};
diff --git a/test/components-browser/fixtures/remove-last-multi-root-component/test.js b/test/components-browser/fixtures/remove-last-multi-root-component/test.js
index 0ce9aef27..957c25f32 100644
--- a/test/components-browser/fixtures/remove-last-multi-root-component/test.js
+++ b/test/components-browser/fixtures/remove-last-multi-root-component/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var el = component.getEl('root');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var el = component.getEl("root");
 
     expect(el.children.length).to.equal(2);
     component.toggle();
diff --git a/test/components-browser/fixtures/replace-async/test.js b/test/components-browser/fixtures/replace-async/test.js
index 8bc473f8e..fb75ac58e 100644
--- a/test/components-browser/fixtures/replace-async/test.js
+++ b/test/components-browser/fixtures/replace-async/test.js
@@ -1,16 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index.marko'));
-    var hello = require('./components/hello');
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index.marko"));
+    var hello = require("./components/hello");
 
-    var targetEl = component.getEl('target');
-    hello.render({ name: 'John' }).then(function (result) {
-        result.replace(targetEl);
-        expect(component.el.firstChild.className).to.equal('hello');
-        expect(component.el.firstChild.innerHTML).to.equal('Hello John');
-        done();
-    }).catch(function (err) {
-        done(err);
-    });
-};
\ No newline at end of file
+    var targetEl = component.getEl("target");
+    hello
+        .render({ name: "John" })
+        .then(function(result) {
+            result.replace(targetEl);
+            expect(component.el.firstChild.className).to.equal("hello");
+            expect(component.el.firstChild.innerHTML).to.equal("Hello John");
+            done();
+        })
+        .catch(function(err) {
+            done(err);
+        });
+};
diff --git a/test/components-browser/fixtures/replace/test.js b/test/components-browser/fixtures/replace/test.js
index b0d517c89..48146c9c6 100644
--- a/test/components-browser/fixtures/replace/test.js
+++ b/test/components-browser/fixtures/replace/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'));
-    var hello = require('./components/hello');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"));
+    var hello = require("./components/hello");
 
-    var targetEl = component.getEl('target');
-    hello.renderSync({ name: 'John' }).replace(targetEl);
+    var targetEl = component.getEl("target");
+    hello.renderSync({ name: "John" }).replace(targetEl);
 
-    expect(component.el.firstChild.className).to.equal('hello');
-    expect(component.el.firstChild.innerHTML).to.equal('Hello John');
-};
\ No newline at end of file
+    expect(component.el.firstChild.className).to.equal("hello");
+    expect(component.el.firstChild.innerHTML).to.equal("Hello John");
+};
diff --git a/test/components-browser/fixtures/replaceChildrenOf/test.js b/test/components-browser/fixtures/replaceChildrenOf/test.js
index e6216cc13..5f63bfa0a 100644
--- a/test/components-browser/fixtures/replaceChildrenOf/test.js
+++ b/test/components-browser/fixtures/replaceChildrenOf/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"));
 
-    var initialCounter = component.getComponent('initialCounter');
+    var initialCounter = component.getComponent("initialCounter");
 
-    var counter = require('./components/app-counter');
+    var counter = require("./components/app-counter");
 
-    var renderTarget = component.getEl('renderTarget');
-    expect(renderTarget.innerHTML).to.contain('Count: 0');
+    var renderTarget = component.getEl("renderTarget");
+    expect(renderTarget.innerHTML).to.contain("Count: 0");
 
     counter.renderSync({ value: 99 }).replaceChildrenOf(renderTarget);
 
-    expect(renderTarget.innerHTML).to.not.contain('Count: 0');
-    expect(renderTarget.innerHTML).to.contain('Count: 99');
+    expect(renderTarget.innerHTML).to.not.contain("Count: 0");
+    expect(renderTarget.innerHTML).to.contain("Count: 99");
     expect(initialCounter.isDestroyed()).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/rerender-destroy-incompatible/test.js b/test/components-browser/fixtures/rerender-destroy-incompatible/test.js
index a3b17a9e0..729504233 100644
--- a/test/components-browser/fixtures/rerender-destroy-incompatible/test.js
+++ b/test/components-browser/fixtures/rerender-destroy-incompatible/test.js
@@ -1,23 +1,22 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {});
 
-    var component = helpers.mount(require.resolve('./index.marko'), {});
+    expect(component.el.innerHTML).to.contain("foo");
+    expect(component.el.innerHTML).to.not.contain("bar");
 
-    expect(component.el.innerHTML).to.contain('foo');
-    expect(component.el.innerHTML).to.not.contain('bar');
-
-    var foo = component.getComponent('child');
+    var foo = component.getComponent("child");
     expect(foo.isDestroyed()).to.equal(false);
 
-    component.state.target = 'bar';
+    component.state.target = "bar";
     component.update();
 
     expect(foo.isDestroyed()).to.equal(true);
 
-    var bar = component.getComponent('child');
+    var bar = component.getComponent("child");
     expect(bar.isDestroyed()).to.equal(false);
 
-    expect(component.el.innerHTML).to.not.contain('foo');
-    expect(component.el.innerHTML).to.contain('bar');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.not.contain("foo");
+    expect(component.el.innerHTML).to.contain("bar");
+};
diff --git a/test/components-browser/fixtures/rerender-multiple-roots/test.js b/test/components-browser/fixtures/rerender-multiple-roots/test.js
index 483d9bce2..e92c50c0c 100644
--- a/test/components-browser/fixtures/rerender-multiple-roots/test.js
+++ b/test/components-browser/fixtures/rerender-multiple-roots/test.js
@@ -1,8 +1,8 @@
 // Test for issues #749 #690. Using multiple root nodes or style tag at the root would
 // cause an infinite loop on rerender. This code does not perform any assertions
 // but it will get caught in an infinite loop without the changes in PR #751
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     component.state.count = 1;
     component.update();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/rerender-same-root/component.js b/test/components-browser/fixtures/rerender-same-root/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/rerender-same-root/component.js
+++ b/test/components-browser/fixtures/rerender-same-root/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/rerender-same-root/test.js b/test/components-browser/fixtures/rerender-same-root/test.js
index c26bfd838..ef67c45b8 100644
--- a/test/components-browser/fixtures/rerender-same-root/test.js
+++ b/test/components-browser/fixtures/rerender-same-root/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        label: 'Foo'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        label: "Foo"
     });
 
-    var rootEl = component.getEl('root');
+    var rootEl = component.getEl("root");
 
     component.input = {
-        label: 'Bar'
+        label: "Bar"
     };
     component.update();
 
-    expect(component.getEl('root')).to.equal(rootEl);
-};
\ No newline at end of file
+    expect(component.getEl("root")).to.equal(rootEl);
+};
diff --git a/test/components-browser/fixtures/rerender-style-root/test.js b/test/components-browser/fixtures/rerender-style-root/test.js
index ca397252b..e92c50c0c 100644
--- a/test/components-browser/fixtures/rerender-style-root/test.js
+++ b/test/components-browser/fixtures/rerender-style-root/test.js
@@ -1,10 +1,8 @@
-var expect = require('chai').expect;
-
 // Test for issues #749 #690. Using multiple root nodes or style tag at the root would
 // cause an infinite loop on rerender. This code does not perform any assertions
 // but it will get caught in an infinite loop without the changes in PR #751
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     component.state.count = 1;
     component.update();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-custom-event/components/app-foo/component.js b/test/components-browser/fixtures/sanity-check-custom-event/components/app-foo/component.js
index b8e58d9da..70739910e 100644
--- a/test/components-browser/fixtures/sanity-check-custom-event/components/app-foo/component.js
+++ b/test/components-browser/fixtures/sanity-check-custom-event/components/app-foo/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    emitTestEvent: function () {
-        this.emit('test', 'abc', '123');
+    emitTestEvent: function() {
+        this.emit("test", "abc", "123");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-custom-event/test.js b/test/components-browser/fixtures/sanity-check-custom-event/test.js
index ea04a0e7f..916a53e50 100644
--- a/test/components-browser/fixtures/sanity-check-custom-event/test.js
+++ b/test/components-browser/fixtures/sanity-check-custom-event/test.js
@@ -1,11 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-
-    var component = helpers.mount(require.resolve('./index.marko'), { name: 'Frank' });
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
+    });
 
     expect(component.fooEvent.length).to.equal(3);
-    expect(component.fooEvent[0]).to.equal('abc');
-    expect(component.fooEvent[1]).to.equal('123');
+    expect(component.fooEvent[0]).to.equal("abc");
+    expect(component.fooEvent[1]).to.equal("123");
     expect(component.fooEvent[2]).to.equal(component.fooComponent);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-implicit-bind-component/component.js b/test/components-browser/fixtures/sanity-check-implicit-bind-component/component.js
index 1e6d32b0c..3becd17f4 100644
--- a/test/components-browser/fixtures/sanity-check-implicit-bind-component/component.js
+++ b/test/components-browser/fixtures/sanity-check-implicit-bind-component/component.js
@@ -1,10 +1,10 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name
         };
     },
-    setName: function (newName) {
-        this.setState('name', newName);
+    setName: function(newName) {
+        this.setState("name", newName);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-implicit-bind-component/test.js b/test/components-browser/fixtures/sanity-check-implicit-bind-component/test.js
index c42748df1..328e5b36d 100644
--- a/test/components-browser/fixtures/sanity-check-implicit-bind-component/test.js
+++ b/test/components-browser/fixtures/sanity-check-implicit-bind-component/test.js
@@ -1,14 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        age: 30
+    });
 
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank', age: 30 });
+    expect(component.el.innerHTML).to.equal("Frank");
 
-    expect(component.el.innerHTML).to.equal('Frank');
-
-    component.setName('Jane');
+    component.setName("Jane");
 
     component.update();
 
-    expect(component.el.innerHTML).to.equal('Jane');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.equal("Jane");
+};
diff --git a/test/components-browser/fixtures/sanity-check-inline/test.js b/test/components-browser/fixtures/sanity-check-inline/test.js
index 323a9347b..9220b2e58 100644
--- a/test/components-browser/fixtures/sanity-check-inline/test.js
+++ b/test/components-browser/fixtures/sanity-check-inline/test.js
@@ -1,13 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
+    });
 
-    var component = helpers.mount(require.resolve('./index.marko'), { name: 'Frank' });
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-
-    component.setName('Jane');
+    component.setName("Jane");
     component.update();
 
-    expect(component.el.innerHTML).to.contain('Hello Jane!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Jane!");
+};
diff --git a/test/components-browser/fixtures/sanity-check-key/test.js b/test/components-browser/fixtures/sanity-check-key/test.js
index 153bf820d..8152036e7 100644
--- a/test/components-browser/fixtures/sanity-check-key/test.js
+++ b/test/components-browser/fixtures/sanity-check-key/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var fooComponent = component.getComponent('foo');
-    expect(fooComponent.el.className).to.equal('foo');
+    var fooComponent = component.getComponent("foo");
+    expect(fooComponent.el.className).to.equal("foo");
 
-    var link = component.getEl('link');
-    expect(link.nodeName).to.equal('A');
-};
\ No newline at end of file
+    var link = component.getEl("link");
+    expect(link.nodeName).to.equal("A");
+};
diff --git a/test/components-browser/fixtures/sanity-check-multiple-root-els/component.js b/test/components-browser/fixtures/sanity-check-multiple-root-els/component.js
index bf0c8b0cc..e8ea84b90 100644
--- a/test/components-browser/fixtures/sanity-check-multiple-root-els/component.js
+++ b/test/components-browser/fixtures/sanity-check-multiple-root-els/component.js
@@ -1,18 +1,18 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             age: input.age,
             url: input.url
         };
     },
-    setName: function (newName) {
-        this.setState('name', newName);
+    setName: function(newName) {
+        this.setState("name", newName);
     },
-    setAge: function (newAge) {
-        this.setState('age', newAge);
+    setAge: function(newAge) {
+        this.setState("age", newAge);
     },
-    setUrl: function (newUrl) {
-        this.setState('url', newUrl);
+    setUrl: function(newUrl) {
+        this.setState("url", newUrl);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-multiple-root-els/test.js b/test/components-browser/fixtures/sanity-check-multiple-root-els/test.js
index d0cb0ae4d..7ae0c5930 100644
--- a/test/components-browser/fixtures/sanity-check-multiple-root-els/test.js
+++ b/test/components-browser/fixtures/sanity-check-multiple-root-els/test.js
@@ -1,20 +1,23 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        age: 30,
+        url: "http://ebay.com/"
+    });
 
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank', age: 30, url: 'http://ebay.com/' });
+    expect(component.getEl("name").innerHTML).to.equal("Frank");
+    expect(component.getEl("age").innerHTML).to.equal("30");
+    expect(component.els[2].href).to.equal("http://ebay.com/");
 
-    expect(component.getEl('name').innerHTML).to.equal('Frank');
-    expect(component.getEl('age').innerHTML).to.equal('30');
-    expect(component.els[2].href).to.equal('http://ebay.com/');
-
-    component.setName('Jane');
+    component.setName("Jane");
     component.setAge(50);
-    component.setUrl('http://ebay.com/search/');
+    component.setUrl("http://ebay.com/search/");
 
     component.update();
 
-    expect(component.getEl('name').innerHTML).to.equal('Jane');
-    expect(component.getEl('age').innerHTML).to.equal('50');
-    expect(component.els[2].href).to.equal('http://ebay.com/search/');
-};
\ No newline at end of file
+    expect(component.getEl("name").innerHTML).to.equal("Jane");
+    expect(component.getEl("age").innerHTML).to.equal("50");
+    expect(component.els[2].href).to.equal("http://ebay.com/search/");
+};
diff --git a/test/components-browser/fixtures/sanity-check-single-file-component/test.js b/test/components-browser/fixtures/sanity-check-single-file-component/test.js
index 323a9347b..9220b2e58 100644
--- a/test/components-browser/fixtures/sanity-check-single-file-component/test.js
+++ b/test/components-browser/fixtures/sanity-check-single-file-component/test.js
@@ -1,13 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
+    });
 
-    var component = helpers.mount(require.resolve('./index.marko'), { name: 'Frank' });
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-
-    component.setName('Jane');
+    component.setName("Jane");
     component.update();
 
-    expect(component.el.innerHTML).to.contain('Hello Jane!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Jane!");
+};
diff --git a/test/components-browser/fixtures/sanity-check-template-entry-split/component-browser.js b/test/components-browser/fixtures/sanity-check-template-entry-split/component-browser.js
index a3d8d57a3..f42f775b6 100644
--- a/test/components-browser/fixtures/sanity-check-template-entry-split/component-browser.js
+++ b/test/components-browser/fixtures/sanity-check-template-entry-split/component-browser.js
@@ -1,5 +1,5 @@
 module.exports = {
-    setName: function (newName) {
-        this.getEl('name').innerHTML = newName;
+    setName: function(newName) {
+        this.getEl("name").innerHTML = newName;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-template-entry-split/component.js b/test/components-browser/fixtures/sanity-check-template-entry-split/component.js
index 29a56b3c6..26cf341b2 100644
--- a/test/components-browser/fixtures/sanity-check-template-entry-split/component.js
+++ b/test/components-browser/fixtures/sanity-check-template-entry-split/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         return {
             name: input.name.toUpperCase()
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-template-entry-split/test.js b/test/components-browser/fixtures/sanity-check-template-entry-split/test.js
index ce84bbef1..9390734ac 100644
--- a/test/components-browser/fixtures/sanity-check-template-entry-split/test.js
+++ b/test/components-browser/fixtures/sanity-check-template-entry-split/test.js
@@ -1,12 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
+    });
 
-    var component = helpers.mount(require.resolve('./index.marko'), { name: 'Frank' });
+    expect(component.el.innerHTML).to.contain("FRANK");
 
-    expect(component.el.innerHTML).to.contain('FRANK');
+    component.setName("Jane");
 
-    component.setName('Jane');
-
-    expect(component.el.innerHTML).to.contain('Jane');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Jane");
+};
diff --git a/test/components-browser/fixtures/sanity-check-template-entry/component.js b/test/components-browser/fixtures/sanity-check-template-entry/component.js
index 055368bde..eb2c28f5c 100644
--- a/test/components-browser/fixtures/sanity-check-template-entry/component.js
+++ b/test/components-browser/fixtures/sanity-check-template-entry/component.js
@@ -1,10 +1,10 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name
         };
     },
-    setName: function (newName) {
+    setName: function(newName) {
         this.state.name = newName;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/sanity-check-template-entry/test.js b/test/components-browser/fixtures/sanity-check-template-entry/test.js
index 323a9347b..9220b2e58 100644
--- a/test/components-browser/fixtures/sanity-check-template-entry/test.js
+++ b/test/components-browser/fixtures/sanity-check-template-entry/test.js
@@ -1,13 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        name: "Frank"
+    });
 
-    var component = helpers.mount(require.resolve('./index.marko'), { name: 'Frank' });
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-
-    component.setName('Jane');
+    component.setName("Jane");
     component.update();
 
-    expect(component.el.innerHTML).to.contain('Hello Jane!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Jane!");
+};
diff --git a/test/components-browser/fixtures/split-browser-export-class/component-browser.js b/test/components-browser/fixtures/split-browser-export-class/component-browser.js
index 67dfa0891..14fcf0c89 100644
--- a/test/components-browser/fixtures/split-browser-export-class/component-browser.js
+++ b/test/components-browser/fixtures/split-browser-export-class/component-browser.js
@@ -1,9 +1,9 @@
 function Component() {}
 
 Component.prototype = {
-    handleClick: function (input) {
+    handleClick: function() {
         this.state.clicked = true;
     }
 };
 
-module.exports = Component;
\ No newline at end of file
+module.exports = Component;
diff --git a/test/components-browser/fixtures/split-browser-export-class/component.js b/test/components-browser/fixtures/split-browser-export-class/component.js
index b085822d4..131dee269 100644
--- a/test/components-browser/fixtures/split-browser-export-class/component.js
+++ b/test/components-browser/fixtures/split-browser-export-class/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onCreate: function (input) {
+    onCreate: function() {
         this.state = {
             clicked: false
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser-export-class/test.js b/test/components-browser/fixtures/split-browser-export-class/test.js
index d4674ccb7..28f6a1e6a 100644
--- a/test/components-browser/fixtures/split-browser-export-class/test.js
+++ b/test/components-browser/fixtures/split-browser-export-class/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
     expect(component.state.clicked).to.equal(false);
 
     helpers.triggerClick(component.el);
 
     expect(component.state.clicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser-inline/component-browser.js b/test/components-browser/fixtures/split-browser-inline/component-browser.js
index c0bd5ac8f..2f2c715c0 100644
--- a/test/components-browser/fixtures/split-browser-inline/component-browser.js
+++ b/test/components-browser/fixtures/split-browser-inline/component-browser.js
@@ -1,5 +1,5 @@
 module.exports = {
-    handleClick: function (input) {
+    handleClick: function() {
         this.state.clicked = true;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser-inline/test.js b/test/components-browser/fixtures/split-browser-inline/test.js
index d4674ccb7..28f6a1e6a 100644
--- a/test/components-browser/fixtures/split-browser-inline/test.js
+++ b/test/components-browser/fixtures/split-browser-inline/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
     expect(component.state.clicked).to.equal(false);
 
     helpers.triggerClick(component.el);
 
     expect(component.state.clicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser/component-browser.js b/test/components-browser/fixtures/split-browser/component-browser.js
index c0bd5ac8f..2f2c715c0 100644
--- a/test/components-browser/fixtures/split-browser/component-browser.js
+++ b/test/components-browser/fixtures/split-browser/component-browser.js
@@ -1,5 +1,5 @@
 module.exports = {
-    handleClick: function (input) {
+    handleClick: function() {
         this.state.clicked = true;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser/component.js b/test/components-browser/fixtures/split-browser/component.js
index b085822d4..131dee269 100644
--- a/test/components-browser/fixtures/split-browser/component.js
+++ b/test/components-browser/fixtures/split-browser/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onCreate: function (input) {
+    onCreate: function() {
         this.state = {
             clicked: false
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/split-browser/test.js b/test/components-browser/fixtures/split-browser/test.js
index d4674ccb7..28f6a1e6a 100644
--- a/test/components-browser/fixtures/split-browser/test.js
+++ b/test/components-browser/fixtures/split-browser/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
     expect(component.state.clicked).to.equal(false);
 
     helpers.triggerClick(component.el);
 
     expect(component.state.clicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/state-freeze/test.js b/test/components-browser/fixtures/state-freeze/test.js
index ced8a3d77..5056ef295 100644
--- a/test/components-browser/fixtures/state-freeze/test.js
+++ b/test/components-browser/fixtures/state-freeze/test.js
@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(function () {
-        component.state.foo = 'bar';
+    expect(function() {
+        component.state.foo = "bar";
     }).to.throw(TypeError);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/state-null-undefined/test.js b/test/components-browser/fixtures/state-null-undefined/test.js
index 050ba7dd0..4810a4b62 100644
--- a/test/components-browser/fixtures/state-null-undefined/test.js
+++ b/test/components-browser/fixtures/state-null-undefined/test.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(component.state.nameNull).to.equal(null);
     expect(component.state.nameUndefined).to.equal(undefined);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/state-var/component.js b/test/components-browser/fixtures/state-var/component.js
index 6778d24d1..097692904 100644
--- a/test/components-browser/fixtures/state-var/component.js
+++ b/test/components-browser/fixtures/state-var/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onInput: function () {
+    onInput: function() {
         this.state = {
-            name: 'Frank'
+            name: "Frank"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/state-var/test.js b/test/components-browser/fixtures/state-var/test.js
index ac3cde7fe..d844968cb 100644
--- a/test/components-browser/fixtures/state-var/test.js
+++ b/test/components-browser/fixtures/state-var/test.js
@@ -1,6 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.el.innerHTML).to.contain('Frank');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.el.innerHTML).to.contain("Frank");
+};
diff --git a/test/components-browser/fixtures/state-watch-null-async/test.js b/test/components-browser/fixtures/state-watch-null-async/test.js
index 884c22925..9547103b6 100644
--- a/test/components-browser/fixtures/state-watch-null-async/test.js
+++ b/test/components-browser/fixtures/state-watch-null-async/test.js
@@ -1,15 +1,15 @@
 // see https://github.com/marko-js/marko/issues/556
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.el.innerHTML).to.not.contain('FATAL ERROR');
+    expect(component.el.innerHTML).to.not.contain("FATAL ERROR");
 
-    helpers.triggerEvent(component.getEl(), 'submit');
+    helpers.triggerEvent(component.getEl(), "submit");
 
-    setTimeout(function () {
-        expect(component.el.innerHTML).to.contain('FATAL ERROR');
+    setTimeout(function() {
+        expect(component.el.innerHTML).to.contain("FATAL ERROR");
         done();
     }, 100);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/state-watch-null/test.js b/test/components-browser/fixtures/state-watch-null/test.js
index 2d10465fc..5dd46a7ca 100644
--- a/test/components-browser/fixtures/state-watch-null/test.js
+++ b/test/components-browser/fixtures/state-watch-null/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.el.innerHTML).to.contain('Hello !');
-    component.state.name = 'Frank';
+    expect(component.el.innerHTML).to.contain("Hello !");
+    component.state.name = "Frank";
     component.update();
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
+};
diff --git a/test/components-browser/fixtures/state-watch-undefined/test.js b/test/components-browser/fixtures/state-watch-undefined/test.js
index 2d10465fc..5dd46a7ca 100644
--- a/test/components-browser/fixtures/state-watch-undefined/test.js
+++ b/test/components-browser/fixtures/state-watch-undefined/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    expect(component.el.innerHTML).to.contain('Hello !');
-    component.state.name = 'Frank';
+    expect(component.el.innerHTML).to.contain("Hello !");
+    component.state.name = "Frank";
     component.update();
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
+};
diff --git a/test/components-browser/fixtures/style-attr/test.js b/test/components-browser/fixtures/style-attr/test.js
index 7f27b352f..f8e4550d7 100644
--- a/test/components-browser/fixtures/style-attr/test.js
+++ b/test/components-browser/fixtures/style-attr/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.el.style.left).to.equal('0px');
-    expect(component.el.style.marginRight).to.equal('10px');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.el.style.left).to.equal("0px");
+    expect(component.el.style.marginRight).to.equal("10px");
+};
diff --git a/test/components-browser/fixtures/textarea/test.js b/test/components-browser/fixtures/textarea/test.js
index 4ca49f816..42a9a8215 100644
--- a/test/components-browser/fixtures/textarea/test.js
+++ b/test/components-browser/fixtures/textarea/test.js
@@ -1,12 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index.marko'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index.marko"));
 
-    expect(component.el.querySelector('pre').innerHTML).to.equal('');
+    expect(component.el.querySelector("pre").innerHTML).to.equal("");
 
     component.submit();
     component.update();
 
-    expect(component.el.querySelector('pre').innerHTML).to.equal('Placeholder error');
-};
\ No newline at end of file
+    expect(component.el.querySelector("pre").innerHTML).to.equal(
+        "Placeholder error"
+    );
+};
diff --git a/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/component-browser.js b/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/component-browser.js
+++ b/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/test.js b/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/test.js
index ca98b7e47..50fd2cbcb 100644
--- a/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/test.js
+++ b/test/components-browser/fixtures/transcluded-component-from-non-rerender-root/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
-    var buttonComponent = component.getComponent('button');
-    var countComponent = component.getComponent('count');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
+    var buttonComponent = component.getComponent("button");
+    var countComponent = component.getComponent("count");
 
     expect(buttonComponent).to.exist;
     expect(countComponent).to.exist;
@@ -28,4 +28,4 @@ module.exports = function (helpers) {
     expect(buttonComponent.el.innerHTML).to.contain('1');
     expect(buttonComponent.el.className).to.equal('app-button app-button-small');
     */
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/transclusion-body-slot-attr/test.js b/test/components-browser/fixtures/transclusion-body-slot-attr/test.js
index 78b55c990..36723e261 100644
--- a/test/components-browser/fixtures/transclusion-body-slot-attr/test.js
+++ b/test/components-browser/fixtures/transclusion-body-slot-attr/test.js
@@ -1,23 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    var buttonComponent = component.getComponent('button');
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-small');
+    var buttonComponent = component.getComponent("button");
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-small"
+    );
 
     // Button component will not rerender since it's state did not change and that means that the
     // button content will remain as 'John' instead of 'Frank'
-    component.input = { name: 'John ' };
+    component.input = { name: "John " };
     component.update();
 
-    expect(buttonComponent.el.innerHTML).to.contain('John');
+    expect(buttonComponent.el.innerHTML).to.contain("John");
 
-    buttonComponent.setSize('large');
+    buttonComponent.setSize("large");
     buttonComponent.update();
-    expect(buttonComponent.el.innerHTML).to.contain('John');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-large');
-};
\ No newline at end of file
+    expect(buttonComponent.el.innerHTML).to.contain("John");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-large"
+    );
+};
diff --git a/test/components-browser/fixtures/transclusion-body-slot-default-to-renderBody/test.js b/test/components-browser/fixtures/transclusion-body-slot-default-to-renderBody/test.js
index 5fed7066f..f26d6af7c 100644
--- a/test/components-browser/fixtures/transclusion-body-slot-default-to-renderBody/test.js
+++ b/test/components-browser/fixtures/transclusion-body-slot-default-to-renderBody/test.js
@@ -1,21 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    var buttonComponent = component.getComponent('button');
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-small');
+    var buttonComponent = component.getComponent("button");
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-small"
+    );
 
-    component.input = { name: 'John ' };
+    component.input = { name: "John " };
     component.update();
 
-    expect(buttonComponent.el.innerHTML).to.contain('John');
+    expect(buttonComponent.el.innerHTML).to.contain("John");
 
-    buttonComponent.setSize('large');
+    buttonComponent.setSize("large");
     buttonComponent.update();
-    expect(buttonComponent.el.innerHTML).to.contain('John');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-large');
-};
\ No newline at end of file
+    expect(buttonComponent.el.innerHTML).to.contain("John");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-large"
+    );
+};
diff --git a/test/components-browser/fixtures/transclusion-body-slot-tag/test.js b/test/components-browser/fixtures/transclusion-body-slot-tag/test.js
index 5fed7066f..f26d6af7c 100644
--- a/test/components-browser/fixtures/transclusion-body-slot-tag/test.js
+++ b/test/components-browser/fixtures/transclusion-body-slot-tag/test.js
@@ -1,21 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    var buttonComponent = component.getComponent('button');
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-small');
+    var buttonComponent = component.getComponent("button");
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-small"
+    );
 
-    component.input = { name: 'John ' };
+    component.input = { name: "John " };
     component.update();
 
-    expect(buttonComponent.el.innerHTML).to.contain('John');
+    expect(buttonComponent.el.innerHTML).to.contain("John");
 
-    buttonComponent.setSize('large');
+    buttonComponent.setSize("large");
     buttonComponent.update();
-    expect(buttonComponent.el.innerHTML).to.contain('John');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-large');
-};
\ No newline at end of file
+    expect(buttonComponent.el.innerHTML).to.contain("John");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-large"
+    );
+};
diff --git a/test/components-browser/fixtures/transclusion-include-not-in-state/test.js b/test/components-browser/fixtures/transclusion-include-not-in-state/test.js
index 5fed7066f..f26d6af7c 100644
--- a/test/components-browser/fixtures/transclusion-include-not-in-state/test.js
+++ b/test/components-browser/fixtures/transclusion-include-not-in-state/test.js
@@ -1,21 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    var buttonComponent = component.getComponent('button');
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-small');
+    var buttonComponent = component.getComponent("button");
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-small"
+    );
 
-    component.input = { name: 'John ' };
+    component.input = { name: "John " };
     component.update();
 
-    expect(buttonComponent.el.innerHTML).to.contain('John');
+    expect(buttonComponent.el.innerHTML).to.contain("John");
 
-    buttonComponent.setSize('large');
+    buttonComponent.setSize("large");
     buttonComponent.update();
-    expect(buttonComponent.el.innerHTML).to.contain('John');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-large');
-};
\ No newline at end of file
+    expect(buttonComponent.el.innerHTML).to.contain("John");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-large"
+    );
+};
diff --git a/test/components-browser/fixtures/transclusion-include-split/component-browser.js b/test/components-browser/fixtures/transclusion-include-split/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/transclusion-include-split/component-browser.js
+++ b/test/components-browser/fixtures/transclusion-include-split/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/transclusion-include-split/test.js b/test/components-browser/fixtures/transclusion-include-split/test.js
index 5f6926d17..8f1b6c9d2 100644
--- a/test/components-browser/fixtures/transclusion-include-split/test.js
+++ b/test/components-browser/fixtures/transclusion-include-split/test.js
@@ -1,16 +1,20 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
     });
 
-    var buttonComponent = component.getComponent('button');
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-small');
+    var buttonComponent = component.getComponent("button");
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-small"
+    );
 
-    buttonComponent.setSize('large');
+    buttonComponent.setSize("large");
     buttonComponent.update();
-    expect(buttonComponent.el.innerHTML).to.contain('Frank');
-    expect(buttonComponent.el.className).to.equal('app-button app-button-large');
-};
\ No newline at end of file
+    expect(buttonComponent.el.innerHTML).to.contain("Frank");
+    expect(buttonComponent.el.className).to.equal(
+        "app-button app-button-large"
+    );
+};
diff --git a/test/components-browser/fixtures/update-next-tick/test.js b/test/components-browser/fixtures/update-next-tick/test.js
index 2a60b9885..8b334d2af 100644
--- a/test/components-browser/fixtures/update-next-tick/test.js
+++ b/test/components-browser/fixtures/update-next-tick/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index.marko'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index.marko"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    component.onUpdate = function () {
-        expect(component.el.className).to.contain('small');
+    component.onUpdate = function() {
+        expect(component.el.className).to.contain("small");
         done();
     };
 
-    expect(component.el.className).to.contain('large');
-    component.setSize('small');
-    expect(component.el.className).to.not.contain('small');
-};
\ No newline at end of file
+    expect(component.el.className).to.contain("large");
+    component.setSize("small");
+    expect(component.el.className).to.not.contain("small");
+};
diff --git a/test/components-browser/fixtures/update-queued/component.js b/test/components-browser/fixtures/update-queued/component.js
index 055368bde..eb2c28f5c 100644
--- a/test/components-browser/fixtures/update-queued/component.js
+++ b/test/components-browser/fixtures/update-queued/component.js
@@ -1,10 +1,10 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name
         };
     },
-    setName: function (newName) {
+    setName: function(newName) {
         this.state.name = newName;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/update-queued/test.js b/test/components-browser/fixtures/update-queued/test.js
index 51996f232..b940df667 100644
--- a/test/components-browser/fixtures/update-queued/test.js
+++ b/test/components-browser/fixtures/update-queued/test.js
@@ -1,17 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank"
+    });
 
-    var component = helpers.mount(require.resolve('./index'), { name: 'Frank' });
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
+    component.setName("Jane");
 
-    component.setName('Jane');
+    expect(component.el.innerHTML).to.contain("Hello Frank!");
 
-    expect(component.el.innerHTML).to.contain('Hello Frank!');
-
-    component.onUpdate = function () {
-        expect(component.el.innerHTML).to.contain('Hello Jane!');
+    component.onUpdate = function() {
+        expect(component.el.innerHTML).to.contain("Hello Jane!");
         done();
     };
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-ref/component.js b/test/components-browser/fixtures/widget-destroy-ref/component.js
index 3026adc39..fd43098a3 100644
--- a/test/components-browser/fixtures/widget-destroy-ref/component.js
+++ b/test/components-browser/fixtures/widget-destroy-ref/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-    destroyButton1: function (size) {
-        this.getComponent('button1').destroy();
+    destroyButton1: function() {
+        this.getComponent("button1").destroy();
     },
 
-    getButton1: function () {
-        return this.getComponent('button1');
+    getButton1: function() {
+        return this.getComponent("button1");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-ref/components/app-legacy-button/component.js b/test/components-browser/fixtures/widget-destroy-ref/components/app-legacy-button/component.js
index af8d2fd6d..b57830122 100644
--- a/test/components-browser/fixtures/widget-destroy-ref/components/app-legacy-button/component.js
+++ b/test/components-browser/fixtures/widget-destroy-ref/components/app-legacy-button/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-legacy-button';
+    onMount: function() {
+        this.name = "app-legacy-button";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-ref/marko.json b/test/components-browser/fixtures/widget-destroy-ref/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-destroy-ref/marko.json
+++ b/test/components-browser/fixtures/widget-destroy-ref/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-destroy-ref/test.js b/test/components-browser/fixtures/widget-destroy-ref/test.js
index eaf73ac61..8adc274d1 100644
--- a/test/components-browser/fixtures/widget-destroy-ref/test.js
+++ b/test/components-browser/fixtures/widget-destroy-ref/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var button1Component = component.getButton1();
     expect(button1Component != null).to.equal(true);
@@ -10,5 +10,5 @@ module.exports = function (helpers) {
 
     button1Component = component.getButton1();
     expect(button1Component === undefined).to.equal(true);
-    expect(component.getComponent('simple') == null).to.equal(true);
-};
\ No newline at end of file
+    expect(component.getComponent("simple") == null).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/component.js b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/component.js
index 3026adc39..fd43098a3 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/component.js
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-    destroyButton1: function (size) {
-        this.getComponent('button1').destroy();
+    destroyButton1: function() {
+        this.getComponent("button1").destroy();
     },
 
-    getButton1: function () {
-        return this.getComponent('button1');
+    getButton1: function() {
+        return this.getComponent("button1");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/components/app-custom-events/component.js b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/components/app-custom-events/component.js
index 2897662d7..19638f5e9 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/components/app-custom-events/component.js
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/components/app-custom-events/component.js
@@ -1,24 +1,9 @@
 module.exports = {
-    onInput: function (input) {
-        this.name = input.name;
-        this.channel = input.channel;
+    emitTestEvent1: function() {
+        this.emit("testEvent", "a", "b");
     },
 
-    onMount: function () {
-        var self = this;
-
-        if (this.channel) {
-            pubsub.channel(this.channel).on('emitTestEvent2', function () {
-                self.emitTestEvent2();
-            });
-        }
-    },
-
-    emitTestEvent1: function () {
-        this.emit('testEvent', 'a', 'b');
-    },
-
-    emitTestEvent2: function () {
-        this.emit('testEvent');
+    emitTestEvent2: function() {
+        this.emit("testEvent");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/marko.json b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/marko.json
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/test.js b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/test.js
index c861d23c8..7872a7b0a 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/test.js
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-custom-events/test.js
@@ -1,12 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var customEventsComponent = helpers.mount(require.resolve('./components/app-custom-events'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var customEventsComponent = helpers.mount(
+        require.resolve("./components/app-custom-events"),
+        {}
+    );
 
     var receivedEvents = [];
 
-    component.subscribeTo(customEventsComponent).on('testEvent', function () {
+    component.subscribeTo(customEventsComponent).on("testEvent", function() {
         receivedEvents.push(arguments);
     });
 
@@ -15,4 +18,4 @@ module.exports = function (helpers) {
     customEventsComponent.destroy();
     customEventsComponent.emitTestEvent2();
     expect(receivedEvents.length).to.equal(1);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/component.js b/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/component.js
index c0413036f..87b583acc 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/component.js
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/component.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
-    onMount: function () {
+    onMount: function() {
         this.logOutput = [];
 
-        this.name = 'app-dom-events';
+        this.name = "app-dom-events";
 
         var slef = this;
         function log(data) {
@@ -12,19 +12,19 @@ module.exports = {
         }
 
         this.log = log;
-        this.clearLog = function () {
+        this.clearLog = function() {
             this.logOutput = [];
         };
 
         this.logOutput = [];
     },
 
-    handleFooLinkDblClick: function () {
-        this.log('#fooLink:dblclick');
+    handleFooLinkDblClick: function() {
+        this.log("#fooLink:dblclick");
     },
 
-    handleFooLinkMouseOut: function (event, el) {
+    handleFooLinkMouseOut: function(event, el) {
         expect(event.target).to.equal(el);
-        this.log('#fooLink:mouseout');
+        this.log("#fooLink:mouseout");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/test.js b/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/test.js
index aec899f27..644f801ed 100644
--- a/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/test.js
+++ b/test/components-browser/fixtures/widget-destroy-unsubscribe-dom-events/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     // expect(Array.isArray(component.___domEventListenerHandles)).to.equal(true);
 
     var el = component.el;
-    var fooLink = component.getEl('fooLink');
+    var fooLink = component.getEl("fooLink");
 
     component.destroy();
 
@@ -18,6 +18,6 @@ module.exports = function (helpers) {
 
     // Make sure there are no DOM event listeners
     component.clearLog();
-    helpers.triggerMouseEvent(fooLink, 'mouseout');
+    helpers.triggerMouseEvent(fooLink, "mouseout");
     expect(component.logOutput).to.deep.equal([]);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/component.js b/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/component.js
index 74b954ec6..891078f67 100644
--- a/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/component.js
+++ b/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.counter = 0;
-	},
+    onMount: function() {
+        this.counter = 0;
+    },
 
-	handleMouseMove: function (event, el) {
-		el.innerHTML = '' + this.counter++;
-	}
-};
\ No newline at end of file
+    handleMouseMove: function(event, el) {
+        el.innerHTML = "" + this.counter++;
+    }
+};
diff --git a/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/test.js b/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/test.js
index a5150d2f3..be9c28807 100644
--- a/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/test.js
+++ b/test/components-browser/fixtures/widget-dom-event-listeners-repeated-non-bubbling/test.js
@@ -1,33 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-				var component = helpers.mount(require.resolve('./index'), {
-								name: 'Frank',
-								count: 30
-				});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
+        count: 30
+    });
 
-				var li1 = component.getEl('foo-0');
-				var li2 = component.getEl('foo-1');
-				var li3 = component.getEl('foo-2');
+    var li1 = component.getEl("foo-0");
+    var li2 = component.getEl("foo-1");
+    var li3 = component.getEl("foo-2");
 
-				expect(li1.innerHTML).to.equal('red');
-				expect(li2.innerHTML).to.equal('green');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("red");
+    expect(li2.innerHTML).to.equal("green");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li1);
+    helpers.triggerMouseMove(li1);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('green');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("green");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li2);
+    helpers.triggerMouseMove(li2);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('1');
-				expect(li3.innerHTML).to.equal('blue');
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("1");
+    expect(li3.innerHTML).to.equal("blue");
 
-				helpers.triggerMouseMove(li3);
+    helpers.triggerMouseMove(li3);
 
-				expect(li1.innerHTML).to.equal('0');
-				expect(li2.innerHTML).to.equal('1');
-};
\ No newline at end of file
+    expect(li1.innerHTML).to.equal("0");
+    expect(li2.innerHTML).to.equal("1");
+};
diff --git a/test/components-browser/fixtures/widget-dom-events-jquery/component.js b/test/components-browser/fixtures/widget-dom-events-jquery/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/widget-dom-events-jquery/component.js
+++ b/test/components-browser/fixtures/widget-dom-events-jquery/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/widget-dom-events-jquery/test.js b/test/components-browser/fixtures/widget-dom-events-jquery/test.js
index a76493d47..fb1e5e902 100644
--- a/test/components-browser/fixtures/widget-dom-events-jquery/test.js
+++ b/test/components-browser/fixtures/widget-dom-events-jquery/test.js
@@ -1,29 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    require('marko/jquery').patchComponent(window.$);
+module.exports = function(helpers, done) {
+    require("marko/jquery").patchComponent(window.$);
     try {
-        var component = helpers.mount(require.resolve('./index'), {});
+        var component = helpers.mount(require.resolve("./index"), {});
         var $el = component.$();
-        var $button = component.$('#button');
+        var $button = component.$("#button");
 
-        $el.click(function () {
-            helpers.log('$el:click');
+        $el.click(function() {
+            helpers.log("$el:click");
         });
 
-        $button.click(function (event) {
+        $button.click(function(event) {
             event.stopPropagation();
-            helpers.log('$button:click');
+            helpers.log("$button:click");
         });
 
         // Trigger a click event on the root element
         helpers.triggerClick(component.el);
-        helpers.triggerClick(component.getEl('button'));
+        helpers.triggerClick(component.getEl("button"));
 
-        expect(helpers.logOutput).to.deep.equal(['$el:click', '$button:click']);
+        expect(helpers.logOutput).to.deep.equal(["$el:click", "$button:click"]);
     } finally {
-        delete require('marko/components/Component').prototype.$;
+        delete require("marko/components/Component").prototype.$;
     }
 
     done();
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-dom-events/component.js b/test/components-browser/fixtures/widget-dom-events/component.js
index caed932da..13db250c4 100644
--- a/test/components-browser/fixtures/widget-dom-events/component.js
+++ b/test/components-browser/fixtures/widget-dom-events/component.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 var Component = {
-    onCreate: function () {
+    onCreate: function() {
         this.logOutput = [];
 
-        this.name = 'app-dom-events';
+        this.name = "app-dom-events";
 
         var _this = this;
         function log(data) {
@@ -12,45 +12,45 @@ var Component = {
         }
 
         this.log = log;
-        this.clearLog = function () {
+        this.clearLog = function() {
             this.logOutput = [];
         };
 
         this.logOutput = [];
     },
 
-    handleRootClick: function (event, el) {
-        expect(el.getAttribute('class')).to.equal('app-dom-events');
+    handleRootClick: function(event, el) {
+        expect(el.getAttribute("class")).to.equal("app-dom-events");
         expect(event.target.tagName.length > 0).to.equal(true);
-        this.log('el:click');
-        expect(this.name).to.equal('app-dom-events');
+        this.log("el:click");
+        expect(this.name).to.equal("app-dom-events");
     },
 
-    handleButtonClick: function () {
-        this.log('button:click');
+    handleButtonClick: function() {
+        this.log("button:click");
     },
 
-    handleRootMouseMove: function () {
-        this.log('el:mousemove');
+    handleRootMouseMove: function() {
+        this.log("el:mousemove");
     },
 
-    handleButtonSpanMouseMove: function () {
-        this.log('button>span:mousemove');
+    handleButtonSpanMouseMove: function() {
+        this.log("button>span:mousemove");
     },
 
-    handleFooLinkDblClick: function () {
-        this.log('#fooLink:dblclick');
+    handleFooLinkDblClick: function() {
+        this.log("#fooLink:dblclick");
     },
 
-    handleFooLinkMouseOut: function (event, el) {
+    handleFooLinkMouseOut: function(event, el) {
         expect(event.target).to.equal(el);
-        this.log('#fooLink:mouseout');
+        this.log("#fooLink:mouseout");
     },
 
-    handleHelloWorldMouseDown: function (event, el) {
-        expect(this.getEl('helloWorld')).to.equal(el);
-        this.log('#helloWorld:mousedown');
+    handleHelloWorldMouseDown: function(event, el) {
+        expect(this.getEl("helloWorld")).to.equal(el);
+        this.log("#helloWorld:mousedown");
     }
 };
 
-module.exports = Component;
\ No newline at end of file
+module.exports = Component;
diff --git a/test/components-browser/fixtures/widget-dom-events/components/app-legacy-button/component.js b/test/components-browser/fixtures/widget-dom-events/components/app-legacy-button/component.js
index 542a00771..8c3e6e18d 100644
--- a/test/components-browser/fixtures/widget-dom-events/components/app-legacy-button/component.js
+++ b/test/components-browser/fixtures/widget-dom-events/components/app-legacy-button/component.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
-    onMount: function () {
-        this.name = 'app-legacy-button';
+    onMount: function() {
+        this.name = "app-legacy-button";
 
-        var logOutput = this.logOutput = [];
+        var logOutput = (this.logOutput = []);
 
         function log(data) {
             logOutput.push(data);
@@ -14,10 +14,10 @@ module.exports = {
         this.clicked = false;
     },
 
-    handleRootMouseDown: function (event, el) {
+    handleRootMouseDown: function(event, el) {
         this.clicked = true;
-        expect(el.getAttribute('class')).to.equal('app-legacy-button');
-        this.log('click');
-        expect(this.name).to.equal('app-legacy-button');
+        expect(el.getAttribute("class")).to.equal("app-legacy-button");
+        this.log("click");
+        expect(this.name).to.equal("app-legacy-button");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-dom-events/marko.json b/test/components-browser/fixtures/widget-dom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-dom-events/marko.json
+++ b/test/components-browser/fixtures/widget-dom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-dom-events/test.js b/test/components-browser/fixtures/widget-dom-events/test.js
index 2f2d93618..e9568c9f3 100644
--- a/test/components-browser/fixtures/widget-dom-events/test.js
+++ b/test/components-browser/fixtures/widget-dom-events/test.js
@@ -1,41 +1,50 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     component.clearLog();
 
     // Trigger a click event on the root element
-    helpers.triggerMouseEvent(component.el, 'click');
-    expect(component.logOutput).to.deep.equal(['el:click']);
+    helpers.triggerMouseEvent(component.el, "click");
+    expect(component.logOutput).to.deep.equal(["el:click"]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(component.getEl('button'), 'click');
-    expect(component.logOutput).to.deep.equal(['button:click', 'el:click']);
+    helpers.triggerMouseEvent(component.getEl("button"), "click");
+    expect(component.logOutput).to.deep.equal(["button:click", "el:click"]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(component.getEl('button').firstElementChild, 'click');
-    expect(component.logOutput).to.deep.equal(['button:click', 'el:click']);
+    helpers.triggerMouseEvent(
+        component.getEl("button").firstElementChild,
+        "click"
+    );
+    expect(component.logOutput).to.deep.equal(["button:click", "el:click"]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(component.el, 'mousemove');
-    expect(component.logOutput).to.deep.equal(['el:mousemove']);
+    helpers.triggerMouseEvent(component.el, "mousemove");
+    expect(component.logOutput).to.deep.equal(["el:mousemove"]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(component.getEl('button').firstElementChild, 'mousemove');
-    expect(component.logOutput).to.deep.equal(['button>span:mousemove', 'el:mousemove']);
+    helpers.triggerMouseEvent(
+        component.getEl("button").firstElementChild,
+        "mousemove"
+    );
+    expect(component.logOutput).to.deep.equal([
+        "button>span:mousemove",
+        "el:mousemove"
+    ]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(document.getElementById('fooLink'), 'dblclick');
-    expect(component.logOutput).to.deep.equal(['#fooLink:dblclick']);
+    helpers.triggerMouseEvent(document.getElementById("fooLink"), "dblclick");
+    expect(component.logOutput).to.deep.equal(["#fooLink:dblclick"]);
 
     component.clearLog();
-    helpers.triggerMouseEvent(document.getElementById('fooLink'), 'mouseout');
-    expect(component.logOutput).to.deep.equal(['#fooLink:mouseout']);
+    helpers.triggerMouseEvent(document.getElementById("fooLink"), "mouseout");
+    expect(component.logOutput).to.deep.equal(["#fooLink:mouseout"]);
 
     component.clearLog();
-    expect(component.getComponent('appButton').clicked).to.equal(false);
-    helpers.triggerMouseEvent(component.getEl('helloWorld'), 'mousedown');
-    expect(component.logOutput).to.deep.equal(['#helloWorld:mousedown']);
-    expect(component.getComponent('appButton').clicked).to.equal(true);
+    expect(component.getComponent("appButton").clicked).to.equal(false);
+    helpers.triggerMouseEvent(component.getEl("helloWorld"), "mousedown");
+    expect(component.logOutput).to.deep.equal(["#helloWorld:mousedown"]);
+    expect(component.getComponent("appButton").clicked).to.equal(true);
 };
diff --git a/test/components-browser/fixtures/widget-dynamic-tag-name/component.js b/test/components-browser/fixtures/widget-dynamic-tag-name/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/widget-dynamic-tag-name/component.js
+++ b/test/components-browser/fixtures/widget-dynamic-tag-name/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/widget-dynamic-tag-name/test.js b/test/components-browser/fixtures/widget-dynamic-tag-name/test.js
index 5f992bf10..0b7b174db 100644
--- a/test/components-browser/fixtures/widget-dynamic-tag-name/test.js
+++ b/test/components-browser/fixtures/widget-dynamic-tag-name/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     function renderComponent(rootTagName) {
-        var component = helpers.mount(require.resolve('./index'), {
+        var component = helpers.mount(require.resolve("./index"), {
             rootTagName: rootTagName
         });
         return component;
     }
 
-    var componentDiv = renderComponent('div');
-    var componentSpan = renderComponent('span');
+    var componentDiv = renderComponent("div");
+    var componentSpan = renderComponent("span");
 
-    expect(componentDiv.el.nodeName).to.equal('DIV');
-    expect(componentSpan.el.nodeName).to.equal('SPAN');
-};
\ No newline at end of file
+    expect(componentDiv.el.nodeName).to.equal("DIV");
+    expect(componentSpan.el.nodeName).to.equal("SPAN");
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/component.js b/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/component.js
index 71bcdd961..ab5e0de3f 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/component.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.clicked = false;
-	},
+    onMount: function() {
+        this.clicked = false;
+    },
 
-	handleButtonClick: function () {
-		this.clicked = true;
-	}
-};
\ No newline at end of file
+    handleButtonClick: function() {
+        this.clicked = true;
+    }
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/test.js b/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/test.js
index 011ad1380..b53860d83 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/test.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-conditional-bubbles/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-   var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-   helpers.triggerClick(component.getEl('inputWithoutHandler'));
-   expect(component.clicked).to.equal(false);
+    helpers.triggerClick(component.getEl("inputWithoutHandler"));
+    expect(component.clicked).to.equal(false);
 
-   helpers.triggerClick(component.getEl('inputWithHandler'));
-   expect(component.clicked).to.equal(true);
+    helpers.triggerClick(component.getEl("inputWithHandler"));
+    expect(component.clicked).to.equal(true);
 
-   // Reset component.clicked
-   component.clicked = false;
+    // Reset component.clicked
+    component.clicked = false;
 
-   helpers.triggerClick(component.getEl('inputWithLiteralHandler'));
-   expect(component.clicked).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerClick(component.getEl("inputWithLiteralHandler"));
+    expect(component.clicked).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/component.js b/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/component.js
index f1d16eba5..dc28611bc 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/component.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-	onMount: function () {
-		this.mouseMoved = false;
-	},
+    onMount: function() {
+        this.mouseMoved = false;
+    },
 
-	handleMouseMove: function () {
-		this.mouseMoved = true;
-	}
-};
\ No newline at end of file
+    handleMouseMove: function() {
+        this.mouseMoved = true;
+    }
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/test.js b/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/test.js
index 580e58c27..85ef71a6e 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/test.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-conditional-direct/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-   var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-   helpers.triggerMouseMove(component.getEl('inputWithoutHandler'));
-   expect(component.mouseMoved).to.equal(false);
+    helpers.triggerMouseMove(component.getEl("inputWithoutHandler"));
+    expect(component.mouseMoved).to.equal(false);
 
-   helpers.triggerMouseMove(component.getEl('inputWithHandler'));
-   expect(component.mouseMoved).to.equal(true);
+    helpers.triggerMouseMove(component.getEl("inputWithHandler"));
+    expect(component.mouseMoved).to.equal(true);
 
-   // Reset component.mouseMoved
-   component.mouseMoved = false;
+    // Reset component.mouseMoved
+    component.mouseMoved = false;
 
-   helpers.triggerMouseMove(component.getEl('inputWithLiteralHandler'));
-   expect(component.mouseMoved).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerMouseMove(component.getEl("inputWithLiteralHandler"));
+    expect(component.mouseMoved).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-dynamic/component.js b/test/components-browser/fixtures/widget-event-handler-method-dynamic/component.js
index 8d0cd91d8..5a330a7de 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-dynamic/component.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-dynamic/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-	onMount: function () {
-		this.fooClicked = false;
-		this.barClicked = false;
-	},
+    onMount: function() {
+        this.fooClicked = false;
+        this.barClicked = false;
+    },
 
-	handleFooClick: function () {
-		this.fooClicked = true;
-	},
+    handleFooClick: function() {
+        this.fooClicked = true;
+    },
 
-	handleBarClick: function () {
-		this.barClicked = true;
-	}
-};
\ No newline at end of file
+    handleBarClick: function() {
+        this.barClicked = true;
+    }
+};
diff --git a/test/components-browser/fixtures/widget-event-handler-method-dynamic/test.js b/test/components-browser/fixtures/widget-event-handler-method-dynamic/test.js
index daaf732c3..73dab54a6 100644
--- a/test/components-browser/fixtures/widget-event-handler-method-dynamic/test.js
+++ b/test/components-browser/fixtures/widget-event-handler-method-dynamic/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-				var component = helpers.mount(require.resolve('./index'), {});
-				expect(component.fooClicked).to.equal(false);
-				expect(component.barClicked).to.equal(false);
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.fooClicked).to.equal(false);
+    expect(component.barClicked).to.equal(false);
 
-				helpers.triggerClick(component.getEl('foo'));
-				expect(component.fooClicked).to.equal(true);
-				expect(component.barClicked).to.equal(false);
+    helpers.triggerClick(component.getEl("foo"));
+    expect(component.fooClicked).to.equal(true);
+    expect(component.barClicked).to.equal(false);
 
-				helpers.triggerClick(component.getEl('bar'));
-				expect(component.fooClicked).to.equal(true);
-				expect(component.barClicked).to.equal(true);
-};
\ No newline at end of file
+    helpers.triggerClick(component.getEl("bar"));
+    expect(component.fooClicked).to.equal(true);
+    expect(component.barClicked).to.equal(true);
+};
diff --git a/test/components-browser/fixtures/widget-extends-EventEmitter/component.js b/test/components-browser/fixtures/widget-extends-EventEmitter/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-extends-EventEmitter/component.js
+++ b/test/components-browser/fixtures/widget-extends-EventEmitter/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-extends-EventEmitter/test.js b/test/components-browser/fixtures/widget-extends-EventEmitter/test.js
index 13d0b4dc2..425260bc9 100644
--- a/test/components-browser/fixtures/widget-extends-EventEmitter/test.js
+++ b/test/components-browser/fixtures/widget-extends-EventEmitter/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     var fooEvent = null;
     var fooEventThis = null;
 
@@ -10,20 +10,20 @@ module.exports = function (helpers) {
         fooEventThis = this;
     }
 
-    component.on('foo', fooListener);
+    component.on("foo", fooListener);
 
-    component.emit('foo', 'a', 'b');
+    component.emit("foo", "a", "b");
 
-    expect(fooEvent[0]).to.equal('a');
+    expect(fooEvent[0]).to.equal("a");
 
-    expect(fooEvent[1]).to.equal('b');
+    expect(fooEvent[1]).to.equal("b");
     expect(fooEventThis).to.equal(component);
 
     fooEvent = null;
 
-    component.removeListener('foo', fooListener);
+    component.removeListener("foo", fooListener);
 
-    component.emit('foo', 'a', 'b');
+    component.emit("foo", "a", "b");
 
     expect(fooEvent).to.equal(null);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-getEl/component.js b/test/components-browser/fixtures/widget-getEl/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-getEl/component.js
+++ b/test/components-browser/fixtures/widget-getEl/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getEl/test.js b/test/components-browser/fixtures/widget-getEl/test.js
index f71982d1d..6932f9bf2 100644
--- a/test/components-browser/fixtures/widget-getEl/test.js
+++ b/test/components-browser/fixtures/widget-getEl/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.getEl('foo').className).to.equal('foo');
-    expect(component.getEl('bar').className).to.equal('bar');
-    expect(component.getEl('foo-bar').className).to.equal('foo-bar');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.getEl("foo").className).to.equal("foo");
+    expect(component.getEl("bar").className).to.equal("bar");
+    expect(component.getEl("foo-bar").className).to.equal("foo-bar");
+};
diff --git a/test/components-browser/fixtures/widget-getEls/component.js b/test/components-browser/fixtures/widget-getEls/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-getEls/component.js
+++ b/test/components-browser/fixtures/widget-getEls/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getEls/test.js b/test/components-browser/fixtures/widget-getEls/test.js
index 80a25bc84..f65c6a44e 100644
--- a/test/components-browser/fixtures/widget-getEls/test.js
+++ b/test/components-browser/fixtures/widget-getEls/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    var els = component.getEls('colorListItems');
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    var els = component.getEls("colorListItems");
     expect(els.length).to.equal(3);
-    expect(els[0].innerHTML).to.equal('red');
-    expect(els[1].innerHTML).to.equal('green');
-    expect(els[2].innerHTML).to.equal('blue');
-};
\ No newline at end of file
+    expect(els[0].innerHTML).to.equal("red");
+    expect(els[1].innerHTML).to.equal("green");
+    expect(els[2].innerHTML).to.equal("blue");
+};
diff --git a/test/components-browser/fixtures/widget-getWidget/component.js b/test/components-browser/fixtures/widget-getWidget/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-getWidget/component.js
+++ b/test/components-browser/fixtures/widget-getWidget/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getWidget/components/app-foo/component.js b/test/components-browser/fixtures/widget-getWidget/components/app-foo/component.js
index 81822c4b3..d3d0b830b 100644
--- a/test/components-browser/fixtures/widget-getWidget/components/app-foo/component.js
+++ b/test/components-browser/fixtures/widget-getWidget/components/app-foo/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
+    onMount: function() {
+        this.name = "app-foo";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-getWidget/marko.json b/test/components-browser/fixtures/widget-getWidget/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-getWidget/marko.json
+++ b/test/components-browser/fixtures/widget-getWidget/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-getWidget/test.js b/test/components-browser/fixtures/widget-getWidget/test.js
index 4f51991e2..84e91bc2d 100644
--- a/test/components-browser/fixtures/widget-getWidget/test.js
+++ b/test/components-browser/fixtures/widget-getWidget/test.js
@@ -1,6 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.getComponent('bar').name).to.equal('app-foo');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.getComponent("bar").name).to.equal("app-foo");
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-multiple/component.js b/test/components-browser/fixtures/widget-getWidgets-multiple/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-getWidgets-multiple/component.js
+++ b/test/components-browser/fixtures/widget-getWidgets-multiple/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-multiple/components/app-foo/component.js b/test/components-browser/fixtures/widget-getWidgets-multiple/components/app-foo/component.js
index d6b04fe78..d4dca7001 100644
--- a/test/components-browser/fixtures/widget-getWidgets-multiple/components/app-foo/component.js
+++ b/test/components-browser/fixtures/widget-getWidgets-multiple/components/app-foo/component.js
@@ -1,8 +1,7 @@
 module.exports = {
-
-    onInput: function (input) {
+    onInput: function(input) {
         this.name = input.name;
     },
 
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-multiple/marko.json b/test/components-browser/fixtures/widget-getWidgets-multiple/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-getWidgets-multiple/marko.json
+++ b/test/components-browser/fixtures/widget-getWidgets-multiple/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-getWidgets-multiple/test.js b/test/components-browser/fixtures/widget-getWidgets-multiple/test.js
index 9f638789a..618292d0d 100644
--- a/test/components-browser/fixtures/widget-getWidgets-multiple/test.js
+++ b/test/components-browser/fixtures/widget-getWidgets-multiple/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.getComponents('bar').length).to.equal(2);
-    expect(component.getComponents('bar')[0].name).to.equal('a');
-    expect(component.getComponents('bar')[1].name).to.equal('b');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.getComponents("bar").length).to.equal(2);
+    expect(component.getComponents("bar")[0].name).to.equal("a");
+    expect(component.getComponents("bar")[1].name).to.equal("b");
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-single/component.js b/test/components-browser/fixtures/widget-getWidgets-single/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-getWidgets-single/component.js
+++ b/test/components-browser/fixtures/widget-getWidgets-single/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-single/components/app-foo/component.js b/test/components-browser/fixtures/widget-getWidgets-single/components/app-foo/component.js
index 81822c4b3..d3d0b830b 100644
--- a/test/components-browser/fixtures/widget-getWidgets-single/components/app-foo/component.js
+++ b/test/components-browser/fixtures/widget-getWidgets-single/components/app-foo/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-foo';
+    onMount: function() {
+        this.name = "app-foo";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-getWidgets-single/marko.json b/test/components-browser/fixtures/widget-getWidgets-single/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-getWidgets-single/marko.json
+++ b/test/components-browser/fixtures/widget-getWidgets-single/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-getWidgets-single/test.js b/test/components-browser/fixtures/widget-getWidgets-single/test.js
index 7b60f61e4..85b7dd458 100644
--- a/test/components-browser/fixtures/widget-getWidgets-single/test.js
+++ b/test/components-browser/fixtures/widget-getWidgets-single/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    expect(component.getComponents('bar').length).to.equal(1);
-    expect(component.getComponents('bar')[0].name).to.equal('app-foo');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    expect(component.getComponents("bar").length).to.equal(1);
+    expect(component.getComponents("bar")[0].name).to.equal("app-foo");
+};
diff --git a/test/components-browser/fixtures/widget-include-ref-dynamic/component.js b/test/components-browser/fixtures/widget-include-ref-dynamic/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/widget-include-ref-dynamic/component.js
+++ b/test/components-browser/fixtures/widget-include-ref-dynamic/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/widget-include-ref-dynamic/components/app-bar/component.js b/test/components-browser/fixtures/widget-include-ref-dynamic/components/app-bar/component.js
index 027e139e8..c5063b2ec 100644
--- a/test/components-browser/fixtures/widget-include-ref-dynamic/components/app-bar/component.js
+++ b/test/components-browser/fixtures/widget-include-ref-dynamic/components/app-bar/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-bar';
+    onMount: function() {
+        this.name = "app-bar";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-include-ref-dynamic/test.js b/test/components-browser/fixtures/widget-include-ref-dynamic/test.js
index e2323d493..1e9a737ec 100644
--- a/test/components-browser/fixtures/widget-include-ref-dynamic/test.js
+++ b/test/components-browser/fixtures/widget-include-ref-dynamic/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var barComponent = component.getComponent('myBar');
+    var barComponent = component.getComponent("myBar");
     expect(barComponent != null).to.equal(true);
-    expect(barComponent.name).to.equal('app-bar');
-};
\ No newline at end of file
+    expect(barComponent.name).to.equal("app-bar");
+};
diff --git a/test/components-browser/fixtures/widget-include-ref/component.js b/test/components-browser/fixtures/widget-include-ref/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/widget-include-ref/component.js
+++ b/test/components-browser/fixtures/widget-include-ref/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/widget-include-ref/components/app-bar/component.js b/test/components-browser/fixtures/widget-include-ref/components/app-bar/component.js
index 027e139e8..c5063b2ec 100644
--- a/test/components-browser/fixtures/widget-include-ref/components/app-bar/component.js
+++ b/test/components-browser/fixtures/widget-include-ref/components/app-bar/component.js
@@ -1,5 +1,5 @@
 module.exports = {
-    onMount: function () {
-        this.name = 'app-bar';
+    onMount: function() {
+        this.name = "app-bar";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-include-ref/test.js b/test/components-browser/fixtures/widget-include-ref/test.js
index e9ccf963e..64c649461 100644
--- a/test/components-browser/fixtures/widget-include-ref/test.js
+++ b/test/components-browser/fixtures/widget-include-ref/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var barComponent = component.getComponent('barTest');
+    var barComponent = component.getComponent("barTest");
     expect(barComponent != null).to.equal(true);
-    expect(barComponent.name).to.equal('app-bar');
-};
\ No newline at end of file
+    expect(barComponent.name).to.equal("app-bar");
+};
diff --git a/test/components-browser/fixtures/widget-jQuery-proxy/component.js b/test/components-browser/fixtures/widget-jQuery-proxy/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-jQuery-proxy/component.js
+++ b/test/components-browser/fixtures/widget-jQuery-proxy/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-jQuery-proxy/test.js b/test/components-browser/fixtures/widget-jQuery-proxy/test.js
index 3dc3129d1..6cd6fd3c1 100644
--- a/test/components-browser/fixtures/widget-jQuery-proxy/test.js
+++ b/test/components-browser/fixtures/widget-jQuery-proxy/test.js
@@ -1,25 +1,23 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    require('marko/jquery').patchComponent(window.$);
+module.exports = function(helpers, done) {
+    require("marko/jquery").patchComponent(window.$);
 
     try {
-        var component = helpers.mount(require.resolve('./index'), {});
+        var component = helpers.mount(require.resolve("./index"), {});
 
-        expect(component.$().attr('class')).to.equal('app-jquery-proxy');
-        expect(component.$('#foo').html()).to.equal('foo');
-        expect(component.$('#fooText').html()).to.equal('fooText');
-        expect(component.$('#foo-text').html()).to.equal('foo-text');
-        expect(component.$('#ul li').length).to.equal(3);
-        expect(component.$('button').html()).to.equal('Test Button');
-        expect(component.$('li', 'ul').length).to.equal(3);
+        expect(component.$().attr("class")).to.equal("app-jquery-proxy");
+        expect(component.$("#foo").html()).to.equal("foo");
+        expect(component.$("#fooText").html()).to.equal("fooText");
+        expect(component.$("#foo-text").html()).to.equal("foo-text");
+        expect(component.$("#ul li").length).to.equal(3);
+        expect(component.$("button").html()).to.equal("Test Button");
+        expect(component.$("li", "ul").length).to.equal(3);
 
-        var count = 0;
-        component.$(function () {
-            count++;
+        component.$(function() {
             done();
         });
     } finally {
-        delete require('marko/components/Component').prototype.$;
+        delete require("marko/components/Component").prototype.$;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-no-update-attrs-dynamic/component.js b/test/components-browser/fixtures/widget-no-update-attrs-dynamic/component.js
index 5b4a40748..b5f11944d 100644
--- a/test/components-browser/fixtures/widget-no-update-attrs-dynamic/component.js
+++ b/test/components-browser/fixtures/widget-no-update-attrs-dynamic/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             className: input.className
         };
     },
 
-    getTemplateData: function (state) {
+    getTemplateData: function(state) {
         return state;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-no-update-attrs-dynamic/test.js b/test/components-browser/fixtures/widget-no-update-attrs-dynamic/test.js
index a86628271..8cb60ffb0 100644
--- a/test/components-browser/fixtures/widget-no-update-attrs-dynamic/test.js
+++ b/test/components-browser/fixtures/widget-no-update-attrs-dynamic/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        className: 'foo'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        className: "foo"
     });
 
-    var span = component.el.querySelector('span');
-    expect(span.className).to.equal('foo');
+    var span = component.el.querySelector("span");
+    expect(span.className).to.equal("foo");
 
-    component.setState('className', 'bar');
+    component.setState("className", "bar");
     component.update();
 
-    expect(span.className).to.equal('foo');
-};
\ No newline at end of file
+    expect(span.className).to.equal("foo");
+};
diff --git a/test/components-browser/fixtures/widget-no-update-attrs/component.js b/test/components-browser/fixtures/widget-no-update-attrs/component.js
index 5b4a40748..b5f11944d 100644
--- a/test/components-browser/fixtures/widget-no-update-attrs/component.js
+++ b/test/components-browser/fixtures/widget-no-update-attrs/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             className: input.className
         };
     },
 
-    getTemplateData: function (state) {
+    getTemplateData: function(state) {
         return state;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-no-update-attrs/test.js b/test/components-browser/fixtures/widget-no-update-attrs/test.js
index c3c2a9692..af1558a18 100644
--- a/test/components-browser/fixtures/widget-no-update-attrs/test.js
+++ b/test/components-browser/fixtures/widget-no-update-attrs/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"));
 
-    var span = component.el.querySelector('span');
-    expect(span.className).to.equal('test');
+    var span = component.el.querySelector("span");
+    expect(span.className).to.equal("test");
 
     component.update();
 
-    expect(span.className).to.equal('test');
-};
\ No newline at end of file
+    expect(span.className).to.equal("test");
+};
diff --git a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/component.js b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/component.js
index 5d12c043f..5ac7e92cb 100644
--- a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/component.js
+++ b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             count: input.count,
-            className: input['class'],
-            foo: 'bar',
-            hello: 'world'
+            className: input["class"],
+            foo: "bar",
+            hello: "world"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/test.js b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/test.js
index 842b7637f..1a431baed 100644
--- a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/test.js
+++ b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered-setTimeout/test.js
@@ -1,32 +1,38 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers, done) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers, done) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         count: 30
     });
 
     var targetEl = component.el;
 
-    setTimeout(function () {
-        component.setState('count', 100);
+    setTimeout(function() {
+        component.setState("count", 100);
         component.update();
         expect(component.state.count).to.equal(100);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 100 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 100 new messages."
+        );
     }, 100);
 
-    setTimeout(function () {
-        component.setState('count', 200);
+    setTimeout(function() {
+        component.setState("count", 200);
         component.update();
         expect(component.state.count).to.equal(200);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 200 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 200 new messages."
+        );
         done();
     }, 200);
 
-    setTimeout(function () {
-        component.setState('count', 1);
+    setTimeout(function() {
+        component.setState("count", 1);
         component.update();
         expect(component.state.count).to.equal(1);
-        expect(targetEl.innerHTML).to.contain('Hello Frank! You have 1 new messages.');
+        expect(targetEl.innerHTML).to.contain(
+            "Hello Frank! You have 1 new messages."
+        );
     }, 1);
 };
diff --git a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/component.js b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/component.js
index 5d12c043f..5ac7e92cb 100644
--- a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/component.js
+++ b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             count: input.count,
-            className: input['class'],
-            foo: 'bar',
-            hello: 'world'
+            className: input["class"],
+            foo: "bar",
+            hello: "world"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/test.js b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/test.js
index 0333bcb18..f672c75ff 100644
--- a/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/test.js
+++ b/test/components-browser/fixtures/widget-preserve-all-state-when-rerendered/test.js
@@ -1,25 +1,29 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         count: 30
     });
 
     var targetEl = component.el;
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 30 new messages.');
-    expect(targetEl.innerHTML).to.contain('foo: bar');
-    expect(targetEl.innerHTML).to.contain('hello: world');
-    expect(component.state.name).to.equal('Frank');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 30 new messages."
+    );
+    expect(targetEl.innerHTML).to.contain("foo: bar");
+    expect(targetEl.innerHTML).to.contain("hello: world");
+    expect(component.state.name).to.equal("Frank");
     expect(component.state.count).to.equal(30);
 
-    component.setState('name', 'John');
+    component.setState("name", "John");
     component.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 30 new messages.');
-    expect(targetEl.innerHTML).to.contain('foo: bar');
-    expect(targetEl.innerHTML).to.contain('hello: world');
-    expect(component.state.name).to.equal('John');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 30 new messages."
+    );
+    expect(targetEl.innerHTML).to.contain("foo: bar");
+    expect(targetEl.innerHTML).to.contain("hello: world");
+    expect(component.state.name).to.equal("John");
     expect(component.state.count).to.equal(30);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/component.js b/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/component.js
index b63164aad..b5f11944d 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/component.js
@@ -1,12 +1,11 @@
-
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             className: input.className
         };
     },
 
-    getTemplateData: function (state) {
+    getTemplateData: function(state) {
         return state;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/test.js b/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/test.js
index a86628271..8cb60ffb0 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/test.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-attrs-dynamic/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        className: 'foo'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        className: "foo"
     });
 
-    var span = component.el.querySelector('span');
-    expect(span.className).to.equal('foo');
+    var span = component.el.querySelector("span");
+    expect(span.className).to.equal("foo");
 
-    component.setState('className', 'bar');
+    component.setState("className", "bar");
     component.update();
 
-    expect(span.className).to.equal('foo');
-};
\ No newline at end of file
+    expect(span.className).to.equal("foo");
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-attrs/component.js b/test/components-browser/fixtures/widget-preserve-dom-attrs/component.js
index 87346547b..1005e5893 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-attrs/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-attrs/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onInput: function () {
+    onInput: function() {
         this.state = {
-            name: 'Joe'
+            name: "Joe"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-attrs/test.js b/test/components-browser/fixtures/widget-preserve-dom-attrs/test.js
index d76ebec5d..ec2211d7b 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-attrs/test.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-attrs/test.js
@@ -1,26 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var helloEl = component.getEl('hello');
-    expect(helloEl.innerHTML).to.equal('Hello Joe!');
+    var helloEl = component.getEl("hello");
+    expect(helloEl.innerHTML).to.equal("Hello Joe!");
 
     component.el.style.border = "1px solid red";
     component.el.className = "foo";
 
-    component.el.querySelector('a').href = "http://www.foo.com/";
+    component.el.querySelector("a").href = "http://www.foo.com/";
 
-    component.getEl('hello2').removeAttribute('class');
+    component.getEl("hello2").removeAttribute("class");
 
-    component.setState('name', 'Frank');
+    component.setState("name", "Frank");
     component.update();
 
-    expect(helloEl.innerHTML).to.equal('Hello Frank!');
-    expect(component.getEl('hello2').getAttribute('class')).to.equal(null);
+    expect(helloEl.innerHTML).to.equal("Hello Frank!");
+    expect(component.getEl("hello2").getAttribute("class")).to.equal(null);
 
     // Make sure the preserved attributes did not change
     expect(component.el.style.border).to.equal("1px solid red");
     expect(component.el.className).to.equal("foo");
-    expect(component.el.querySelector('a').href).to.equal("http://www.foo.com/");
-};
\ No newline at end of file
+    expect(component.el.querySelector("a").href).to.equal(
+        "http://www.foo.com/"
+    );
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-if/component.js b/test/components-browser/fixtures/widget-preserve-dom-if/component.js
index bd3787d89..39599ff6a 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-if/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-if/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         return {
             preserveCondition: input.preserveCondition,
             renderId: input.renderId || 0
         };
     },
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-if/components/app-stateful-rerender/component.js b/test/components-browser/fixtures/widget-preserve-dom-if/components/app-stateful-rerender/component.js
index 5d12c043f..5ac7e92cb 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-if/components/app-stateful-rerender/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-if/components/app-stateful-rerender/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             name: input.name,
             count: input.count,
-            className: input['class'],
-            foo: 'bar',
-            hello: 'world'
+            className: input["class"],
+            foo: "bar",
+            hello: "world"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-if/marko.json b/test/components-browser/fixtures/widget-preserve-dom-if/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-if/marko.json
+++ b/test/components-browser/fixtures/widget-preserve-dom-if/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-preserve-dom-if/test.js b/test/components-browser/fixtures/widget-preserve-dom-if/test.js
index 61c8b19c9..5ff695e0c 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-if/test.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-if/test.js
@@ -1,21 +1,32 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     function getTimestamps() {
-
         return {
-            preserveId: component.getEl('preserve').getAttribute('data-renderId'),
-            preserveIdBody: component.getEl('preserve').innerHTML,
-            preserveBodyId: component.getEl('preserveBody').getAttribute('data-renderId'),
-            preserveBodyIdBody: component.getEl('preserveBody').innerHTML,
-            componentId: component.getComponent('component').state.name,
-            preserveClass: component.el.querySelector('.preserve').getAttribute('data-renderId'),
-            preserveClassBody: component.el.querySelector('.preserve').innerHTML,
-            preserveBodyClass: component.el.querySelector('.preserve-body').getAttribute('data-renderId'),
-            preserveBodyClassBody: component.el.querySelector('.preserve-body').innerHTML,
-            componentClass: require('marko/components').getComponentForEl(component.el.querySelector('.component-no-id')).state.name
+            preserveId: component
+                .getEl("preserve")
+                .getAttribute("data-renderId"),
+            preserveIdBody: component.getEl("preserve").innerHTML,
+            preserveBodyId: component
+                .getEl("preserveBody")
+                .getAttribute("data-renderId"),
+            preserveBodyIdBody: component.getEl("preserveBody").innerHTML,
+            componentId: component.getComponent("component").state.name,
+            preserveClass: component.el
+                .querySelector(".preserve")
+                .getAttribute("data-renderId"),
+            preserveClassBody: component.el.querySelector(".preserve")
+                .innerHTML,
+            preserveBodyClass: component.el
+                .querySelector(".preserve-body")
+                .getAttribute("data-renderId"),
+            preserveBodyClassBody: component.el.querySelector(".preserve-body")
+                .innerHTML,
+            componentClass: require("marko/components").getComponentForEl(
+                component.el.querySelector(".component-no-id")
+            ).state.name
         };
     }
 
@@ -28,16 +39,16 @@ module.exports = function (helpers) {
     component.update();
 
     var timestamps = getTimestamps();
-    expect(timestamps.preserveId).to.equal('0');
-    expect(timestamps.preserveIdBody).to.equal('0');
-    expect(timestamps.preserveBodyId).to.equal('10');
-    expect(timestamps.preserveBodyIdBody).to.equal('0');
-    expect(timestamps.componentId).to.equal('0');
-    expect(timestamps.preserveClass).to.equal('0');
-    expect(timestamps.preserveClassBody).to.equal('0');
-    expect(timestamps.preserveBodyClass).to.equal('10');
-    expect(timestamps.preserveBodyClassBody).to.equal('0');
-    expect(timestamps.componentClass).to.equal('0');
+    expect(timestamps.preserveId).to.equal("0");
+    expect(timestamps.preserveIdBody).to.equal("0");
+    expect(timestamps.preserveBodyId).to.equal("10");
+    expect(timestamps.preserveBodyIdBody).to.equal("0");
+    expect(timestamps.componentId).to.equal("0");
+    expect(timestamps.preserveClass).to.equal("0");
+    expect(timestamps.preserveClassBody).to.equal("0");
+    expect(timestamps.preserveBodyClass).to.equal("10");
+    expect(timestamps.preserveBodyClassBody).to.equal("0");
+    expect(timestamps.componentClass).to.equal("0");
 
     // expect(newEls1.el != null).to.equal(true);
     // expect(newEls1.el).to.equal(origEls.el);
@@ -66,14 +77,14 @@ module.exports = function (helpers) {
     component.update();
 
     timestamps = getTimestamps();
-    expect(timestamps.preserveId).to.equal('100');
-    expect(timestamps.preserveIdBody).to.equal('100');
-    expect(timestamps.preserveBodyId).to.equal('100');
-    expect(timestamps.preserveBodyIdBody).to.equal('100');
-    expect(timestamps.componentId).to.equal('100');
-    expect(timestamps.preserveClass).to.equal('100');
-    expect(timestamps.preserveClassBody).to.equal('100');
-    expect(timestamps.preserveBodyClass).to.equal('100');
-    expect(timestamps.preserveBodyClassBody).to.equal('100');
-    expect(timestamps.componentClass).to.equal('100');
-};
\ No newline at end of file
+    expect(timestamps.preserveId).to.equal("100");
+    expect(timestamps.preserveIdBody).to.equal("100");
+    expect(timestamps.preserveBodyId).to.equal("100");
+    expect(timestamps.preserveBodyIdBody).to.equal("100");
+    expect(timestamps.componentId).to.equal("100");
+    expect(timestamps.preserveClass).to.equal("100");
+    expect(timestamps.preserveClassBody).to.equal("100");
+    expect(timestamps.preserveBodyClass).to.equal("100");
+    expect(timestamps.preserveBodyClassBody).to.equal("100");
+    expect(timestamps.componentClass).to.equal("100");
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-repeated/component.js b/test/components-browser/fixtures/widget-preserve-dom-repeated/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-repeated/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-repeated/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-repeated/test.js b/test/components-browser/fixtures/widget-preserve-dom-repeated/test.js
index 77f5939c0..a1c25338e 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-repeated/test.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-repeated/test.js
@@ -1,5 +1,5 @@
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var oldChildren = helpers.nodeListToArray(component.el.childNodes);
 
@@ -8,4 +8,4 @@ module.exports = function (helpers) {
 
     var newChildren = component.el.childNodes;
     helpers.checkChildrenMatch(oldChildren, newChildren);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-root/component.js b/test/components-browser/fixtures/widget-preserve-dom-root/component.js
index 9108b6924..3dfebbc69 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-root/component.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-root/component.js
@@ -1,19 +1,19 @@
 module.exports = {
-	onInput: function (input) {
-		this.state = {
-			name: input.name,
-			messageCount: input.messageCount
-		};
-	},
+    onInput: function(input) {
+        this.state = {
+            name: input.name,
+            messageCount: input.messageCount
+        };
+    },
 
-	getTemplateData: function (state, input) {
-		return {
-			name: state.name,
-			messageCount: state.messageCount
-		};
-	},
+    getTemplateData: function(state) {
+        return {
+            name: state.name,
+            messageCount: state.messageCount
+        };
+    },
 
-	setName: function (newName) {
-		this.setState('name', newName);
-	}
-};
\ No newline at end of file
+    setName: function(newName) {
+        this.setState("name", newName);
+    }
+};
diff --git a/test/components-browser/fixtures/widget-preserve-dom-root/test.js b/test/components-browser/fixtures/widget-preserve-dom-root/test.js
index a5d24da19..af7407b22 100644
--- a/test/components-browser/fixtures/widget-preserve-dom-root/test.js
+++ b/test/components-browser/fixtures/widget-preserve-dom-root/test.js
@@ -1,18 +1,18 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 30
     });
 
-    expect(component.el.innerHTML).to.contain('Frank');
-    expect(component.el.innerHTML).to.contain('30');
+    expect(component.el.innerHTML).to.contain("Frank");
+    expect(component.el.innerHTML).to.contain("30");
 
-    component.setName('John');
+    component.setName("John");
     component.update();
 
-    expect(component.el.innerHTML).to.not.contain('John');
-    expect(component.el.innerHTML).to.contain('Frank');
-    expect(component.el.innerHTML).to.contain('30');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.not.contain("John");
+    expect(component.el.innerHTML).to.contain("Frank");
+    expect(component.el.innerHTML).to.contain("30");
+};
diff --git a/test/components-browser/fixtures/widget-ready/component.js b/test/components-browser/fixtures/widget-ready/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-ready/component.js
+++ b/test/components-browser/fixtures/widget-ready/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-ready/test.js b/test/components-browser/fixtures/widget-ready/test.js
index 6924ea7f7..49d101b01 100644
--- a/test/components-browser/fixtures/widget-ready/test.js
+++ b/test/components-browser/fixtures/widget-ready/test.js
@@ -1,13 +1,13 @@
-module.exports = function (helpers, done) {
-    require('marko/ready').patchComponent();
+module.exports = function(helpers, done) {
+    require("marko/ready").patchComponent();
 
     try {
-        var component = helpers.mount(require.resolve('./index'), {});
+        var component = helpers.mount(require.resolve("./index"), {});
 
-        component.ready(function () {
+        component.ready(function() {
             done();
         });
     } finally {
-        delete require('marko/components/Component').prototype.ready;
+        delete require("marko/components/Component").prototype.ready;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-render-to-iframe/component.js b/test/components-browser/fixtures/widget-render-to-iframe/component.js
index de13dd00c..179c1ea18 100644
--- a/test/components-browser/fixtures/widget-render-to-iframe/component.js
+++ b/test/components-browser/fixtures/widget-render-to-iframe/component.js
@@ -1,26 +1,33 @@
-var expect = require('chai').expect;
-var iframeContentComponent = require('./components/app-iframe-content');
+var expect = require("chai").expect;
+var iframeContentComponent = require("./components/app-iframe-content");
 
 module.exports = {
-    renderIntoIframe: function () {
-        var frameEl = this.getEl('frame');
-        return iframeContentComponent.renderSync({}).appendTo(frameEl.contentWindow.document.body).getComponent();
+    renderIntoIframe: function() {
+        var frameEl = this.getEl("frame");
+        return iframeContentComponent
+            .renderSync({})
+            .appendTo(frameEl.contentWindow.document.body)
+            .getComponent();
     },
 
-    test: function (helpers) {
+    test: function(helpers) {
         var contentComponent = this.renderIntoIframe();
-        expect(contentComponent.el.ownerDocument).to.equal(this.getEl('frame').contentWindow.document);
-        expect(contentComponent.getEl('input').value).to.equal('test');
-        expect(contentComponent.getComponent('more').getValue()).to.equal('hello');
+        expect(contentComponent.el.ownerDocument).to.equal(
+            this.getEl("frame").contentWindow.document
+        );
+        expect(contentComponent.getEl("input").value).to.equal("test");
+        expect(contentComponent.getComponent("more").getValue()).to.equal(
+            "hello"
+        );
 
         var buttonClick = false;
 
-        contentComponent.on('buttonClick', function () {
+        contentComponent.on("buttonClick", function() {
             buttonClick = true;
         });
 
-        helpers.triggerMouseEvent(contentComponent.getEl('button'), 'click');
+        helpers.triggerMouseEvent(contentComponent.getEl("button"), "click");
 
         expect(buttonClick).to.equal(true);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-render-to-iframe/marko.json b/test/components-browser/fixtures/widget-render-to-iframe/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-render-to-iframe/marko.json
+++ b/test/components-browser/fixtures/widget-render-to-iframe/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-render-to-iframe/test.js b/test/components-browser/fixtures/widget-render-to-iframe/test.js
index c1db89504..2a2618eef 100644
--- a/test/components-browser/fixtures/widget-render-to-iframe/test.js
+++ b/test/components-browser/fixtures/widget-render-to-iframe/test.js
@@ -1,4 +1,4 @@
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
     component.test(helpers);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-replaceState/component.js b/test/components-browser/fixtures/widget-replaceState/component.js
index ef2331ff7..8f1bfe628 100644
--- a/test/components-browser/fixtures/widget-replaceState/component.js
+++ b/test/components-browser/fixtures/widget-replaceState/component.js
@@ -1,9 +1,9 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            heading: input.heading || '',
-            message: input.message || '',
+            heading: input.heading || "",
+            message: input.message || "",
             colors: input.colors || []
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-replaceState/test.js b/test/components-browser/fixtures/widget-replaceState/test.js
index 242d5ade9..2399bf14f 100644
--- a/test/components-browser/fixtures/widget-replaceState/test.js
+++ b/test/components-browser/fixtures/widget-replaceState/test.js
@@ -1,20 +1,19 @@
-var expect = require('chai').expect;
-
-module.exports = function (helpers) {
+var expect = require("chai").expect;
 
+module.exports = function(helpers) {
     var states = {
         original: {
-            heading: 'original colors',
-            message: 'These are primary colors!',
-            colors: ['red', 'green', 'blue']
+            heading: "original colors",
+            message: "These are primary colors!",
+            colors: ["red", "green", "blue"]
         },
         new: {
-            heading: 'new colors',
-            colors: ['orange', 'yellow', 'purple']
+            heading: "new colors",
+            colors: ["orange", "yellow", "purple"]
         }
     };
 
-    var component = helpers.mount(require.resolve('./index'), states.original);
+    var component = helpers.mount(require.resolve("./index"), states.original);
 
     expect(component.state.heading).to.equal(states.original.heading);
     expect(component.state.message).to.equal(states.original.message);
@@ -26,4 +25,4 @@ module.exports = function (helpers) {
     expect(component.state.heading).to.equal(states.new.heading);
     expect(component.state.message).to.equal(states.new.message); // undefined
     expect(component.state.colors).to.deep.equal(states.new.colors);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-rerender-init-order/component.js b/test/components-browser/fixtures/widget-rerender-init-order/component.js
index 80846d158..3c464a24f 100644
--- a/test/components-browser/fixtures/widget-rerender-init-order/component.js
+++ b/test/components-browser/fixtures/widget-rerender-init-order/component.js
@@ -1,8 +1,8 @@
 module.exports = {
-    onMount: function () {
-        window.rerenderInitOrder.push('parent');
+    onMount: function() {
+        window.rerenderInitOrder.push("parent");
     },
-    onUpdate: function () {
-        window.rerenderInitOrder.push('parent');
+    onUpdate: function() {
+        window.rerenderInitOrder.push("parent");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-rerender-init-order/components/app-rerender-init-order-child/component.js b/test/components-browser/fixtures/widget-rerender-init-order/components/app-rerender-init-order-child/component.js
index 2fba49e57..9c69ec383 100644
--- a/test/components-browser/fixtures/widget-rerender-init-order/components/app-rerender-init-order-child/component.js
+++ b/test/components-browser/fixtures/widget-rerender-init-order/components/app-rerender-init-order-child/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onMount: function () {
+    onMount: function() {
         // console.log(module.id, 'init()', this.state);
         window.rerenderInitOrder = window.rerenderInitOrder || [];
         window.rerenderInitOrder.push(this.input.id);
     },
-    onUpdate: function () {
+    onUpdate: function() {
         // console.log(module.id, 'init()', this.state);
         window.rerenderInitOrder.push(this.input.id);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-rerender-init-order/marko.json b/test/components-browser/fixtures/widget-rerender-init-order/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-rerender-init-order/marko.json
+++ b/test/components-browser/fixtures/widget-rerender-init-order/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-rerender-init-order/test.js b/test/components-browser/fixtures/widget-rerender-init-order/test.js
index ddbb1484a..bf46eed38 100644
--- a/test/components-browser/fixtures/widget-rerender-init-order/test.js
+++ b/test/components-browser/fixtures/widget-rerender-init-order/test.js
@@ -1,19 +1,27 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
         version: 0
     });
 
-    expect(window.rerenderInitOrder).to.deep.equal(['childB', 'childA', 'parent']);
+    expect(window.rerenderInitOrder).to.deep.equal([
+        "childB",
+        "childA",
+        "parent"
+    ]);
 
     window.rerenderInitOrder = [];
 
-    component.input = { 'version': 1 };
+    component.input = { version: 1 };
     component.update();
 
     // console.log('ACTUAL ORDER: ', window.rerenderInitOrder);
-    expect(window.rerenderInitOrder).to.deep.equal(['childB', 'childA', 'parent']);
+    expect(window.rerenderInitOrder).to.deep.equal([
+        "childB",
+        "childA",
+        "parent"
+    ]);
 
     window.rerenderInitOrder = null;
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-rerender-reuse-stateful/marko.json b/test/components-browser/fixtures/widget-rerender-reuse-stateful/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-rerender-reuse-stateful/marko.json
+++ b/test/components-browser/fixtures/widget-rerender-reuse-stateful/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-rerender-reuse-stateful/test.js b/test/components-browser/fixtures/widget-rerender-reuse-stateful/test.js
index 2f226d363..e19b7f405 100644
--- a/test/components-browser/fixtures/widget-rerender-reuse-stateful/test.js
+++ b/test/components-browser/fixtures/widget-rerender-reuse-stateful/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     expect(window.helloInstances.length).to.equal(2);
 
-    var helloEls = component.getEl('root').querySelectorAll('.hello');
-    expect(helloEls[0].innerHTML).to.equal('Hello Jane');
-    expect(helloEls[1].innerHTML).to.equal('Hello John0');
+    var helloEls = component.getEl("root").querySelectorAll(".hello");
+    expect(helloEls[0].innerHTML).to.equal("Hello Jane");
+    expect(helloEls[1].innerHTML).to.equal("Hello John0");
 
-    var hello1 = component.getComponent('hello1');
-    var hello2 = component.getComponent('hello2');
+    var hello1 = component.getComponent("hello1");
+    var hello2 = component.getComponent("hello2");
 
     component.state.count++;
     component.update();
@@ -19,15 +19,15 @@ module.exports = function (helpers) {
     expect(window.helloInstances.length).to.equal(2);
 
     // Make sure the UI components received the new state as part of onInput()
-    expect(hello1.state.name).to.equal('Jane');
-    expect(hello2.state.name).to.equal('John1');
+    expect(hello1.state.name).to.equal("Jane");
+    expect(hello2.state.name).to.equal("John1");
 
     // Make sure the HTML elements were reused
-    var helloElsAfter = component.getEl('root').querySelectorAll('.hello');
+    var helloElsAfter = component.getEl("root").querySelectorAll(".hello");
     expect(helloElsAfter[0]).to.equal(helloEls[0]);
     expect(helloElsAfter[1]).to.equal(helloEls[1]);
 
     // Make sure the DOM was updated
-    expect(helloElsAfter[0].innerHTML).to.equal('Hello Jane');
-    expect(helloElsAfter[1].innerHTML).to.equal('Hello John1');
-};
\ No newline at end of file
+    expect(helloElsAfter[0].innerHTML).to.equal("Hello Jane");
+    expect(helloElsAfter[1].innerHTML).to.equal("Hello John1");
+};
diff --git a/test/components-browser/fixtures/widget-rerender-stateless-new-props/component.js b/test/components-browser/fixtures/widget-rerender-stateless-new-props/component.js
index a09954537..f053ebf79 100644
--- a/test/components-browser/fixtures/widget-rerender-stateless-new-props/component.js
+++ b/test/components-browser/fixtures/widget-rerender-stateless-new-props/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-browser/fixtures/widget-rerender-stateless-new-props/test.js b/test/components-browser/fixtures/widget-rerender-stateless-new-props/test.js
index fcaae7a5c..f7402f3fa 100644
--- a/test/components-browser/fixtures/widget-rerender-stateless-new-props/test.js
+++ b/test/components-browser/fixtures/widget-rerender-stateless-new-props/test.js
@@ -1,32 +1,40 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var targetEl = helpers.targetEl;
 
-    var component = helpers.mount(require.resolve('./index'), {
-        name: 'Frank',
+    var component = helpers.mount(require.resolve("./index"), {
+        name: "Frank",
         messageCount: 10
     });
 
-    expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Frank! You have 10 new messages."
+    );
 
     component.input = {
-        name: 'John',
+        name: "John",
         messageCount: 20
     };
 
     component.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 20 new messages."
+    );
 
     component.input = {
-        name: 'Jane',
+        name: "Jane",
         messageCount: 30
     };
 
-    expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.');
+    expect(targetEl.innerHTML).to.contain(
+        "Hello John! You have 20 new messages."
+    );
 
     component.update();
 
-    expect(targetEl.innerHTML).to.contain('Hello Jane! You have 30 new messages.');
-};
\ No newline at end of file
+    expect(targetEl.innerHTML).to.contain(
+        "Hello Jane! You have 30 new messages."
+    );
+};
diff --git a/test/components-browser/fixtures/widget-setStateDirty/component.js b/test/components-browser/fixtures/widget-setStateDirty/component.js
index c2b62f05c..0dd2c02a1 100644
--- a/test/components-browser/fixtures/widget-setStateDirty/component.js
+++ b/test/components-browser/fixtures/widget-setStateDirty/component.js
@@ -1,12 +1,12 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
             colors: input.colors || []
         };
     },
 
-    addColor: function (color) {
+    addColor: function(color) {
         this.state.colors.push(color);
-        this.setStateDirty('color');
+        this.setStateDirty("color");
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-setStateDirty/test.js b/test/components-browser/fixtures/widget-setStateDirty/test.js
index b41e18012..77b8cbf7a 100644
--- a/test/components-browser/fixtures/widget-setStateDirty/test.js
+++ b/test/components-browser/fixtures/widget-setStateDirty/test.js
@@ -1,19 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        colors: ['red', 'green', 'blue']
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        colors: ["red", "green", "blue"]
     });
 
-    expect(component.el.innerHTML).to.contain('red');
-    expect(component.el.innerHTML).to.contain('green');
-    expect(component.el.innerHTML).to.contain('blue');
+    expect(component.el.innerHTML).to.contain("red");
+    expect(component.el.innerHTML).to.contain("green");
+    expect(component.el.innerHTML).to.contain("blue");
 
-    component.addColor('orange');
+    component.addColor("orange");
     component.update();
 
-    expect(component.el.innerHTML).to.contain('red');
-    expect(component.el.innerHTML).to.contain('green');
-    expect(component.el.innerHTML).to.contain('blue');
-    expect(component.el.innerHTML).to.contain('orange');
-};
\ No newline at end of file
+    expect(component.el.innerHTML).to.contain("red");
+    expect(component.el.innerHTML).to.contain("green");
+    expect(component.el.innerHTML).to.contain("blue");
+    expect(component.el.innerHTML).to.contain("orange");
+};
diff --git a/test/components-browser/fixtures/widget-stateful-copy-state-on-write/component.js b/test/components-browser/fixtures/widget-stateful-copy-state-on-write/component.js
index 6d63b3d68..f730c0e4d 100644
--- a/test/components-browser/fixtures/widget-stateful-copy-state-on-write/component.js
+++ b/test/components-browser/fixtures/widget-stateful-copy-state-on-write/component.js
@@ -1,8 +1,8 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary'
+            size: input.size || "normal",
+            variant: input.variant || "primary"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-copy-state-on-write/test.js b/test/components-browser/fixtures/widget-stateful-copy-state-on-write/test.js
index 695a49044..047e0b708 100644
--- a/test/components-browser/fixtures/widget-stateful-copy-state-on-write/test.js
+++ b/test/components-browser/fixtures/widget-stateful-copy-state-on-write/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./"), {});
 
     var oldState = component.state.toJSON();
-    component.setState('foo', 'bar');
+    component.setState("foo", "bar");
 
     expect(component.state.toJSON()).to.not.equal(oldState);
 
     oldState = component.state.toJSON();
-    component.setState('hello', 'world');
+    component.setState("hello", "world");
     expect(component.state.toJSON()).to.equal(oldState);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/component.js b/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/component.js
index b6acb6bd4..9a37507ca 100644
--- a/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/component.js
+++ b/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/component.js
@@ -1,8 +1,8 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            label: input.label || '(no label)'
+            size: input.size || "normal",
+            label: input.label || "(no label)"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/test.js b/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/test.js
index 6507ea1e4..c240dbab3 100644
--- a/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/test.js
+++ b/test/components-browser/fixtures/widget-stateful-no-copy-state-on-write-if-same-value/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
     var oldState = component.state;
-    component.setState('size', 'large');
+    component.setState("size", "large");
     expect(component.state).to.equal(oldState);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/component.js b/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/component.js
index b6acb6bd4..9a37507ca 100644
--- a/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/component.js
+++ b/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/component.js
@@ -1,8 +1,8 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            label: input.label || '(no label)'
+            size: input.size || "normal",
+            label: input.label || "(no label)"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/test.js b/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/test.js
index 84b2893d5..9f5852865 100644
--- a/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/test.js
+++ b/test/components-browser/fixtures/widget-stateful-no-rerender-if-destroyed/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    expect(component.el.className).to.contain('large');
+    expect(component.el.className).to.contain("large");
 
     component.destroy();
 
     expect(component.update() === undefined).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-preserve-body/component.js b/test/components-browser/fixtures/widget-stateful-preserve-body/component.js
index 37c707ef5..43d59c53c 100644
--- a/test/components-browser/fixtures/widget-stateful-preserve-body/component.js
+++ b/test/components-browser/fixtures/widget-stateful-preserve-body/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function() {
         this.state = {
-            buttonLabel: 'Initial Button Label'
+            buttonLabel: "Initial Button Label"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/component.js b/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/component.js
index 8748f8645..3e5ffc6dc 100644
--- a/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/component.js
+++ b/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/component.js
@@ -1,16 +1,16 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            label: input.label || '(no label)'
+            size: input.size || "normal",
+            label: input.label || "(no label)"
         };
     },
 
-    setSize: function (newSize) {
+    setSize: function(newSize) {
         this.state.size = newSize;
     },
 
-    setLabel: function (newLabel) {
+    setLabel: function(newLabel) {
         this.state.label = newLabel;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures/widget-stateful-preserve-body/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-preserve-body/marko.json b/test/components-browser/fixtures/widget-stateful-preserve-body/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-stateful-preserve-body/marko.json
+++ b/test/components-browser/fixtures/widget-stateful-preserve-body/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-preserve-body/test.js b/test/components-browser/fixtures/widget-stateful-preserve-body/test.js
index 749c1de2e..a94e69e03 100644
--- a/test/components-browser/fixtures/widget-stateful-preserve-body/test.js
+++ b/test/components-browser/fixtures/widget-stateful-preserve-body/test.js
@@ -1,22 +1,22 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
-    var button1Component = component.getComponent('button1');
+    var button1Component = component.getComponent("button1");
 
-    expect(button1Component.el.innerHTML).to.contain('Initial Button Label');
-    expect(button1Component.el.className).to.contain('large');
+    expect(button1Component.el.innerHTML).to.contain("Initial Button Label");
+    expect(button1Component.el.className).to.contain("large");
 
-    button1Component.setSize('small');
+    button1Component.setSize("small");
     button1Component.update();
 
-    expect(button1Component.el.innerHTML).to.contain('Initial Button Label');
-    expect(button1Component.el.className).to.contain('small');
+    expect(button1Component.el.innerHTML).to.contain("Initial Button Label");
+    expect(button1Component.el.className).to.contain("small");
 
-    component.setState('buttonLabel', 'New Button Label');
+    component.setState("buttonLabel", "New Button Label");
     component.update();
 
-    expect(button1Component.el.innerHTML).to.contain('New Button Label');
-    expect(button1Component.el.className).to.contain('large'); // Size will revert back to large since it was not driven by state
-};
\ No newline at end of file
+    expect(button1Component.el.innerHTML).to.contain("New Button Label");
+    expect(button1Component.el.className).to.contain("large"); // Size will revert back to large since it was not driven by state
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/component.js b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/component.js
index fabef6498..199afe5dc 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/component.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/component.js
@@ -1,14 +1,13 @@
 module.exports = {
-
-    onInput: function (input) {
+    onInput: function() {
         this.state = {
-            buttonSize: 'small',
-            buttonLabel: 'Initial Label'
+            buttonSize: "small",
+            buttonLabel: "Initial Label"
         };
     },
 
-    update_buttonSize: function (newSize) {
-        var button1Component = this.getComponent('button1');
+    update_buttonSize: function(newSize) {
+        var button1Component = this.getComponent("button1");
         button1Component.setSize(newSize);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/component.js b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/component.js
index 8748f8645..3e5ffc6dc 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/component.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/component.js
@@ -1,16 +1,16 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            label: input.label || '(no label)'
+            size: input.size || "normal",
+            label: input.label || "(no label)"
         };
     },
 
-    setSize: function (newSize) {
+    setSize: function(newSize) {
         this.state.size = newSize;
     },
 
-    setLabel: function (newLabel) {
+    setLabel: function(newLabel) {
         this.state.label = newLabel;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/marko.json b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/marko.json
+++ b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/test.js b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/test.js
index 3826be7fe..9732d6771 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler-no-match/test.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler-no-match/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var oldEl = component.el;
 
-    var button1Component = component.getComponent('button1');
-    var button2Component = component.getComponent('button2');
+    var button1Component = component.getComponent("button1");
+    var button2Component = component.getComponent("button2");
 
-    expect(button1Component.el.className).to.contain('small');
-    expect(button2Component.el.className).to.contain('small');
+    expect(button1Component.el.className).to.contain("small");
+    expect(button2Component.el.className).to.contain("small");
 
-    expect(button1Component.el.innerHTML).to.contain('Initial Label');
-    expect(button2Component.el.innerHTML).to.contain('Initial Label');
+    expect(button1Component.el.innerHTML).to.contain("Initial Label");
+    expect(button2Component.el.innerHTML).to.contain("Initial Label");
 
-    component.setState('buttonSize', 'large');
-    component.setState('buttonLabel', 'New Label'); // buttonLabel does not have an update handler
+    component.setState("buttonSize", "large");
+    component.setState("buttonLabel", "New Label"); // buttonLabel does not have an update handler
     component.update();
 
-    expect(button1Component.el.className).to.contain('large');
-    expect(button2Component.el.className).to.contain('large');
+    expect(button1Component.el.className).to.contain("large");
+    expect(button2Component.el.className).to.contain("large");
 
-    expect(button1Component.el.innerHTML).to.contain('New Label');
-    expect(button2Component.el.innerHTML).to.contain('New Label');
+    expect(button1Component.el.innerHTML).to.contain("New Label");
+    expect(button2Component.el.innerHTML).to.contain("New Label");
 
     expect(component.el).to.equal(oldEl);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler/component.js b/test/components-browser/fixtures/widget-stateful-update-handler/component.js
index f564fd03c..43450fc48 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler/component.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler/component.js
@@ -1,14 +1,14 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function() {
         this.state = {
-            buttonSize: 'small',
-            buttonLabel: 'Initial Label'
+            buttonSize: "small",
+            buttonLabel: "Initial Label"
         };
     },
 
-    update_buttonSize: function (newSize) {
-        var button1Component = this.getComponent('button1');
+    update_buttonSize: function(newSize) {
+        var button1Component = this.getComponent("button1");
         button1Component.setSize(newSize);
         button1Component.update();
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/component.js b/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/component.js
index 8748f8645..3e5ffc6dc 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/component.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/component.js
@@ -1,16 +1,16 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            label: input.label || '(no label)'
+            size: input.size || "normal",
+            label: input.label || "(no label)"
         };
     },
 
-    setSize: function (newSize) {
+    setSize: function(newSize) {
         this.state.size = newSize;
     },
 
-    setLabel: function (newLabel) {
+    setLabel: function(newLabel) {
         this.state.label = newLabel;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json b/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
+++ b/test/components-browser/fixtures/widget-stateful-update-handler/components/app-stateful-button/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler/marko.json b/test/components-browser/fixtures/widget-stateful-update-handler/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler/marko.json
+++ b/test/components-browser/fixtures/widget-stateful-update-handler/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-stateful-update-handler/test.js b/test/components-browser/fixtures/widget-stateful-update-handler/test.js
index f14a8ee06..3225c97ef 100644
--- a/test/components-browser/fixtures/widget-stateful-update-handler/test.js
+++ b/test/components-browser/fixtures/widget-stateful-update-handler/test.js
@@ -1,30 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var oldEl = component.el;
 
-    var button1Component = component.getComponent('button1');
-    var button2Component = component.getComponent('button2');
+    var button1Component = component.getComponent("button1");
+    var button2Component = component.getComponent("button2");
 
-    expect(button1Component.el.className).to.contain('small');
-    expect(button2Component.el.className).to.contain('small');
+    expect(button1Component.el.className).to.contain("small");
+    expect(button2Component.el.className).to.contain("small");
 
-    expect(button1Component.el.innerHTML).to.contain('Initial Label');
-    expect(button2Component.el.innerHTML).to.contain('Initial Label');
+    expect(button1Component.el.innerHTML).to.contain("Initial Label");
+    expect(button2Component.el.innerHTML).to.contain("Initial Label");
 
-    component.setState('buttonSize', 'large');
+    component.setState("buttonSize", "large");
     component.update();
 
-    expect(button1Component).to.equal(component.getComponent('button1'));
-    expect(button2Component).to.equal(component.getComponent('button2'));
+    expect(button1Component).to.equal(component.getComponent("button1"));
+    expect(button2Component).to.equal(component.getComponent("button2"));
 
-    expect(button1Component.el.className).to.contain('large');
-    expect(button2Component.el.className).to.contain('small');
+    expect(button1Component.el.className).to.contain("large");
+    expect(button2Component.el.className).to.contain("small");
 
-    expect(button1Component.el.innerHTML).to.contain('Initial Label');
-    expect(button2Component.el.innerHTML).to.contain('Initial Label');
+    expect(button1Component.el.innerHTML).to.contain("Initial Label");
+    expect(button2Component.el.innerHTML).to.contain("Initial Label");
 
     expect(component.el).to.equal(oldEl);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update/component.js b/test/components-browser/fixtures/widget-stateful-update/component.js
index b8b5b9afe..87889cccf 100644
--- a/test/components-browser/fixtures/widget-stateful-update/component.js
+++ b/test/components-browser/fixtures/widget-stateful-update/component.js
@@ -1,30 +1,30 @@
 module.exports = {
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            size: input.size || 'normal',
-            variant: input.variant || 'primary'
+            size: input.size || "normal",
+            variant: input.variant || "primary"
         };
     },
 
-    handleClick: function (event) {
+    handleClick: function(event) {
         // Every Component instance is also an EventEmitter instance.
         // We will emit a custom "click" event when a DOM click event
         // is triggered
-        this.emit('click', {
+        this.emit("click", {
             event: event // Pass along the DOM event in case it is helpful to others
         });
     },
 
     // Add any other methods here
-    setVariant: function (variant) {
-        this.setState('variant', variant);
+    setVariant: function(variant) {
+        this.setState("variant", variant);
     },
 
-    setSize: function (size) {
-        this.setState('size', size);
+    setSize: function(size) {
+        this.setState("size", size);
     },
 
-    getSize: function () {
+    getSize: function() {
         return this.state.size;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-stateful-update/test.js b/test/components-browser/fixtures/widget-stateful-update/test.js
index ea8c2d263..039efce82 100644
--- a/test/components-browser/fixtures/widget-stateful-update/test.js
+++ b/test/components-browser/fixtures/widget-stateful-update/test.js
@@ -1,15 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {
-        size: 'large',
-        label: 'Initial Label'
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {
+        size: "large",
+        label: "Initial Label"
     });
 
-    expect(component.el.className).to.contain('large');
+    expect(component.el.className).to.contain("large");
 
-    component.setSize('small');
+    component.setSize("small");
     component.update();
 
-    expect(component.el.className).to.contain('small');
-};
\ No newline at end of file
+    expect(component.el.className).to.contain("small");
+};
diff --git a/test/components-browser/fixtures/widget-stopPropagation/component.js b/test/components-browser/fixtures/widget-stopPropagation/component.js
index 11fd7faf7..61b95c93b 100644
--- a/test/components-browser/fixtures/widget-stopPropagation/component.js
+++ b/test/components-browser/fixtures/widget-stopPropagation/component.js
@@ -1,15 +1,15 @@
 module.exports = {
-	onMount: function () {
-		this.divClicked = false;
-		this.buttonClicked = false;
-	},
+    onMount: function() {
+        this.divClicked = false;
+        this.buttonClicked = false;
+    },
 
-	handleDivClick: function (event) {
-		this.divClicked = true;
-	},
+    handleDivClick: function() {
+        this.divClicked = true;
+    },
 
-	handleButtonClick: function (event) {
-		this.buttonClicked = true;
-		event.stopPropagation();
-	}
-};
\ No newline at end of file
+    handleButtonClick: function(event) {
+        this.buttonClicked = true;
+        event.stopPropagation();
+    }
+};
diff --git a/test/components-browser/fixtures/widget-stopPropagation/test.js b/test/components-browser/fixtures/widget-stopPropagation/test.js
index efa198999..c5cf7a294 100644
--- a/test/components-browser/fixtures/widget-stopPropagation/test.js
+++ b/test/components-browser/fixtures/widget-stopPropagation/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
-    helpers.triggerClick(component.getEl('button'));
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
+    helpers.triggerClick(component.getEl("button"));
     expect(component.divClicked).to.equal(false);
     expect(component.buttonClicked).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/component.js b/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/component.js
+++ b/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/test.js b/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/test.js
index 1637a8c24..7a51451ca 100644
--- a/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/test.js
+++ b/test/components-browser/fixtures/widget-subscribeTo-destroy-subscriber/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component1 = helpers.mount(require.resolve('./index'), {});
-    var component2 = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component1 = helpers.mount(require.resolve("./index"), {});
+    var component2 = helpers.mount(require.resolve("./index"), {});
 
     var fooEvent = null;
     var fooEventThis = null;
 
-    component1.subscribeTo(component2).on('foo', function fooListener() {
+    component1.subscribeTo(component2).on("foo", function fooListener() {
         fooEvent = arguments;
         fooEventThis = this;
     });
 
-    component2.emit('foo', 'a', 'b');
+    component2.emit("foo", "a", "b");
 
-    expect(fooEvent[0]).to.equal('a');
-    expect(fooEvent[1]).to.equal('b');
+    expect(fooEvent[0]).to.equal("a");
+    expect(fooEvent[1]).to.equal("b");
     expect(fooEventThis).to.equal(component2);
 
     fooEvent = null;
 
     component1.destroy();
 
-    component2.emit('foo', 'a', 'b');
+    component2.emit("foo", "a", "b");
 
     expect(fooEvent).to.equal(null);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-subscribeTo-destroy-target/component.js b/test/components-browser/fixtures/widget-subscribeTo-destroy-target/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-subscribeTo-destroy-target/component.js
+++ b/test/components-browser/fixtures/widget-subscribeTo-destroy-target/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-subscribeTo-destroy-target/test.js b/test/components-browser/fixtures/widget-subscribeTo-destroy-target/test.js
index 26cbdb01b..94e91d3b0 100644
--- a/test/components-browser/fixtures/widget-subscribeTo-destroy-target/test.js
+++ b/test/components-browser/fixtures/widget-subscribeTo-destroy-target/test.js
@@ -1,28 +1,28 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component1 = helpers.mount(require.resolve('./index'), {});
-    var component2 = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component1 = helpers.mount(require.resolve("./index"), {});
+    var component2 = helpers.mount(require.resolve("./index"), {});
 
     var fooEvent = null;
     var fooEventThis = null;
 
-    component1.subscribeTo(component2).on('foo', function fooListener() {
+    component1.subscribeTo(component2).on("foo", function fooListener() {
         fooEvent = arguments;
         fooEventThis = this;
     });
 
-    component2.emit('foo', 'a', 'b');
+    component2.emit("foo", "a", "b");
 
-    expect(fooEvent[0]).to.equal('a');
-    expect(fooEvent[1]).to.equal('b');
+    expect(fooEvent[0]).to.equal("a");
+    expect(fooEvent[1]).to.equal("b");
     expect(fooEventThis).to.equal(component2);
 
     fooEvent = null;
 
     component2.destroy();
 
-    component2.emit('foo', 'a', 'b');
+    component2.emit("foo", "a", "b");
 
     expect(fooEvent).to.equal(null);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-transclusion/component.js b/test/components-browser/fixtures/widget-transclusion/component.js
index ff2d922db..e8d268222 100644
--- a/test/components-browser/fixtures/widget-transclusion/component.js
+++ b/test/components-browser/fixtures/widget-transclusion/component.js
@@ -1,7 +1,7 @@
 module.exports = {
-    onInput: function (input) {
-        var alertType = input.alertType || 'success';
-        var alertMessage = input.alertMessage || 'Hello World!';
+    onInput: function(input) {
+        var alertType = input.alertType || "success";
+        var alertMessage = input.alertMessage || "Hello World!";
 
         this.state = {
             alertType: alertType,
@@ -9,11 +9,11 @@ module.exports = {
         };
     },
 
-    setAlertType: function (newAlertType) {
-        this.setState('alertType', newAlertType);
+    setAlertType: function(newAlertType) {
+        this.setState("alertType", newAlertType);
     },
 
-    setAlertMessage: function (newAlertMessage) {
-        this.setState('alertMessage', newAlertMessage);
+    setAlertMessage: function(newAlertMessage) {
+        this.setState("alertMessage", newAlertMessage);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/component.js b/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/component.js
index 24f1183b2..e07ace0c5 100644
--- a/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/component.js
+++ b/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/component.js
@@ -1,13 +1,12 @@
 module.exports = {
-
-    onInput: function (input) {
+    onInput: function(input) {
         this.state = {
-            type: input.type || 'success',
+            type: input.type || "success",
             body: input.message || input.renderBody
         };
     },
 
-    setType: function (newType) {
-        this.setState('type', newType);
+    setType: function(newType) {
+        this.setState("type", newType);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/marko-tag.json b/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/marko-tag.json
index bb0eb1be5..fba07b1be 100644
--- a/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/marko-tag.json
+++ b/test/components-browser/fixtures/widget-transclusion/components/app-transclusion-alert/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "@type": "string",
     "@message": "string"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-transclusion/marko.json b/test/components-browser/fixtures/widget-transclusion/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-browser/fixtures/widget-transclusion/marko.json
+++ b/test/components-browser/fixtures/widget-transclusion/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-browser/fixtures/widget-transclusion/test.js b/test/components-browser/fixtures/widget-transclusion/test.js
index f0bbcd0b0..5f66d4b34 100644
--- a/test/components-browser/fixtures/widget-transclusion/test.js
+++ b/test/components-browser/fixtures/widget-transclusion/test.js
@@ -1,26 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var component = helpers.mount(require.resolve('./index'), {});
+module.exports = function(helpers) {
+    var component = helpers.mount(require.resolve("./index"), {});
 
     var el = component.el;
-    var originalH1Html = el.querySelector('h1').innerHTML;
+    var originalH1Html = el.querySelector("h1").innerHTML;
 
-    expect(el.innerHTML).to.contain('alert alert-success');
+    expect(el.innerHTML).to.contain("alert alert-success");
 
     // The inner HTML for the H1 should not change since only the body content changed
-    component.setAlertMessage('Hello Universe');
+    component.setAlertMessage("Hello Universe");
     component.update();
 
-    expect(el.querySelector('h1').innerHTML).to.equal(originalH1Html);
-    expect(el.querySelector('h1').innerHTML).to.contain('success');
-    expect(el.querySelector('.alert').className).to.contain('alert alert-success');
+    expect(el.querySelector("h1").innerHTML).to.equal(originalH1Html);
+    expect(el.querySelector("h1").innerHTML).to.contain("success");
+    expect(el.querySelector(".alert").className).to.contain(
+        "alert alert-success"
+    );
 
     // The inner HTML for the H1 should change since the state of the alert component changed
-    component.setAlertType('failure');
+    component.setAlertType("failure");
     component.update();
 
-    expect(el.querySelector('h1').innerHTML).to.not.equal(originalH1Html);
-    expect(el.querySelector('h1').innerHTML).to.contain('failure');
-    expect(el.querySelector('.alert').className).to.contain('alert alert-failure');
-};
\ No newline at end of file
+    expect(el.querySelector("h1").innerHTML).to.not.equal(originalH1Html);
+    expect(el.querySelector("h1").innerHTML).to.contain("failure");
+    expect(el.querySelector(".alert").className).to.contain(
+        "alert alert-failure"
+    );
+};
diff --git a/test/components-browser/fixtures/widget-unique-id/component.js b/test/components-browser/fixtures/widget-unique-id/component.js
index fcf02afc8..cd887dccb 100644
--- a/test/components-browser/fixtures/widget-unique-id/component.js
+++ b/test/components-browser/fixtures/widget-unique-id/component.js
@@ -1,3 +1,3 @@
 module.exports = {
-    onMount: function () {}
-};
\ No newline at end of file
+    onMount: function() {}
+};
diff --git a/test/components-browser/fixtures/widget-unique-id/test.js b/test/components-browser/fixtures/widget-unique-id/test.js
index 0d0c36fb9..58f35e77c 100644
--- a/test/components-browser/fixtures/widget-unique-id/test.js
+++ b/test/components-browser/fixtures/widget-unique-id/test.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var components = [];
 
     function renderComponent() {
-        var component = helpers.mount(require.resolve('./index'), {});
+        var component = helpers.mount(require.resolve("./index"), {});
         components.push(component);
     }
 
@@ -13,10 +13,10 @@ module.exports = function (helpers) {
     renderComponent();
 
     var ids = {};
-    components.forEach(function (component) {
+    components.forEach(function(component) {
         ids[component.id] = true;
     });
 
     expect(components.length).to.equal(3);
     expect(Object.keys(ids).length).to.equal(components.length);
-};
\ No newline at end of file
+};
diff --git a/test/components-browser/index.test.js b/test/components-browser/index.test.js
index b51211027..d0c8b0c1b 100644
--- a/test/components-browser/index.test.js
+++ b/test/components-browser/index.test.js
@@ -1,62 +1,62 @@
-'use strict';
-require('../__util__/test-init');
+"use strict";
+require("../__util__/test-init");
 
-var path = require('path');
-var autotest = require('../autotest');
-var createJSDOMModule = require('../__util__/create-marko-jsdom-module');
-var ssrTemplate = require('./template.marko');
+var path = require("path");
+var autotest = require("../autotest");
+var createJSDOMModule = require("../__util__/create-marko-jsdom-module");
+var ssrTemplate = require("./template.marko");
 var TEST_NAME = path.basename(__dirname);
 var renderedCache = {};
 
-describe(TEST_NAME, function () {
-    var browser = createJSDOMModule(__dirname, '<div id="testsTarget"></div><div></div>');
-    var BrowserHelpers = browser.require('../__util__/BrowserHelpers');
+describe(TEST_NAME, function() {
+    var browser = createJSDOMModule(
+        __dirname,
+        '<div id="testsTarget"></div><div></div>'
+    );
+    var BrowserHelpers = browser.require("../__util__/BrowserHelpers");
     var helpers;
 
-    beforeEach(function () {
+    beforeEach(function() {
         helpers = new BrowserHelpers();
-    })
+    });
 
-    afterEach(function () {
-        helpers.instances.forEach(function (instance) {
+    afterEach(function() {
+        helpers.instances.forEach(function(instance) {
             instance.destroy();
         });
 
-        helpers.targetEl.innerHTML = '';
+        helpers.targetEl.innerHTML = "";
     });
 
-    after(function () {
+    after(function() {
         browser.window.close();
     });
 
-    autotest.scanDir(
-        path.join(__dirname, './fixtures'),
-        runBrowserRender
-    );
+    autotest.scanDir(path.join(__dirname, "./fixtures"), runBrowserRender);
 
-    describe('deprecated', function () {
+    describe("deprecated", function() {
         autotest.scanDir(
-            path.join(__dirname, './fixtures-deprecated'),
+            path.join(__dirname, "./fixtures-deprecated"),
             runBrowserRender
         );
     });
 
     function runBrowserRender(dir, _, done) {
-        var testFile = path.join(dir, 'test.js');
+        var testFile = path.join(dir, "test.js");
         var testFunc = browser.require(testFile);
         var isAsync = testFunc.length > 1;
-    
+
         if (isAsync) {
             testFunc(helpers, cleanupAndFinish);
         } else {
             testFunc(helpers);
             cleanupAndFinish();
         }
-    
-        function cleanupAndFinish (err) {
+
+        function cleanupAndFinish(err) {
             // Cache components for use in hydrate run.
             renderedCache[dir] = helpers.rendered;
-    
+
             if (err) {
                 done(err);
             } else {
@@ -66,22 +66,22 @@ describe(TEST_NAME, function () {
     }
 });
 
-describe(TEST_NAME + ' (hydrated)', function () {
-    var hydrateOptions = { 
-        skip: (_, dir) => require(path.join(dir, 'test.js')).skipHydrate,
-        fails: (_, dir) => require(path.join(dir, 'test.js')).failHydrate,
-        file: (_, dir) => path.join(dir, 'test.js')
+describe(TEST_NAME + " (hydrated)", function() {
+    var hydrateOptions = {
+        skip: (_, dir) => require(path.join(dir, "test.js")).skipHydrate,
+        fails: (_, dir) => require(path.join(dir, "test.js")).failHydrate,
+        file: (_, dir) => path.join(dir, "test.js")
     };
 
     autotest.scanDir(
-        path.join(__dirname, './fixtures'),
+        path.join(__dirname, "./fixtures"),
         runServerRender,
         hydrateOptions
     );
 
-    describe('deprecated', function () {
+    describe("deprecated", function() {
         autotest.scanDir(
-            path.join(__dirname, './fixtures-deprecated'),
+            path.join(__dirname, "./fixtures-deprecated"),
             runServerRender,
             hydrateOptions
         );
@@ -89,27 +89,45 @@ describe(TEST_NAME + ' (hydrated)', function () {
 
     function runServerRender(dir, _, done) {
         var components = renderedCache[dir];
-        var $global = components.reduce(($g, c) => Object.assign($g, c.$global), {});
+        var $global = components.reduce(
+            ($g, c) => Object.assign($g, c.$global),
+            {}
+        );
         ssrTemplate
             .render({ components: components, $global: $global })
-            .then(function (html) {
+            .then(function(html) {
                 var browser = createJSDOMModule(__dirname, String(html), {
                     beforeParse(window, browser) {
-                        var marko = browser.require('marko/components');
-                        var legacy = browser.require('marko/legacy-components');
-                        legacy.load = (type) => legacy.defineWidget(browser.require(type.replace(/^.*\/components-browser/, __dirname)));
-                        var rootComponent = browser.require(require.resolve('./template.component-browser.js'));
+                        var marko = browser.require("marko/components");
+                        var legacy = browser.require("marko/legacy-components");
+                        legacy.load = type =>
+                            legacy.defineWidget(
+                                browser.require(
+                                    type.replace(
+                                        /^.*\/components-browser/,
+                                        __dirname
+                                    )
+                                )
+                            );
+                        var rootComponent = browser.require(
+                            require.resolve("./template.component-browser.js")
+                        );
                         marko.register(ssrTemplate.meta.id, rootComponent);
-                        components.forEach(function (def) {
+                        components.forEach(function(def) {
                             Object.keys(def.components).forEach(type => {
-                                marko.register(type, browser.require(def.components[type]));
-                            })
+                                marko.register(
+                                    type,
+                                    browser.require(def.components[type])
+                                );
+                            });
                         });
                     }
                 });
-                var testFile = path.join(dir, 'test.js');
+                var testFile = path.join(dir, "test.js");
                 var testFunc = browser.require(testFile);
-                var BrowserHelpers = browser.require('../__util__/BrowserHelpers');
+                var BrowserHelpers = browser.require(
+                    "../__util__/BrowserHelpers"
+                );
                 var helpers = new BrowserHelpers();
                 var isAsync = testFunc.length > 1;
                 var curInstance = 0;
@@ -117,10 +135,10 @@ describe(TEST_NAME + ' (hydrated)', function () {
                 browser.window.$initComponents();
                 helpers.isHydrate = true;
 
-                helpers.mount = function () {
+                helpers.mount = function() {
                     return browser.window.components[curInstance++];
-                }
-    
+                };
+
                 if (isAsync) {
                     testFunc(helpers, done);
                 } else {
diff --git a/test/components-browser/template.component-browser.js b/test/components-browser/template.component-browser.js
index 5240632c5..66b01d7d4 100644
--- a/test/components-browser/template.component-browser.js
+++ b/test/components-browser/template.component-browser.js
@@ -1,5 +1,5 @@
 module.exports = {
     onMount() {
-        window.components = this.getComponents('components');
+        window.components = this.getComponents("components");
     }
-}
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-html-deprecated/bind-component/index.js b/test/components-compilation/fixtures-html-deprecated/bind-component/index.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html-deprecated/bind-component/index.js
+++ b/test/components-compilation/fixtures-html-deprecated/bind-component/index.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html-deprecated/bind-widget/widget.js b/test/components-compilation/fixtures-html-deprecated/bind-widget/widget.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html-deprecated/bind-widget/widget.js
+++ b/test/components-compilation/fixtures-html-deprecated/bind-widget/widget.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html-deprecated/component-include-attr/index.js b/test/components-compilation/fixtures-html-deprecated/component-include-attr/index.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html-deprecated/component-include-attr/index.js
+++ b/test/components-compilation/fixtures-html-deprecated/component-include-attr/index.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html-deprecated/component-template-entry/component.js b/test/components-compilation/fixtures-html-deprecated/component-template-entry/component.js
index 3b06c2628..be8fd94c4 100644
--- a/test/components-compilation/fixtures-html-deprecated/component-template-entry/component.js
+++ b/test/components-compilation/fixtures-html-deprecated/component-template-entry/component.js
@@ -1,19 +1,29 @@
-var marko_template = module.exports = require("marko/html").t(__filename),
+var marko_template = (module.exports = require("marko/html").t(__filename)),
     marko_component = require("./component"),
     marko_components = require("marko/components"),
     marko_registerComponent = marko_components.rw,
-    marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-template-entry/index.marko", function () {
-  return module.exports;
-}),
+    marko_componentType = marko_registerComponent(
+        "/marko-test$1.0.0/autotests/components-compilation-deprecated/component-template-entry/index.marko",
+        function() {
+            return module.exports;
+        }
+    ),
     marko_helpers = require("marko/runtime/html/helpers"),
     marko_attr = marko_helpers.a;
 
-function render(input, out, component, state) {
-  out.w("<div" + marko_attr("id", component.id) + "></div>");
+function render(input, out, component) {
+    out.w("<div" + marko_attr("id", component.id) + "></div>");
 }
 
-marko_template._ = marko_components.r(render, {
-  type: marko_componentType
-}, marko_component);
+marko_template._ = marko_components.r(
+    render,
+    {
+        type: marko_componentType
+    },
+    marko_component
+);
 
-marko_template.Component = marko_components.w(marko_component, marko_template._);
\ No newline at end of file
+marko_template.Component = marko_components.w(
+    marko_component,
+    marko_template._
+);
diff --git a/test/components-compilation/fixtures-html-deprecated/widget-types/widget-mobile.js b/test/components-compilation/fixtures-html-deprecated/widget-types/widget-mobile.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html-deprecated/widget-types/widget-mobile.js
+++ b/test/components-compilation/fixtures-html-deprecated/widget-types/widget-mobile.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html-deprecated/widget-types/widget.js b/test/components-compilation/fixtures-html-deprecated/widget-types/widget.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html-deprecated/widget-types/widget.js
+++ b/test/components-compilation/fixtures-html-deprecated/widget-types/widget.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/auto-key-els-renderBody/component.js b/test/components-compilation/fixtures-html/auto-key-els-renderBody/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/auto-key-els-renderBody/component.js
+++ b/test/components-compilation/fixtures-html/auto-key-els-renderBody/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/auto-key-els/component.js b/test/components-compilation/fixtures-html/auto-key-els/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/auto-key-els/component.js
+++ b/test/components-compilation/fixtures-html/auto-key-els/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/bind-component/component.js b/test/components-compilation/fixtures-html/bind-component/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/bind-component/component.js
+++ b/test/components-compilation/fixtures-html/bind-component/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/bind-widget/component.js b/test/components-compilation/fixtures-html/bind-widget/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/bind-widget/component.js
+++ b/test/components-compilation/fixtures-html/bind-widget/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/renderer.js b/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-html/boundary-el-no-output-tag/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/renderer.js b/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-html/boundary-no-output-tag-el/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/fixtures-html/browser-json-dependency/browser.json b/test/components-compilation/fixtures-html/browser-json-dependency/browser.json
index 9e26dfeeb..0967ef424 100644
--- a/test/components-compilation/fixtures-html/browser-json-dependency/browser.json
+++ b/test/components-compilation/fixtures-html/browser-json-dependency/browser.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/renderer.js b/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-html/child-tag-no-output-multiple-roots/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/renderer.js b/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-html/child-tag-no-output/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/fixtures-html/component-include-attr/component.js b/test/components-compilation/fixtures-html/component-include-attr/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/component-include-attr/component.js
+++ b/test/components-compilation/fixtures-html/component-include-attr/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/component-template-entry-split/component-browser.js b/test/components-compilation/fixtures-html/component-template-entry-split/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/component-template-entry-split/component-browser.js
+++ b/test/components-compilation/fixtures-html/component-template-entry-split/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/component-template-entry-split/component.js b/test/components-compilation/fixtures-html/component-template-entry-split/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/component-template-entry-split/component.js
+++ b/test/components-compilation/fixtures-html/component-template-entry-split/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/component-template-entry/component.js b/test/components-compilation/fixtures-html/component-template-entry/component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/component-template-entry/component.js
+++ b/test/components-compilation/fixtures-html/component-template-entry/component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/component-template-non-index/template.component.js b/test/components-compilation/fixtures-html/component-template-non-index/template.component.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/component-template-non-index/template.component.js
+++ b/test/components-compilation/fixtures-html/component-template-non-index/template.component.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/index-non-component/test.js b/test/components-compilation/fixtures-html/index-non-component/test.js
index 58b7b915d..3f87f3de3 100644
--- a/test/components-compilation/fixtures-html/index-non-component/test.js
+++ b/test/components-compilation/fixtures-html/index-non-component/test.js
@@ -1,3 +1,3 @@
 exports.compilerOptions = {
     meta: true
-};
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-html/index-widget-only/component-browser.js b/test/components-compilation/fixtures-html/index-widget-only/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/components-compilation/fixtures-html/index-widget-only/component-browser.js
+++ b/test/components-compilation/fixtures-html/index-widget-only/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/components-compilation/fixtures-html/index-widget-only/test.js b/test/components-compilation/fixtures-html/index-widget-only/test.js
index 58b7b915d..3f87f3de3 100644
--- a/test/components-compilation/fixtures-html/index-widget-only/test.js
+++ b/test/components-compilation/fixtures-html/index-widget-only/test.js
@@ -1,3 +1,3 @@
 exports.compilerOptions = {
     meta: true
-};
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-html/key-suffix-with-deprecated-attr-error/test.js b/test/components-compilation/fixtures-html/key-suffix-with-deprecated-attr-error/test.js
index 45f90afe0..ce6a105b4 100644
--- a/test/components-compilation/fixtures-html/key-suffix-with-deprecated-attr-error/test.js
+++ b/test/components-compilation/fixtures-html/key-suffix-with-deprecated-attr-error/test.js
@@ -1,5 +1,7 @@
-const expect = require('chai').expect;
+const expect = require("chai").expect;
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('The "for-key" attribute cannot be used in conjunction with "for:key"');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        'The "for-key" attribute cannot be used in conjunction with "for:key"'
+    );
+};
diff --git a/test/components-compilation/fixtures-html/key-suffix-with-unfixed-attr-error/test.js b/test/components-compilation/fixtures-html/key-suffix-with-unfixed-attr-error/test.js
index ddb7aa3d0..387145d4e 100644
--- a/test/components-compilation/fixtures-html/key-suffix-with-unfixed-attr-error/test.js
+++ b/test/components-compilation/fixtures-html/key-suffix-with-unfixed-attr-error/test.js
@@ -1,5 +1,7 @@
-const expect = require('chai').expect;
+const expect = require("chai").expect;
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('The "for:key" attribute cannot be used in conjunction with the "for" attribute');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        'The "for:key" attribute cannot be used in conjunction with the "for" attribute'
+    );
+};
diff --git a/test/components-compilation/fixtures-html/style-inline-css/test.js b/test/components-compilation/fixtures-html/style-inline-css/test.js
index 58b7b915d..3f87f3de3 100644
--- a/test/components-compilation/fixtures-html/style-inline-css/test.js
+++ b/test/components-compilation/fixtures-html/style-inline-css/test.js
@@ -1,3 +1,3 @@
 exports.compilerOptions = {
     meta: true
-};
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-html/style-inline-less-invalid-attr/test.js b/test/components-compilation/fixtures-html/style-inline-less-invalid-attr/test.js
index 11f308a3e..46e255741 100644
--- a/test/components-compilation/fixtures-html/style-inline-less-invalid-attr/test.js
+++ b/test/components-compilation/fixtures-html/style-inline-less-invalid-attr/test.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.compilerOptions = {
     meta: true
 };
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('index.marko:1:0] Unsupported attribute on the component style tag: foo');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "index.marko:1:0] Unsupported attribute on the component style tag: foo"
+    );
+};
diff --git a/test/components-compilation/fixtures-html/style-inline-less/test.js b/test/components-compilation/fixtures-html/style-inline-less/test.js
index 58b7b915d..3f87f3de3 100644
--- a/test/components-compilation/fixtures-html/style-inline-less/test.js
+++ b/test/components-compilation/fixtures-html/style-inline-less/test.js
@@ -1,3 +1,3 @@
 exports.compilerOptions = {
     meta: true
-};
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-html/styles-in-directory/style.css b/test/components-compilation/fixtures-html/styles-in-directory/style.css
index 7a929df00..1f49e0f58 100644
--- a/test/components-compilation/fixtures-html/styles-in-directory/style.css
+++ b/test/components-compilation/fixtures-html/styles-in-directory/style.css
@@ -1 +1,2 @@
-.test{}
\ No newline at end of file
+.test {
+}
diff --git a/test/components-compilation/fixtures-html/styles-in-directory/test.js b/test/components-compilation/fixtures-html/styles-in-directory/test.js
index 58b7b915d..3f87f3de3 100644
--- a/test/components-compilation/fixtures-html/styles-in-directory/test.js
+++ b/test/components-compilation/fixtures-html/styles-in-directory/test.js
@@ -1,3 +1,3 @@
 exports.compilerOptions = {
     meta: true
-};
\ No newline at end of file
+};
diff --git a/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/renderer.js b/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-vdom/boundary-el-no-output-tag/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/marko-tag.json b/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
index 1dc5f764d..ccd9889d9 100644
--- a/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
+++ b/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer",
     "noOutput": true
-}
\ No newline at end of file
+}
diff --git a/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/renderer.js b/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/renderer.js
index 4f600d13b..0a55f349a 100644
--- a/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/renderer.js
+++ b/test/components-compilation/fixtures-vdom/boundary-no-output-tag-el/components/test-no-output/renderer.js
@@ -1 +1 @@
-module.exports = function (input, out) {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/components-compilation/html.test.js b/test/components-compilation/html.test.js
index 91640f076..854255faa 100644
--- a/test/components-compilation/html.test.js
+++ b/test/components-compilation/html.test.js
@@ -1,28 +1,30 @@
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var fs = require('fs');
-var path = require('path');
-var autotest = require('../autotest');
-var compiler = require('marko/compiler');
-var expect = require('chai').expect;
+var fs = require("fs");
+var path = require("path");
+var autotest = require("../autotest");
+var compiler = require("marko/compiler");
 
-describe('components-compilation (html)', function () {
-    autotest.scanDir(path.join(__dirname, './fixtures-html'), run);
+describe("components-compilation (html)", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures-html"), run);
 
-    describe("deprecated", function () {
-        autotest.scanDir(path.join(__dirname, './fixtures-html-deprecated'), run);
-    })
+    describe("deprecated", function() {
+        autotest.scanDir(
+            path.join(__dirname, "./fixtures-html-deprecated"),
+            run
+        );
+    });
 });
 
 function run(dir, helpers, done) {
-    var templatePath = path.join(dir, 'index.marko');
-    var mainPath = path.join(dir, 'test.js');
+    var templatePath = path.join(dir, "index.marko");
+    var mainPath = path.join(dir, "test.js");
     var main;
 
     if (!fs.existsSync(templatePath)) {
-        templatePath = path.join(dir, 'template.marko');
+        templatePath = path.join(dir, "template.marko");
         if (!fs.existsSync(templatePath)) {
-            return done(new Error('Template not found for test'));
+            return done(new Error("Template not found for test"));
         }
     }
 
@@ -30,7 +32,11 @@ function run(dir, helpers, done) {
         main = require(mainPath);
     }
 
-    var compilerOptions = { output: 'html', writeVersionComment: false, autoKeyEnabled: true };
+    var compilerOptions = {
+        output: "html",
+        writeVersionComment: false,
+        autoKeyEnabled: true
+    };
 
     if (main && main.checkError) {
         var e;
@@ -42,19 +48,25 @@ function run(dir, helpers, done) {
         }
 
         if (!e) {
-            throw new Error('Error expected');
+            throw new Error("Error expected");
         }
 
         main.checkError(e);
         done();
     } else if (main && main.checkTemplate) {
-        var template = require('marko').load(templatePath, Object.assign(compilerOptions, main.compilerOptions));
+        var template = require("marko").load(
+            templatePath,
+            Object.assign(compilerOptions, main.compilerOptions)
+        );
         main.checkTemplate(template);
         done();
     } else {
-        var compiledSrc = compiler.compileFile(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
-        compiledSrc = compiledSrc.replace(/marko\/dist\//g, 'marko/src/');
-        helpers.compare(compiledSrc, '.js');
+        var compiledSrc = compiler.compileFile(
+            templatePath,
+            Object.assign(compilerOptions, main && main.compilerOptions)
+        );
+        compiledSrc = compiledSrc.replace(/marko\/dist\//g, "marko/src/");
+        helpers.compare(compiledSrc, ".js");
         done();
     }
 }
diff --git a/test/components-compilation/vdom.test.js b/test/components-compilation/vdom.test.js
index ea83cc96d..2481dd9d8 100644
--- a/test/components-compilation/vdom.test.js
+++ b/test/components-compilation/vdom.test.js
@@ -1,22 +1,22 @@
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var fs = require('fs');
-var path = require('path');
-var autotest = require('../autotest');
-var compiler = require('marko/compiler');
+var fs = require("fs");
+var path = require("path");
+var autotest = require("../autotest");
+var compiler = require("marko/compiler");
 
-describe('components-compilation (vdom)', function () {
-    var autoTestDir = path.join(__dirname, './fixtures-vdom');
+describe("components-compilation (vdom)", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures-vdom");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var templatePath = path.join(dir, 'index.marko');
-        var mainPath = path.join(dir, 'test.js');
+        var templatePath = path.join(dir, "index.marko");
+        var mainPath = path.join(dir, "test.js");
         var main;
 
         if (!fs.existsSync(templatePath)) {
-            templatePath = path.join(dir, 'template.marko');
+            templatePath = path.join(dir, "template.marko");
             if (!fs.existsSync(templatePath)) {
-                return done(new Error('Template not found for test'));
+                return done(new Error("Template not found for test"));
             }
         }
 
@@ -24,7 +24,11 @@ describe('components-compilation (vdom)', function () {
             main = require(mainPath);
         }
 
-        var compilerOptions = { output: 'vdom', writeVersionComment: false, autoKeyEnabled: true };
+        var compilerOptions = {
+            output: "vdom",
+            writeVersionComment: false,
+            autoKeyEnabled: true
+        };
 
         if (main && main.checkError) {
             var e;
@@ -36,19 +40,25 @@ describe('components-compilation (vdom)', function () {
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
             done();
         } else if (main && main.checkTemplate) {
-            var template = require('marko').load(templatePath, Object.assign(compilerOptions, main.compilerOptions));
+            var template = require("marko").load(
+                templatePath,
+                Object.assign(compilerOptions, main.compilerOptions)
+            );
             main.checkTemplate(template);
             done();
         } else {
-            var compiledSrc = compiler.compileFile(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
-            compiledSrc = compiledSrc.replace(/marko\/dist\//g, 'marko/src/');
-            helpers.compare(compiledSrc, '.js');
+            var compiledSrc = compiler.compileFile(
+                templatePath,
+                Object.assign(compilerOptions, main && main.compilerOptions)
+            );
+            compiledSrc = compiledSrc.replace(/marko\/dist\//g, "marko/src/");
+            helpers.compare(compiledSrc, ".js");
             done();
         }
     });
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/browser.json b/test/components-pages/fixtures-deprecated/async-boundaries/browser.json
index fae1ea036..3b8701abb 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/browser.json
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/browser.json
@@ -5,4 +5,4 @@
         "require: ./components/app-init-async/widget",
         "require: marko-widgets"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/renderer.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/renderer.js
index 36f97381e..c921ff672 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/renderer.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/renderer.js
@@ -1,4 +1,4 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
 module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
@@ -10,8 +10,8 @@ module.exports = function(input, out) {
                     name: input.name
                 }
             },
-            asyncOut);
+            asyncOut
+        );
         asyncOut.end();
     }, 10);
-
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/widget.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/widget.js
index 72d9de151..51fc63a1b 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/widget.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-async/widget.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.Widget = function(config) {
     this.asyncWidget = true;
     this.name = config.name;
 
-    var helloWidget = this.getWidget('hello');
+    var helloWidget = this.getWidget("hello");
 
     this.test = function() {
-        expect(helloWidget).to.be.an('object');
-        expect(helloWidget.name).to.equal('Async');
+        expect(helloWidget).to.be.an("object");
+        expect(helloWidget.name).to.equal("Async");
     };
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/renderer.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/renderer.js
index a01d57f74..6930ef441 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/renderer.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/renderer.js
@@ -1,7 +1,7 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 module.exports = function(input, out) {
-    var className = input['class'] || 'app-hello';
+    var className = input["class"] || "app-hello";
 
     template.render(
         {
@@ -11,6 +11,6 @@ module.exports = function(input, out) {
                 name: input.name
             }
         },
-        out);
-
-};
\ No newline at end of file
+        out
+    );
+};
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/widget.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/widget.js
index a841e3c71..78acfa4d9 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/widget.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-hello/widget.js
@@ -1,4 +1,4 @@
 exports.Widget = function(config) {
-    this.type = 'app-hello';
+    this.type = "app-hello";
     this.name = config.name;
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/renderer.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/renderer.js
index 3d536eab2..704b2e165 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/renderer.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/renderer.js
@@ -1,5 +1,5 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 exports.renderer = function(input, out) {
     template.render(input || {}, out);
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/widget.js b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/widget.js
index 53e0f938a..e7881be28 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/widget.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/components/app-init-async/widget.js
@@ -1,33 +1,33 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 function Widget() {
     window.appInitAsync = this;
 
-    var helloFrank = this.getWidget('helloFrank');
-    var async1 = this.getWidget('async1');
-    var helloJohn = this.getWidget('helloJohn');
-    var async2 = this.getWidget('async2');
-    var helloJane = this.getWidget('helloJane');
+    var helloFrank = this.getWidget("helloFrank");
+    var async1 = this.getWidget("async1");
+    var helloJohn = this.getWidget("helloJohn");
+    var async2 = this.getWidget("async2");
+    var helloJane = this.getWidget("helloJane");
 
     this.test = function() {
-        expect(helloFrank).to.be.an('object');
-        expect(helloFrank.name).to.equal('Frank');
+        expect(helloFrank).to.be.an("object");
+        expect(helloFrank.name).to.equal("Frank");
 
-        expect(async1).to.be.an('object');
-        expect(async1.name).to.equal('async1');
+        expect(async1).to.be.an("object");
+        expect(async1.name).to.equal("async1");
 
-        expect(helloJohn).to.be.an('object');
-        expect(helloJohn.name).to.equal('John');
+        expect(helloJohn).to.be.an("object");
+        expect(helloJohn.name).to.equal("John");
 
-        expect(async2).to.be.an('object');
-        expect(async2.name).to.equal('async2');
+        expect(async2).to.be.an("object");
+        expect(async2.name).to.equal("async2");
 
-        expect(helloJane).to.be.an('object');
-        expect(helloJane.name).to.equal('Jane');
+        expect(helloJane).to.be.an("object");
+        expect(helloJane.name).to.equal("Jane");
 
         async1.test();
         async2.test();
     };
 }
 
-module.exports = Widget;
\ No newline at end of file
+module.exports = Widget;
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/marko.json b/test/components-pages/fixtures-deprecated/async-boundaries/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/marko.json
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/async-boundaries/tests.js b/test/components-pages/fixtures-deprecated/async-boundaries/tests.js
index 607a0c0bd..0841b6459 100644
--- a/test/components-pages/fixtures-deprecated/async-boundaries/tests.js
+++ b/test/components-pages/fixtures-deprecated/async-boundaries/tests.js
@@ -1,8 +1,7 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should initialize widgets correctly across async boundaries', function() {
+    it("should initialize widgets correctly across async boundaries", function() {
         window.appInitAsync.test();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/custom-events/browser.json b/test/components-pages/fixtures-deprecated/custom-events/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/custom-events/browser.json
+++ b/test/components-pages/fixtures-deprecated/custom-events/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/custom-events/components/app-fancy-button/index.js b/test/components-pages/fixtures-deprecated/custom-events/components/app-fancy-button/index.js
index acba5f47b..9dc355b16 100644
--- a/test/components-pages/fixtures-deprecated/custom-events/components/app-fancy-button/index.js
+++ b/test/components-pages/fixtures-deprecated/custom-events/components/app-fancy-button/index.js
@@ -1,5 +1,5 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require.resolve('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require.resolve("./template.marko"),
 
     getTemplateData: function(state, input) {
         return {
@@ -8,6 +8,6 @@ module.exports = require('marko-widgets').defineComponent({
     },
 
     emitPressEvent: function() {
-        this.emit('press', { widget: this });
+        this.emit("press", { widget: this });
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/custom-events/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/custom-events/components/app-foo/index.js
index e2f36584f..bf717918b 100644
--- a/test/components-pages/fixtures-deprecated/custom-events/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/custom-events/components/app-foo/index.js
@@ -1,17 +1,16 @@
-module.exports = require('marko-widgets').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getTemplateData: function(state, input) {
-		return {
-		};
-	},
+    getTemplateData: function() {
+        return {};
+    },
 
-	init: function() {
-		window.fooWidget = this;
-		this.pressEvent = undefined;
-	},
+    init: function() {
+        window.fooWidget = this;
+        this.pressEvent = undefined;
+    },
 
-	handleButtonPress: function() {
-		this.pressEvent = arguments;
-	}
-});
\ No newline at end of file
+    handleButtonPress: function() {
+        this.pressEvent = arguments;
+    }
+});
diff --git a/test/components-pages/fixtures-deprecated/custom-events/marko.json b/test/components-pages/fixtures-deprecated/custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/custom-events/marko.json
+++ b/test/components-pages/fixtures-deprecated/custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/custom-events/tests.js b/test/components-pages/fixtures-deprecated/custom-events/tests.js
index d7637cdab..c4525df8d 100644
--- a/test/components-pages/fixtures-deprecated/custom-events/tests.js
+++ b/test/components-pages/fixtures-deprecated/custom-events/tests.js
@@ -1,20 +1,22 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should invoke event handler method for custom events with extra args', function() {
+    it("should invoke event handler method for custom events with extra args", function() {
         var widget = window.fooWidget;
 
         widget.pressEvent = null;
 
-        widget.getWidget('ok').emitPressEvent();
+        widget.getWidget("ok").emitPressEvent();
 
-        expect(widget.pressEvent[0].type).to.equal('ok');
-        expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('ok'));
+        expect(widget.pressEvent[0].type).to.equal("ok");
+        expect(widget.pressEvent[1].widget).to.equal(widget.getWidget("ok"));
 
-        widget.getWidget('cancel').emitPressEvent();
+        widget.getWidget("cancel").emitPressEvent();
 
-        expect(widget.pressEvent[0].type).to.equal('cancel');
-        expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('cancel'));
+        expect(widget.pressEvent[0].type).to.equal("cancel");
+        expect(widget.pressEvent[1].widget).to.equal(
+            widget.getWidget("cancel")
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/dom-events/browser.json b/test/components-pages/fixtures-deprecated/dom-events/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/dom-events/browser.json
+++ b/test/components-pages/fixtures-deprecated/dom-events/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/dom-events/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/dom-events/components/app-foo/index.js
index 3bef93c80..1b00aefa5 100644
--- a/test/components-pages/fixtures-deprecated/dom-events/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/dom-events/components/app-foo/index.js
@@ -1,13 +1,13 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     getInitialState: function() {
         return {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
-    init: function(widgetConfig) {
+    init: function() {
         window.fooWidget = this;
         this.mouseMoveEvent = null;
         this.clickEvent = null;
@@ -20,4 +20,4 @@ module.exports = require('marko-widgets').defineComponent({
     handleButtonClick: function() {
         this.clickEvent = arguments;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/dom-events/marko.json b/test/components-pages/fixtures-deprecated/dom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/dom-events/marko.json
+++ b/test/components-pages/fixtures-deprecated/dom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/dom-events/tests.js b/test/components-pages/fixtures-deprecated/dom-events/tests.js
index 82cf1bb6c..7f2bdf808 100644
--- a/test/components-pages/fixtures-deprecated/dom-events/tests.js
+++ b/test/components-pages/fixtures-deprecated/dom-events/tests.js
@@ -1,74 +1,91 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 describe(path.basename(__dirname), function() {
-    it('should invoke event handler method for non-bubbling events', function() {
+    it("should invoke event handler method for non-bubbling events", function() {
         window.fooWidget.mouseMoveEvent = null;
-        triggerMouseEvent(window.fooWidget.getEl('button'), 'mousemove');
+        triggerMouseEvent(window.fooWidget.getEl("button"), "mousemove");
         expect(window.fooWidget.mouseMoveEvent != null).to.equal(true);
 
-        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('mousemove');
-        expect(window.fooWidget.mouseMoveEvent[1]).to.equal(window.fooWidget.getEl('button'));
+        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal("mousemove");
+        expect(window.fooWidget.mouseMoveEvent[1]).to.equal(
+            window.fooWidget.getEl("button")
+        );
     });
 
-    it('should invoke event handler method for non-bubbling events with extra args', function() {
+    it("should invoke event handler method for non-bubbling events with extra args", function() {
         window.fooWidget.mouseMoveEvent = null;
 
-        triggerMouseEvent(window.fooWidget.getEl('ok'), 'mousemove');
+        triggerMouseEvent(window.fooWidget.getEl("ok"), "mousemove");
 
         expect(window.fooWidget.mouseMoveEvent != null).to.equal(true);
-        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('ok');
-        expect(window.fooWidget.mouseMoveEvent[1].type).to.equal('mousemove');
-        expect(window.fooWidget.mouseMoveEvent[2]).to.equal(window.fooWidget.getEl('ok'));
+        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal("ok");
+        expect(window.fooWidget.mouseMoveEvent[1].type).to.equal("mousemove");
+        expect(window.fooWidget.mouseMoveEvent[2]).to.equal(
+            window.fooWidget.getEl("ok")
+        );
 
-        triggerMouseEvent(window.fooWidget.getEl('cancel'), 'mousemove');
+        triggerMouseEvent(window.fooWidget.getEl("cancel"), "mousemove");
 
         expect(window.fooWidget.mouseMoveEvent != null).to.equal(true);
-        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('cancel');
-        expect(window.fooWidget.mouseMoveEvent[1].type).to.equal('mousemove');
-        expect(window.fooWidget.mouseMoveEvent[2]).to.equal(window.fooWidget.getEl('cancel'));
+        expect(window.fooWidget.mouseMoveEvent[0].type).to.equal("cancel");
+        expect(window.fooWidget.mouseMoveEvent[1].type).to.equal("mousemove");
+        expect(window.fooWidget.mouseMoveEvent[2]).to.equal(
+            window.fooWidget.getEl("cancel")
+        );
     });
 
-    it('should invoke event handler method for bubbling events', function() {
+    it("should invoke event handler method for bubbling events", function() {
         window.fooWidget.clickEvent = null;
-        triggerMouseEvent(window.fooWidget.getEl('button'), 'click');
+        triggerMouseEvent(window.fooWidget.getEl("button"), "click");
         expect(window.fooWidget.clickEvent != null).to.equal(true);
-        expect(window.fooWidget.clickEvent[0].type).to.equal('click');
-        expect(window.fooWidget.clickEvent[1]).to.equal(window.fooWidget.getEl('button'));
+        expect(window.fooWidget.clickEvent[0].type).to.equal("click");
+        expect(window.fooWidget.clickEvent[1]).to.equal(
+            window.fooWidget.getEl("button")
+        );
     });
 
-    it('should invoke event handler method for bubbling events with extra args', function() {
+    it("should invoke event handler method for bubbling events with extra args", function() {
         var widget = window.fooWidget;
 
         window.fooWidget.clickEvent = null;
 
-    	triggerClick(widget.getEl('ok'));
+        triggerClick(widget.getEl("ok"));
 
-        expect(widget.clickEvent[0].type).to.equal('ok');
-        expect(widget.clickEvent[1].stopPropagation).to.be.a('function');
-        expect(widget.clickEvent[2].innerHTML).to.equal('OK');
+        expect(widget.clickEvent[0].type).to.equal("ok");
+        expect(widget.clickEvent[1].stopPropagation).to.be.a("function");
+        expect(widget.clickEvent[2].innerHTML).to.equal("OK");
 
-        triggerClick(widget.getEl('cancel'));
+        triggerClick(widget.getEl("cancel"));
 
-        expect(widget.clickEvent[0].type).to.equal('cancel');
-        expect(widget.clickEvent[1].stopPropagation).to.be.a('function');
-        expect(widget.clickEvent[2].innerHTML).to.equal('Cancel');
+        expect(widget.clickEvent[0].type).to.equal("cancel");
+        expect(widget.clickEvent[1].stopPropagation).to.be.a("function");
+        expect(widget.clickEvent[2].innerHTML).to.equal("Cancel");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/getRenderedWidgets/browser.json b/test/components-pages/fixtures-deprecated/getRenderedWidgets/browser.json
index 0733c440c..62e11be8c 100644
--- a/test/components-pages/fixtures-deprecated/getRenderedWidgets/browser.json
+++ b/test/components-pages/fixtures-deprecated/getRenderedWidgets/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-simple"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-simple"]
+}
diff --git a/test/components-pages/fixtures-deprecated/getRenderedWidgets/components/app-simple/index.js b/test/components-pages/fixtures-deprecated/getRenderedWidgets/components/app-simple/index.js
index 025a9c6a5..abc7a40ce 100644
--- a/test/components-pages/fixtures-deprecated/getRenderedWidgets/components/app-simple/index.js
+++ b/test/components-pages/fixtures-deprecated/getRenderedWidgets/components/app-simple/index.js
@@ -1,33 +1,33 @@
-if (typeof window !== 'undefined') {
-	window.simpleWidgets = [];
+if (typeof window !== "undefined") {
+    window.simpleWidgets = [];
 }
 
-module.exports = require('marko-widgets').defineComponent({
-	template: require.resolve('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require.resolve("./template.marko"),
 
-	getWidgetConfig: function(input) {
-		return {
-			type: 'widget config',
-			name: input.name,
+    getWidgetConfig: function(input) {
+        return {
+            type: "widget config",
+            name: input.name,
             messageCount: input.messageCount
-		};
-	},
+        };
+    },
 
-	getInitialState: function(input) {
-		return {
-			type: 'widget state',
-			name: input.name,
+    getInitialState: function(input) {
+        return {
+            type: "widget state",
+            name: input.name,
             messageCount: input.messageCount
-		};
-	},
+        };
+    },
 
-	getTemplateData: function(state, input) {
-		return state;
-	},
+    getTemplateData: function(state) {
+        return state;
+    },
 
-	init: function(widgetConfig) {
-		window.simpleWidgets.push(this);
+    init: function(widgetConfig) {
+        window.simpleWidgets.push(this);
 
-		this.widgetConfig = widgetConfig;
-	}
-});
\ No newline at end of file
+        this.widgetConfig = widgetConfig;
+    }
+});
diff --git a/test/components-pages/fixtures-deprecated/getRenderedWidgets/marko.json b/test/components-pages/fixtures-deprecated/getRenderedWidgets/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/getRenderedWidgets/marko.json
+++ b/test/components-pages/fixtures-deprecated/getRenderedWidgets/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/getRenderedWidgets/tests.js b/test/components-pages/fixtures-deprecated/getRenderedWidgets/tests.js
index c4c6913c4..11dca30a5 100644
--- a/test/components-pages/fixtures-deprecated/getRenderedWidgets/tests.js
+++ b/test/components-pages/fixtures-deprecated/getRenderedWidgets/tests.js
@@ -1,35 +1,38 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoWidgets = require('marko-widgets');
+var path = require("path");
+var expect = require("chai").expect;
+var markoWidgets = require("marko-widgets");
 
 describe(path.basename(__dirname), function() {
-    it('should serialize widget config down to the browser', function() {
-
+    it("should serialize widget config down to the browser", function() {
         expect(window.simpleWidgets).to.eql([]);
 
         var components = window.components;
         var html = components.html;
         var widgetIds = components.widgetIds;
 
-        document.getElementById('testsTarget').innerHTML = html; // Add the HTML to the DOM
+        document.getElementById("testsTarget").innerHTML = html; // Add the HTML to the DOM
 
         // Initialize the widgets to bind behavior!
         markoWidgets.initWidgets(widgetIds);
 
         expect(window.simpleWidgets.length).to.equal(2);
 
-        expect(window.simpleWidgets[1].state.type).to.equal('widget state');
-        expect(window.simpleWidgets[1].state.name).to.equal('Frank');
+        expect(window.simpleWidgets[1].state.type).to.equal("widget state");
+        expect(window.simpleWidgets[1].state.name).to.equal("Frank");
         expect(window.simpleWidgets[1].state.messageCount).to.equal(20);
-        expect(window.simpleWidgets[1].widgetConfig.type).to.equal('widget config');
-        expect(window.simpleWidgets[1].widgetConfig.name).to.equal('Frank');
+        expect(window.simpleWidgets[1].widgetConfig.type).to.equal(
+            "widget config"
+        );
+        expect(window.simpleWidgets[1].widgetConfig.name).to.equal("Frank");
         expect(window.simpleWidgets[1].widgetConfig.messageCount).to.equal(20);
 
-        expect(window.simpleWidgets[0].state.type).to.equal('widget state');
-        expect(window.simpleWidgets[0].state.name).to.equal('John');
+        expect(window.simpleWidgets[0].state.type).to.equal("widget state");
+        expect(window.simpleWidgets[0].state.name).to.equal("John");
         expect(window.simpleWidgets[0].state.messageCount).to.equal(10);
-        expect(window.simpleWidgets[0].widgetConfig.type).to.equal('widget config');
-        expect(window.simpleWidgets[0].widgetConfig.name).to.equal('John');
+        expect(window.simpleWidgets[0].widgetConfig.type).to.equal(
+            "widget config"
+        );
+        expect(window.simpleWidgets[0].widgetConfig.name).to.equal("John");
         expect(window.simpleWidgets[0].widgetConfig.messageCount).to.equal(10);
     });
 });
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/browser.json b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/browser.json
index c08375151..09aecba39 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/browser.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-foo",
         "require: ./components/app-bar"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-bar/index.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-bar/index.js
index 54855c272..6a14e17a0 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-bar/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-bar/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.barWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-foo/index.js
index 4431e8f9e..4f5b7f980 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/marko.json b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/marko.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/tests.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/tests.js
index 9931f3a42..a17da6580 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/tests.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate-await-client-reorder/tests.js
@@ -1,20 +1,19 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it.skip('should initialize widgets before ready', function() {
+    it.skip("should initialize widgets before ready", function() {
         expect(window.afterInitWidgets_foo != null).to.equal(true);
         expect(window.afterInitWidgets_bar == null).to.equal(true);
 
         expect(window.afterReorderer_foo != null).to.equal(true);
         expect(window.afterReorderer_bar != null).to.equal(true);
     });
-    it('should initialize properly', function() {
+    it("should initialize properly", function() {
         expect(window.fooWidget != null).to.equal(true);
         expect(window.barWidget != null).to.equal(true);
 
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/browser.json b/test/components-pages/fixtures-deprecated/init-widgets-immediate/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/browser.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-bar/index.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-bar/index.js
index 54855c272..6a14e17a0 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-bar/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-bar/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.barWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-baz/index.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-baz/index.js
index 3d45f94f4..7a7c97675 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-baz/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-baz/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.bazWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-foo/index.js
index 171085471..051ba5647 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/components/app-foo/index.js
@@ -1,17 +1,17 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     getInitialState: function() {
         return {
-            type: 'state',
-            name: 'foo'
+            type: "state",
+            name: "foo"
         };
     },
 
     getWidgetConfig: function() {
         return {
-            type: 'config',
-            name: 'foo'
+            type: "config",
+            name: "foo"
         };
     },
 
@@ -19,4 +19,4 @@ module.exports = require('marko-widgets').defineComponent({
         window.fooWidget = this;
         this.widgetConfig = widgetConfig;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/marko.json b/test/components-pages/fixtures-deprecated/init-widgets-immediate/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/marko.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-immediate/tests.js b/test/components-pages/fixtures-deprecated/init-widgets-immediate/tests.js
index 6dd8ff998..0a185db5c 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-immediate/tests.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-immediate/tests.js
@@ -1,41 +1,41 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it.skip('should initialize widgets before ready', function() {
+    it.skip("should initialize widgets before ready", function() {
         expect(window.afterInitWidgetsFooWidget != null).to.equal(true);
         expect(window.afterInitWidgetsBarWidget != null).to.equal(true);
     });
 
-    it('should initialize properly',function() {
+    it("should initialize properly", function() {
         expect(window.fooWidget != null).to.equal(true);
         expect(window.barWidget != null).to.equal(true);
 
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
     });
 
-    it('should assign unique IDs to each widget', function() {
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
-        expect(window.bazWidget.id).to.be.a('string');
+    it("should assign unique IDs to each widget", function() {
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
+        expect(window.bazWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
         expect(window.fooWidget.id).to.not.equal(window.bazWidget.id);
         expect(window.bazWidget.id).to.contain(window.fooWidget.id);
     });
 
-    it('should assign a unique ID to a nested widget based on the parent ID', function() {
-        expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-');
+    it("should assign a unique ID to a nested widget based on the parent ID", function() {
+        expect(window.bazWidget.id).to.contain(window.fooWidget.id + "-");
     });
 
-    it('should serialize state correctly', function() {
-        expect(window.fooWidget.state.type).to.equal('state');
-        expect(window.fooWidget.state.name).to.equal('foo');
+    it("should serialize state correctly", function() {
+        expect(window.fooWidget.state.type).to.equal("state");
+        expect(window.fooWidget.state.name).to.equal("foo");
     });
 
-    it('should serialize widget config correctly', function() {
-        expect(window.fooWidget.widgetConfig.type).to.equal('config');
-        expect(window.fooWidget.widgetConfig.name).to.equal('foo');
+    it("should serialize widget config correctly", function() {
+        expect(window.fooWidget.widgetConfig.type).to.equal("config");
+        expect(window.fooWidget.widgetConfig.name).to.equal("foo");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/browser.json b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/browser.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-bar/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-bar/index.js
index 54855c272..6a14e17a0 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-bar/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-bar/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.barWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-baz/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-baz/index.js
index 3d45f94f4..7a7c97675 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-baz/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-baz/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.bazWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-foo/index.js
index 4431e8f9e..4f5b7f980 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/marko.json b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/marko.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/tests.js b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/tests.js
index ebccbbca0..d20655b12 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag-none/tests.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag-none/tests.js
@@ -1,33 +1,32 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize widgets after ready', function(done) {
-
+    it("should initialize widgets after ready", function(done) {
         expect(window.beforeInitWidgetsFooWidget).to.equal(undefined);
         expect(window.afterInitWidgetsBarWidget).to.equal(undefined);
 
         expect(window.fooWidget != null).to.equal(true);
         expect(window.barWidget != null).to.equal(true);
 
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
         done();
     });
 
-    it('should assign unique IDs to each widget', function(done) {
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
-        expect(window.bazWidget.id).to.be.a('string');
+    it("should assign unique IDs to each widget", function(done) {
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
+        expect(window.bazWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
         expect(window.fooWidget.id).to.not.equal(window.bazWidget.id);
         expect(window.bazWidget.id).to.contain(window.fooWidget.id);
         done();
     });
 
-    it('should assign a unique ID to a nested widget based on the parent ID', function(done) {
-        expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-');
+    it("should assign a unique ID to a nested widget based on the parent ID", function(done) {
+        expect(window.bazWidget.id).to.contain(window.fooWidget.id + "-");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/browser.json b/test/components-pages/fixtures-deprecated/init-widgets-tag/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/browser.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-bar/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-bar/index.js
index 54855c272..6a14e17a0 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-bar/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-bar/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.barWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-baz/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-baz/index.js
index 3d45f94f4..7a7c97675 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-baz/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-baz/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.bazWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-foo/index.js
index 4431e8f9e..4f5b7f980 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/marko.json b/test/components-pages/fixtures-deprecated/init-widgets-tag/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/marko.json
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/init-widgets-tag/tests.js b/test/components-pages/fixtures-deprecated/init-widgets-tag/tests.js
index ebccbbca0..d20655b12 100644
--- a/test/components-pages/fixtures-deprecated/init-widgets-tag/tests.js
+++ b/test/components-pages/fixtures-deprecated/init-widgets-tag/tests.js
@@ -1,33 +1,32 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize widgets after ready', function(done) {
-
+    it("should initialize widgets after ready", function(done) {
         expect(window.beforeInitWidgetsFooWidget).to.equal(undefined);
         expect(window.afterInitWidgetsBarWidget).to.equal(undefined);
 
         expect(window.fooWidget != null).to.equal(true);
         expect(window.barWidget != null).to.equal(true);
 
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
         done();
     });
 
-    it('should assign unique IDs to each widget', function(done) {
-        expect(window.fooWidget.id).to.be.a('string');
-        expect(window.barWidget.id).to.be.a('string');
-        expect(window.bazWidget.id).to.be.a('string');
+    it("should assign unique IDs to each widget", function(done) {
+        expect(window.fooWidget.id).to.be.a("string");
+        expect(window.barWidget.id).to.be.a("string");
+        expect(window.bazWidget.id).to.be.a("string");
         expect(window.fooWidget.id).to.not.equal(window.barWidget.id);
         expect(window.fooWidget.id).to.not.equal(window.bazWidget.id);
         expect(window.bazWidget.id).to.contain(window.fooWidget.id);
         done();
     });
 
-    it('should assign a unique ID to a nested widget based on the parent ID', function(done) {
-        expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-');
+    it("should assign a unique ID to a nested widget based on the parent ID", function(done) {
+        expect(window.bazWidget.id).to.contain(window.fooWidget.id + "-");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/browser.json b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/browser.json
+++ b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/components/app-foo/index.js
index 4431e8f9e..4f5b7f980 100644
--- a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/components/app-foo/index.js
@@ -1,7 +1,7 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     init: function() {
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/marko.json b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/marko.json
+++ b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/tests.js b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/tests.js
index d3d8190ad..8efdf5581 100644
--- a/test/components-pages/fixtures-deprecated/server-browser-unique-ids/tests.js
+++ b/test/components-pages/fixtures-deprecated/server-browser-unique-ids/tests.js
@@ -1,15 +1,16 @@
-var path = require('path');
-var expect = require('chai').expect;
-var appFooComponent = require('./components/app-foo');
+var path = require("path");
+var expect = require("chai").expect;
+var appFooComponent = require("./components/app-foo");
 
 describe(path.basename(__dirname), function() {
-    it('should generate a unique ID that is different for a UI component rendered on the server and browser', function() {
-
+    it("should generate a unique ID that is different for a UI component rendered on the server and browser", function() {
         var serverFooWidget = window.fooWidget;
-        var browserFooWidget = appFooComponent.renderSync({}).appendTo(document.body).getWidget();
-        expect(browserFooWidget.id).to.be.a('string');
-        expect(serverFooWidget.id).to.be.a('string');
+        var browserFooWidget = appFooComponent
+            .renderSync({})
+            .appendTo(document.body)
+            .getWidget();
+        expect(browserFooWidget.id).to.be.a("string");
+        expect(serverFooWidget.id).to.be.a("string");
         expect(serverFooWidget.id).to.not.equal(browserFooWidget.id);
     });
-
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/browser.json b/test/components-pages/fixtures-deprecated/split-widget-renderer/browser.json
index 141f17271..9da64d25b 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/browser.json
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-button-split/widget"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-button-split/widget"]
+}
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/index.js b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/index.js
index 720679a0b..5c2cbba90 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/index.js
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/index.js
@@ -1 +1 @@
-exports.render = require('./renderer').render;
\ No newline at end of file
+exports.render = require("./renderer").render;
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/marko-tag.json b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/marko-tag.json
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/renderer.js b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/renderer.js
index cd4f24f31..a73b79a4e 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/renderer.js
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/renderer.js
@@ -1,31 +1,31 @@
-module.exports = require('marko-widgets').defineRenderer({
-    template: require.resolve('./template.marko'),
+module.exports = require("marko-widgets").defineRenderer({
+    template: require.resolve("./template.marko"),
     getInitialBody: function(input) {
         return input.label || input.renderBody;
     },
     getTemplateData: function(state, input) {
         var rootAttrs = {};
 
-        var classParts = ['app-button'];
+        var classParts = ["app-button"];
 
-        var type = 'button';
+        var type = "button";
 
-        var variant = input.variant || 'primary';
-        if (variant !== 'primary') {
-            classParts.push('app-button-' + variant);
+        var variant = input.variant || "primary";
+        if (variant !== "primary") {
+            classParts.push("app-button-" + variant);
         }
 
-        var size = input.size || 'normal';
-        if (size !== 'normal') {
-            classParts.push('app-button-' + size);
+        var size = input.size || "normal";
+        if (size !== "normal") {
+            classParts.push("app-button-" + size);
         }
 
-        var className = input['class'];
+        var className = input["class"];
         if (className) {
             classParts.push(className);
         }
 
-        var splatAttrs = input['*'];
+        var splatAttrs = input["*"];
         if (splatAttrs) {
             for (var splatAttr in splatAttrs) {
                 if (splatAttrs.hasOwnProperty(splatAttr)) {
@@ -34,11 +34,11 @@ module.exports = require('marko-widgets').defineRenderer({
             }
         }
 
-        rootAttrs['class'] = classParts.join(' ');
+        rootAttrs["class"] = classParts.join(" ");
 
         return {
             type: type,
             rootAttrs: rootAttrs
         };
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/widget.js b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/widget.js
index 0a7a12ede..45b6b6ae4 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/widget.js
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/components/app-button-split/widget.js
@@ -1,4 +1,4 @@
-module.exports = require('marko-widgets').defineWidget({
+module.exports = require("marko-widgets").defineWidget({
     init: function() {
         window.appButtonSplit = this;
     },
@@ -8,4 +8,4 @@ module.exports = require('marko-widgets').defineWidget({
     setLabel: function(label) {
         this.el.innerHTML = label;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/marko.json b/test/components-pages/fixtures-deprecated/split-widget-renderer/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/marko.json
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/split-widget-renderer/tests.js b/test/components-pages/fixtures-deprecated/split-widget-renderer/tests.js
index 932e4db99..836986eca 100644
--- a/test/components-pages/fixtures-deprecated/split-widget-renderer/tests.js
+++ b/test/components-pages/fixtures-deprecated/split-widget-renderer/tests.js
@@ -1,11 +1,11 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow widget to be split from renderer', function() {
+    it("should allow widget to be split from renderer", function() {
         var widget = window.appButtonSplit;
-        expect(widget.el.innerHTML).to.equal('Test Button');
-        widget.setLabel('New Label');
-        expect(widget.el.innerHTML).to.equal('New Label');
+        expect(widget.el.innerHTML).to.equal("Test Button");
+        widget.setLabel("New Label");
+        expect(widget.el.innerHTML).to.equal("New Label");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/widget-config/browser.json b/test/components-pages/fixtures-deprecated/widget-config/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/widget-config/browser.json
+++ b/test/components-pages/fixtures-deprecated/widget-config/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-config/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/widget-config/components/app-foo/index.js
index 9afef97d6..2eda1fe89 100644
--- a/test/components-pages/fixtures-deprecated/widget-config/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/widget-config/components/app-foo/index.js
@@ -1,9 +1,9 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     getWidgetConfig: function() {
         return {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
@@ -11,4 +11,4 @@ module.exports = require('marko-widgets').defineComponent({
         this.widgetConfig = widgetConfig;
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/widget-config/marko.json b/test/components-pages/fixtures-deprecated/widget-config/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/widget-config/marko.json
+++ b/test/components-pages/fixtures-deprecated/widget-config/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-config/tests.js b/test/components-pages/fixtures-deprecated/widget-config/tests.js
index 0a8fa5095..d138dd508 100644
--- a/test/components-pages/fixtures-deprecated/widget-config/tests.js
+++ b/test/components-pages/fixtures-deprecated/widget-config/tests.js
@@ -1,8 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize widget config down to the browser', function() {
-        expect(window.fooWidget.widgetConfig.name).to.equal('app-foo');
+    it("should serialize widget config down to the browser", function() {
+        expect(window.fooWidget.widgetConfig.name).to.equal("app-foo");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/browser.json b/test/components-pages/fixtures-deprecated/widget-fixed-id/browser.json
index 22dc158c8..5ecb5f08c 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/browser.json
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-fixed-id",
         "require: ./components/app-hello/widget"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/index.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/index.js
index 266cee35f..130c92554 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/index.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/index.js
@@ -1,3 +1,3 @@
 // Export a render(input, callback) method that can be used
 // to render this UI component on the client or server
-require('marko-widgets').renderable(exports, require('./renderer'));
\ No newline at end of file
+require("marko-widgets").renderable(exports, require("./renderer"));
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/renderer.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/renderer.js
index 89efbb057..665778dd8 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/renderer.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/renderer.js
@@ -1,12 +1,14 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 exports.render = function(input, out) {
-    var label = input.label || 'app-fixed-id';
-    template.render({
+    var label = input.label || "app-fixed-id";
+    template.render(
+        {
             label: label,
             widgetConfig: {
                 label: label
             }
         },
-        out);
-};
\ No newline at end of file
+        out
+    );
+};
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/widget.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/widget.js
index 18c6d1f9e..90a262969 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/widget.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-fixed-id/widget.js
@@ -1,20 +1,20 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 function Widget(config) {
     this.label = config.label;
-    this.name = 'app-fixed-id';
+    this.name = "app-fixed-id";
     window.appFixedId = this;
 }
 
 Widget.prototype = {
     testGetWidget: function() {
-        var helloWidget = this.getWidget('hello');
+        var helloWidget = this.getWidget("hello");
         expect(helloWidget != null).to.equal(true);
     },
     testGetEl: function() {
-        var wrapperEl = this.getEl('wrapper');
+        var wrapperEl = this.getEl("wrapper");
         expect(wrapperEl != null).to.equal(true);
     }
 };
 
-exports.Widget = Widget;
\ No newline at end of file
+exports.Widget = Widget;
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/renderer.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/renderer.js
index a01d57f74..6930ef441 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/renderer.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/renderer.js
@@ -1,7 +1,7 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require("marko").load(require.resolve("./template.marko"));
 
 module.exports = function(input, out) {
-    var className = input['class'] || 'app-hello';
+    var className = input["class"] || "app-hello";
 
     template.render(
         {
@@ -11,6 +11,6 @@ module.exports = function(input, out) {
                 name: input.name
             }
         },
-        out);
-
-};
\ No newline at end of file
+        out
+    );
+};
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/widget.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/widget.js
index a841e3c71..78acfa4d9 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/widget.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/components/app-hello/widget.js
@@ -1,4 +1,4 @@
 exports.Widget = function(config) {
-    this.type = 'app-hello';
+    this.type = "app-hello";
     this.name = config.name;
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/marko.json b/test/components-pages/fixtures-deprecated/widget-fixed-id/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/marko.json
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-fixed-id/tests.js b/test/components-pages/fixtures-deprecated/widget-fixed-id/tests.js
index 35e95aa09..cb2b0b5a0 100644
--- a/test/components-pages/fixtures-deprecated/widget-fixed-id/tests.js
+++ b/test/components-pages/fixtures-deprecated/widget-fixed-id/tests.js
@@ -1,11 +1,11 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow fixed IDs for widgets', function() {
+    it("should allow fixed IDs for widgets", function() {
         var widget = window.appFixedId;
-        expect(widget.el.id).to.equal('appFixedId');
+        expect(widget.el.id).to.equal("appFixedId");
         widget.testGetWidget();
         widget.testGetEl();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/widget-state/browser.json b/test/components-pages/fixtures-deprecated/widget-state/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/widget-state/browser.json
+++ b/test/components-pages/fixtures-deprecated/widget-state/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-state/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/widget-state/components/app-foo/index.js
index 1d0299312..8f22a0993 100644
--- a/test/components-pages/fixtures-deprecated/widget-state/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/widget-state/components/app-foo/index.js
@@ -1,13 +1,13 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     getInitialState: function() {
         return {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
-    init: function(widgetConfig) {
+    init: function() {
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/widget-state/marko.json b/test/components-pages/fixtures-deprecated/widget-state/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/widget-state/marko.json
+++ b/test/components-pages/fixtures-deprecated/widget-state/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/widget-state/tests.js b/test/components-pages/fixtures-deprecated/widget-state/tests.js
index fa78ab510..939244341 100644
--- a/test/components-pages/fixtures-deprecated/widget-state/tests.js
+++ b/test/components-pages/fixtures-deprecated/widget-state/tests.js
@@ -1,8 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize widget config down to the browser', function() {
-        expect(window.fooWidget.state.name).to.equal('app-foo');
+    it("should serialize widget config down to the browser", function() {
+        expect(window.fooWidget.state.name).to.equal("app-foo");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/xss/browser.json b/test/components-pages/fixtures-deprecated/xss/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures-deprecated/xss/browser.json
+++ b/test/components-pages/fixtures-deprecated/xss/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures-deprecated/xss/components/app-foo/index.js b/test/components-pages/fixtures-deprecated/xss/components/app-foo/index.js
index ae0bd09af..5f4708f09 100644
--- a/test/components-pages/fixtures-deprecated/xss/components/app-foo/index.js
+++ b/test/components-pages/fixtures-deprecated/xss/components/app-foo/index.js
@@ -1,15 +1,15 @@
-module.exports = require('marko-widgets').defineComponent({
-    template: require('./template.marko'),
+module.exports = require("marko-widgets").defineComponent({
+    template: require("./template.marko"),
 
     getInitialState: function() {
         return {
-            'evil': '</script><script>alert("hello")</script>'
+            evil: '</script><script>alert("hello")</script>'
         };
     },
 
     getWidgetConfig: function() {
         return {
-            'evil': '</script><script>alert("hello")</script>'
+            evil: '</script><script>alert("hello")</script>'
         };
     },
 
@@ -17,4 +17,4 @@ module.exports = require('marko-widgets').defineComponent({
         this.widgetConfig = widgetConfig;
         window.fooWidget = this;
     }
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures-deprecated/xss/marko.json b/test/components-pages/fixtures-deprecated/xss/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures-deprecated/xss/marko.json
+++ b/test/components-pages/fixtures-deprecated/xss/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures-deprecated/xss/tests.js b/test/components-pages/fixtures-deprecated/xss/tests.js
index 48d5842ab..f6b11de80 100644
--- a/test/components-pages/fixtures-deprecated/xss/tests.js
+++ b/test/components-pages/fixtures-deprecated/xss/tests.js
@@ -1,18 +1,18 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-
-
-    it('should handle ending </script> tag', function(done) {
-
-        var ready = require('marko/ready');
+    it("should handle ending </script> tag", function(done) {
+        var ready = require("marko/ready");
 
         ready(function() {
-            expect(window.fooWidget.state.evil).to.equal('</script><script>alert("hello")</script>');
-            expect(window.fooWidget.widgetConfig.evil).to.equal('</script><script>alert("hello")</script>');
+            expect(window.fooWidget.state.evil).to.equal(
+                '</script><script>alert("hello")</script>'
+            );
+            expect(window.fooWidget.widgetConfig.evil).to.equal(
+                '</script><script>alert("hello")</script>'
+            );
             done();
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js b/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js
index 858f937f2..c1b344b67 100644
--- a/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js
+++ b/test/components-pages/fixtures/async-boundaries/components/app-hello-async/renderer.js
@@ -1,11 +1,14 @@
-var AppHello = require('../app-hello');
+var AppHello = require("../app-hello");
 
 module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
     setTimeout(function() {
-        AppHello.render({
-            name: input.name
-        }, asyncOut);
+        AppHello.render(
+            {
+                name: input.name
+            },
+            asyncOut
+        );
         asyncOut.end();
     }, 10);
 };
diff --git a/test/components-pages/fixtures/async-boundaries/components/app-hello/component.js b/test/components-pages/fixtures/async-boundaries/components/app-hello/component.js
index e43456321..ad774f46f 100644
--- a/test/components-pages/fixtures/async-boundaries/components/app-hello/component.js
+++ b/test/components-pages/fixtures/async-boundaries/components/app-hello/component.js
@@ -4,6 +4,6 @@ module.exports = {
     },
 
     onMount: function() {
-        this.type = 'app-hello';
+        this.type = "app-hello";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/async-boundaries/components/app-init-async/component.js b/test/components-pages/fixtures/async-boundaries/components/app-init-async/component.js
index ca6ddc3da..d9f287d30 100644
--- a/test/components-pages/fixtures/async-boundaries/components/app-init-async/component.js
+++ b/test/components-pages/fixtures/async-boundaries/components/app-init-async/component.js
@@ -1,30 +1,30 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
     onMount: function() {
         window.appInitAsync = this;
 
-        var helloFrank = this.getComponent('helloFrank');
-        var helloFrankAsync = this.getComponent('helloFrankAsync');
-        var helloJohn = this.getComponent('helloJohn');
-        var helloJohnAsync = this.getComponent('helloJohnAsync');
-        var helloJane = this.getComponent('helloJane');
+        var helloFrank = this.getComponent("helloFrank");
+        var helloFrankAsync = this.getComponent("helloFrankAsync");
+        var helloJohn = this.getComponent("helloJohn");
+        var helloJohnAsync = this.getComponent("helloJohnAsync");
+        var helloJane = this.getComponent("helloJane");
 
         this.test = function() {
-            expect(helloFrank).to.be.an('object');
-            expect(helloFrank.name).to.equal('Frank');
+            expect(helloFrank).to.be.an("object");
+            expect(helloFrank.name).to.equal("Frank");
 
-            expect(helloFrankAsync).to.be.an('object');
-            expect(helloFrankAsync.name).to.equal('Frank Async');
+            expect(helloFrankAsync).to.be.an("object");
+            expect(helloFrankAsync.name).to.equal("Frank Async");
 
-            expect(helloJohn).to.be.an('object');
-            expect(helloJohn.name).to.equal('John');
+            expect(helloJohn).to.be.an("object");
+            expect(helloJohn.name).to.equal("John");
 
-            expect(helloJohnAsync).to.be.an('object');
-            expect(helloJohnAsync.name).to.equal('John Async');
+            expect(helloJohnAsync).to.be.an("object");
+            expect(helloJohnAsync.name).to.equal("John Async");
 
-            expect(helloJane).to.be.an('object');
-            expect(helloJane.name).to.equal('Jane');
+            expect(helloJane).to.be.an("object");
+            expect(helloJane.name).to.equal("Jane");
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/async-boundaries/marko.json b/test/components-pages/fixtures/async-boundaries/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/async-boundaries/marko.json
+++ b/test/components-pages/fixtures/async-boundaries/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/async-boundaries/tests.js b/test/components-pages/fixtures/async-boundaries/tests.js
index 75960b35f..df449070d 100644
--- a/test/components-pages/fixtures/async-boundaries/tests.js
+++ b/test/components-pages/fixtures/async-boundaries/tests.js
@@ -1,9 +1,7 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components correctly across async boundaries', function() {
+    it("should initialize components correctly across async boundaries", function() {
         window.appInitAsync.test();
     });
 });
diff --git a/test/components-pages/fixtures/await-surround-html/tests.js b/test/components-pages/fixtures/await-surround-html/tests.js
index 4056ee0e7..3151239c0 100644
--- a/test/components-pages/fixtures/await-surround-html/tests.js
+++ b/test/components-pages/fixtures/await-surround-html/tests.js
@@ -1,8 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should mount components', function() {
+    it("should mount components", function() {
         expect(window.helloComponent != null).to.equal(true);
     });
 });
diff --git a/test/components-pages/fixtures/component-globals-async/browser.json b/test/components-pages/fixtures/component-globals-async/browser.json
index 046f8ec38..7231f4cdb 100644
--- a/test/components-pages/fixtures/component-globals-async/browser.json
+++ b/test/components-pages/fixtures/component-globals-async/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-hello"
-    ]
+    "dependencies": ["require: ./components/app-hello"]
 }
diff --git a/test/components-pages/fixtures/component-globals-async/marko.json b/test/components-pages/fixtures/component-globals-async/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/component-globals-async/marko.json
+++ b/test/components-pages/fixtures/component-globals-async/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/component-globals-async/tests.js b/test/components-pages/fixtures/component-globals-async/tests.js
index 102df68b4..f58fa65c0 100644
--- a/test/components-pages/fixtures/component-globals-async/tests.js
+++ b/test/components-pages/fixtures/component-globals-async/tests.js
@@ -1,18 +1,25 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow attributes to not be updated', function() {
+    it("should allow attributes to not be updated", function() {
         function testHelloComponent(helloComponent) {
-            expect(helloComponent.el.querySelector('.name').innerHTML).to.equal('Frank');
-            expect(helloComponent.el.querySelector('.count').innerHTML).to.equal('1');
+            expect(helloComponent.el.querySelector(".name").innerHTML).to.equal(
+                "Frank"
+            );
+            expect(
+                helloComponent.el.querySelector(".count").innerHTML
+            ).to.equal("1");
 
             helloComponent.state.count++;
             helloComponent.update();
 
-            expect(helloComponent.el.querySelector('.name').innerHTML).to.equal('Frank');
-            expect(helloComponent.el.querySelector('.count').innerHTML).to.equal('2');
+            expect(helloComponent.el.querySelector(".name").innerHTML).to.equal(
+                "Frank"
+            );
+            expect(
+                helloComponent.el.querySelector(".count").innerHTML
+            ).to.equal("2");
         }
 
         testHelloComponent(window.hello1);
diff --git a/test/components-pages/fixtures/component-globals/browser.json b/test/components-pages/fixtures/component-globals/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/component-globals/browser.json
+++ b/test/components-pages/fixtures/component-globals/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/component-globals/marko.json b/test/components-pages/fixtures/component-globals/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/component-globals/marko.json
+++ b/test/components-pages/fixtures/component-globals/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/component-globals/tests.js b/test/components-pages/fixtures/component-globals/tests.js
index 438c82491..86c5ed032 100644
--- a/test/components-pages/fixtures/component-globals/tests.js
+++ b/test/components-pages/fixtures/component-globals/tests.js
@@ -1,26 +1,37 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow attributes to not be updated', function() {
+    it("should allow attributes to not be updated", function() {
         var app = window.app;
-        var helloComponent = app.getComponent('hello');
+        var helloComponent = app.getComponent("hello");
 
-
-        expect(helloComponent.el.querySelector('.name').innerHTML).to.equal('Frank');
-        expect(helloComponent.el.querySelector('.count').innerHTML).to.equal('1');
+        expect(helloComponent.el.querySelector(".name").innerHTML).to.equal(
+            "Frank"
+        );
+        expect(helloComponent.el.querySelector(".count").innerHTML).to.equal(
+            "1"
+        );
 
         helloComponent.state.count++;
         helloComponent.update();
 
-        expect(helloComponent.el.querySelector('.name').innerHTML).to.equal('Frank');
-        expect(helloComponent.el.querySelector('.count').innerHTML).to.equal('2');
+        expect(helloComponent.el.querySelector(".name").innerHTML).to.equal(
+            "Frank"
+        );
+        expect(helloComponent.el.querySelector(".count").innerHTML).to.equal(
+            "2"
+        );
 
         app.forceUpdate();
         app.update();
 
-        helloComponent = app.getComponent('hello');
-        expect(helloComponent.el.querySelector('.name').innerHTML).to.equal('Frank');
-        expect(helloComponent.el.querySelector('.count').innerHTML).to.equal('2');
+        helloComponent = app.getComponent("hello");
+        expect(helloComponent.el.querySelector(".name").innerHTML).to.equal(
+            "Frank"
+        );
+        expect(helloComponent.el.querySelector(".count").innerHTML).to.equal(
+            "2"
+        );
     });
 });
diff --git a/test/components-pages/fixtures/component-init-async/browser.json b/test/components-pages/fixtures/component-init-async/browser.json
index 046f8ec38..7231f4cdb 100644
--- a/test/components-pages/fixtures/component-init-async/browser.json
+++ b/test/components-pages/fixtures/component-init-async/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-hello"
-    ]
+    "dependencies": ["require: ./components/app-hello"]
 }
diff --git a/test/components-pages/fixtures/component-init-async/marko.json b/test/components-pages/fixtures/component-init-async/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/component-init-async/marko.json
+++ b/test/components-pages/fixtures/component-init-async/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/component-init-async/tests.js b/test/components-pages/fixtures/component-init-async/tests.js
index b05627535..70f9f3fdc 100644
--- a/test/components-pages/fixtures/component-init-async/tests.js
+++ b/test/components-pages/fixtures/component-init-async/tests.js
@@ -1,17 +1,18 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow attributes to not be updated', function() {
+    it("should allow attributes to not be updated", function() {
         function testHelloComponent(name) {
             var helloComponent = window[name];
             expect(helloComponent !== undefined).to.equal(true);
-            expect(helloComponent.el.innerHTML).to.contain('Hello from ' + name + '!');
+            expect(helloComponent.el.innerHTML).to.contain(
+                "Hello from " + name + "!"
+            );
         }
 
-        testHelloComponent('hello1');
-        testHelloComponent('hello2');
-        testHelloComponent('hello3');
+        testHelloComponent("hello1");
+        testHelloComponent("hello2");
+        testHelloComponent("hello3");
     });
 });
diff --git a/test/components-pages/fixtures/component-mount-root-hasRenderBody/browser.json b/test/components-pages/fixtures/component-mount-root-hasRenderBody/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/component-mount-root-hasRenderBody/browser.json
+++ b/test/components-pages/fixtures/component-mount-root-hasRenderBody/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/component-mount-root-hasRenderBody/marko.json b/test/components-pages/fixtures/component-mount-root-hasRenderBody/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/component-mount-root-hasRenderBody/marko.json
+++ b/test/components-pages/fixtures/component-mount-root-hasRenderBody/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js b/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js
index ff884e311..e0dc5e68c 100644
--- a/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js
+++ b/test/components-pages/fixtures/component-mount-root-hasRenderBody/tests.js
@@ -1,36 +1,45 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 describe(path.basename(__dirname), function() {
-    it('should mount all components', function() {
+    it("should mount all components", function() {
         var app = window.app;
         expect(app != null).to.equal(true);
         expect(window.hello != null).to.equal(true);
     });
 
-    it('should have correct input', function() {
-        expect(window.app.input.name).to.equal('App');
-        expect(window.hello.input.name).to.equal('Marko');
+    it("should have correct input", function() {
+        expect(window.app.input.name).to.equal("App");
+        expect(window.hello.input.name).to.equal("Marko");
     });
 
-    it('should attach DOM events', function() {
+    it("should attach DOM events", function() {
         var app = window.app;
         triggerClick(app.el);
         expect(app.clicked).to.equal(true);
diff --git a/test/components-pages/fixtures/component-mount-root-renderBody/browser.json b/test/components-pages/fixtures/component-mount-root-renderBody/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/component-mount-root-renderBody/browser.json
+++ b/test/components-pages/fixtures/component-mount-root-renderBody/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/component-mount-root-renderBody/marko.json b/test/components-pages/fixtures/component-mount-root-renderBody/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/component-mount-root-renderBody/marko.json
+++ b/test/components-pages/fixtures/component-mount-root-renderBody/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/component-mount-root-renderBody/tests.js b/test/components-pages/fixtures/component-mount-root-renderBody/tests.js
index ff884e311..e0dc5e68c 100644
--- a/test/components-pages/fixtures/component-mount-root-renderBody/tests.js
+++ b/test/components-pages/fixtures/component-mount-root-renderBody/tests.js
@@ -1,36 +1,45 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 describe(path.basename(__dirname), function() {
-    it('should mount all components', function() {
+    it("should mount all components", function() {
         var app = window.app;
         expect(app != null).to.equal(true);
         expect(window.hello != null).to.equal(true);
     });
 
-    it('should have correct input', function() {
-        expect(window.app.input.name).to.equal('App');
-        expect(window.hello.input.name).to.equal('Marko');
+    it("should have correct input", function() {
+        expect(window.app.input.name).to.equal("App");
+        expect(window.hello.input.name).to.equal("Marko");
     });
 
-    it('should attach DOM events', function() {
+    it("should attach DOM events", function() {
         var app = window.app;
         triggerClick(app.el);
         expect(app.clicked).to.equal(true);
diff --git a/test/components-pages/fixtures/custom-events/browser.json b/test/components-pages/fixtures/custom-events/browser.json
index a2b94324e..d98daa24b 100644
--- a/test/components-pages/fixtures/custom-events/browser.json
+++ b/test/components-pages/fixtures/custom-events/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
+    "dependencies": ["require: ./components/app-foo"]
 }
diff --git a/test/components-pages/fixtures/custom-events/components/app-fancy-button/component.js b/test/components-pages/fixtures/custom-events/components/app-fancy-button/component.js
index aff0776ac..9efa97d72 100644
--- a/test/components-pages/fixtures/custom-events/components/app-fancy-button/component.js
+++ b/test/components-pages/fixtures/custom-events/components/app-fancy-button/component.js
@@ -1,5 +1,5 @@
 module.exports = {
     emitPressEvent: function() {
-        this.emit('press', { component: this });
+        this.emit("press", { component: this });
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/custom-events/components/app-foo/component.js b/test/components-pages/fixtures/custom-events/components/app-foo/component.js
index 899ae7dd5..6ae1159f2 100644
--- a/test/components-pages/fixtures/custom-events/components/app-foo/component.js
+++ b/test/components-pages/fixtures/custom-events/components/app-foo/component.js
@@ -1,10 +1,10 @@
 module.exports = {
-	onMount: function() {
-		window.fooComponent = this;
-		this.pressEvent = undefined;
-	},
+    onMount: function() {
+        window.fooComponent = this;
+        this.pressEvent = undefined;
+    },
 
-	handleButtonPress: function() {
-		this.pressEvent = arguments;
-	}
-};
\ No newline at end of file
+    handleButtonPress: function() {
+        this.pressEvent = arguments;
+    }
+};
diff --git a/test/components-pages/fixtures/custom-events/marko.json b/test/components-pages/fixtures/custom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/custom-events/marko.json
+++ b/test/components-pages/fixtures/custom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/custom-events/tests.js b/test/components-pages/fixtures/custom-events/tests.js
index 63728f7af..323d4317a 100644
--- a/test/components-pages/fixtures/custom-events/tests.js
+++ b/test/components-pages/fixtures/custom-events/tests.js
@@ -1,21 +1,24 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-
-    it('should invoke event handler method for custom events with extra args', function() {
+    it("should invoke event handler method for custom events with extra args", function() {
         var component = window.fooComponent;
 
         component.pressEvent = null;
 
-        component.getComponent('ok').emitPressEvent();
+        component.getComponent("ok").emitPressEvent();
 
-        expect(component.pressEvent[0].type).to.equal('ok');
-        expect(component.pressEvent[1].component).to.equal(component.getComponent('ok'));
+        expect(component.pressEvent[0].type).to.equal("ok");
+        expect(component.pressEvent[1].component).to.equal(
+            component.getComponent("ok")
+        );
 
-        component.getComponent('cancel').emitPressEvent();
+        component.getComponent("cancel").emitPressEvent();
 
-        expect(component.pressEvent[0].type).to.equal('cancel');
-        expect(component.pressEvent[1].component).to.equal(component.getComponent('cancel'));
+        expect(component.pressEvent[0].type).to.equal("cancel");
+        expect(component.pressEvent[1].component).to.equal(
+            component.getComponent("cancel")
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/diff-body-root/tests.js b/test/components-pages/fixtures/diff-body-root/tests.js
index fa01298f4..3fafcfb7b 100644
--- a/test/components-pages/fixtures/diff-body-root/tests.js
+++ b/test/components-pages/fixtures/diff-body-root/tests.js
@@ -1,15 +1,15 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing body at the root', function() {
+    it("should allow diffing body at the root", function() {
         var app = window.app;
-        var countEl = app.getEl('count');
-        expect(countEl.innerHTML).to.equal('0');
+        var countEl = app.getEl("count");
+        expect(countEl.innerHTML).to.equal("0");
 
         app.increment();
         app.update();
 
-        expect(countEl.innerHTML).to.equal('1');
+        expect(countEl.innerHTML).to.equal("1");
     });
 });
diff --git a/test/components-pages/fixtures/diff-body/tests.js b/test/components-pages/fixtures/diff-body/tests.js
index cfc32d4aa..2fd864a22 100644
--- a/test/components-pages/fixtures/diff-body/tests.js
+++ b/test/components-pages/fixtures/diff-body/tests.js
@@ -1,15 +1,15 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing body', function() {
+    it("should allow diffing body", function() {
         var app = window.app;
-        var countEl = app.getEl('count');
-        expect(countEl.innerHTML).to.equal('0');
+        var countEl = app.getEl("count");
+        expect(countEl.innerHTML).to.equal("0");
 
         app.increment();
         app.update();
 
-        expect(countEl.innerHTML).to.equal('1');
+        expect(countEl.innerHTML).to.equal("1");
     });
 });
diff --git a/test/components-pages/fixtures/diff-head-root/tests.js b/test/components-pages/fixtures/diff-head-root/tests.js
index 39c3b6f68..405cc9083 100644
--- a/test/components-pages/fixtures/diff-head-root/tests.js
+++ b/test/components-pages/fixtures/diff-head-root/tests.js
@@ -1,14 +1,14 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing head at the root', function() {
+    it("should allow diffing head at the root", function() {
         var app = window.app;
-        expect(document.head.getAttribute('count')).to.equal('0');
+        expect(document.head.getAttribute("count")).to.equal("0");
 
         app.increment();
         app.update();
 
-        expect(document.head.getAttribute('count')).to.equal('1');
+        expect(document.head.getAttribute("count")).to.equal("1");
     });
 });
diff --git a/test/components-pages/fixtures/diff-head/tests.js b/test/components-pages/fixtures/diff-head/tests.js
index 105087254..feccd3f36 100644
--- a/test/components-pages/fixtures/diff-head/tests.js
+++ b/test/components-pages/fixtures/diff-head/tests.js
@@ -1,14 +1,14 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing head', function() {
+    it("should allow diffing head", function() {
         var app = window.app;
-        expect(document.head.getAttribute('count')).to.equal('0');
+        expect(document.head.getAttribute("count")).to.equal("0");
 
         app.increment();
         app.update();
 
-        expect(document.head.getAttribute('count')).to.equal('1');
+        expect(document.head.getAttribute("count")).to.equal("1");
     });
 });
diff --git a/test/components-pages/fixtures/diff-html-include-layout/tests.js b/test/components-pages/fixtures/diff-html-include-layout/tests.js
index 27672a842..831dbeef0 100644
--- a/test/components-pages/fixtures/diff-html-include-layout/tests.js
+++ b/test/components-pages/fixtures/diff-html-include-layout/tests.js
@@ -1,14 +1,18 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing html', function() {
+    it("should allow diffing html", function() {
         var app = window.app;
-        expect(document.body.querySelector('span.count').innerHTML).to.equal('0');
+        expect(document.body.querySelector("span.count").innerHTML).to.equal(
+            "0"
+        );
 
         app.increment();
         app.update();
 
-        expect(document.body.querySelector('span.count').innerHTML).to.equal('1');
+        expect(document.body.querySelector("span.count").innerHTML).to.equal(
+            "1"
+        );
     });
 });
diff --git a/test/components-pages/fixtures/diff-html/tests.js b/test/components-pages/fixtures/diff-html/tests.js
index e06fc17f6..16ae95a36 100644
--- a/test/components-pages/fixtures/diff-html/tests.js
+++ b/test/components-pages/fixtures/diff-html/tests.js
@@ -1,14 +1,14 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing html', function() {
+    it("should allow diffing html", function() {
         var app = window.app;
-        expect(document.documentElement.getAttribute('count')).to.equal('0');
+        expect(document.documentElement.getAttribute("count")).to.equal("0");
 
         app.increment();
         app.update();
 
-        expect(document.documentElement.getAttribute('count')).to.equal('1');
+        expect(document.documentElement.getAttribute("count")).to.equal("1");
     });
 });
diff --git a/test/components-pages/fixtures/diff-title/tests.js b/test/components-pages/fixtures/diff-title/tests.js
index f819ac89f..10339f6f7 100644
--- a/test/components-pages/fixtures/diff-title/tests.js
+++ b/test/components-pages/fixtures/diff-title/tests.js
@@ -1,15 +1,15 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing title inside head', function() {
+    it("should allow diffing title inside head", function() {
         var app = window.app;
-        expect(document.title).to.equal('Count: 0');
+        expect(document.title).to.equal("Count: 0");
 
         app.increment();
         app.update();
 
         expect(app.state.count).to.equal(1);
-        expect(document.title).to.equal('Count: 1');
+        expect(document.title).to.equal("Count: 1");
     });
 });
diff --git a/test/components-pages/fixtures/dom-events-bubbling/browser.json b/test/components-pages/fixtures/dom-events-bubbling/browser.json
index 7bbd4af67..98c3b49d9 100644
--- a/test/components-pages/fixtures/dom-events-bubbling/browser.json
+++ b/test/components-pages/fixtures/dom-events-bubbling/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/*/index.marko"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/*/index.marko"]
+}
diff --git a/test/components-pages/fixtures/dom-events-bubbling/marko.json b/test/components-pages/fixtures/dom-events-bubbling/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/dom-events-bubbling/marko.json
+++ b/test/components-pages/fixtures/dom-events-bubbling/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/dom-events-bubbling/tests.js b/test/components-pages/fixtures/dom-events-bubbling/tests.js
index 19b56d284..45a3649c2 100644
--- a/test/components-pages/fixtures/dom-events-bubbling/tests.js
+++ b/test/components-pages/fixtures/dom-events-bubbling/tests.js
@@ -1,41 +1,50 @@
-var path = require('path');
+var path = require("path");
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 var helpers = {
     triggerMouseEvent: triggerMouseEvent,
-    triggerClick: triggerClick,
+    triggerClick: triggerClick
 };
 
 describe(path.basename(__dirname), function() {
-    it('should allow no args', function() {
-        window.components['no-args'].test(helpers);
+    it("should allow no args", function() {
+        window.components["no-args"].test(helpers);
     });
 
-    it('should allow one arg', function() {
-        window.components['one-arg'].test(helpers);
+    it("should allow one arg", function() {
+        window.components["one-arg"].test(helpers);
     });
 
-    it('should allow one arg as array', function() {
-        window.components['one-arg-array'].test(helpers);
+    it("should allow one arg as array", function() {
+        window.components["one-arg-array"].test(helpers);
     });
 
-    it('should allow two args', function() {
-        window.components['two-args'].test(helpers);
+    it("should allow two args", function() {
+        window.components["two-args"].test(helpers);
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/dom-events/browser.json b/test/components-pages/fixtures/dom-events/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/dom-events/browser.json
+++ b/test/components-pages/fixtures/dom-events/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/dom-events/components/app-foo/component.js b/test/components-pages/fixtures/dom-events/components/app-foo/component.js
index 5577f8d8a..495e8adc7 100644
--- a/test/components-pages/fixtures/dom-events/components/app-foo/component.js
+++ b/test/components-pages/fixtures/dom-events/components/app-foo/component.js
@@ -1,8 +1,7 @@
 module.exports = {
-
-    onInput: function(input) {
+    onInput: function() {
         this.state = {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
@@ -19,4 +18,4 @@ module.exports = {
     handleButtonClick: function() {
         this.clickEvent = arguments;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/dom-events/marko.json b/test/components-pages/fixtures/dom-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/dom-events/marko.json
+++ b/test/components-pages/fixtures/dom-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/dom-events/tests.js b/test/components-pages/fixtures/dom-events/tests.js
index b3b71d4d1..dbdfb677b 100644
--- a/test/components-pages/fixtures/dom-events/tests.js
+++ b/test/components-pages/fixtures/dom-events/tests.js
@@ -1,74 +1,97 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 describe(path.basename(__dirname), function() {
-    it('should invoke event handler method for non-bubbling events', function() {
+    it("should invoke event handler method for non-bubbling events", function() {
         window.fooComponent.mouseMoveEvent = null;
-        triggerMouseEvent(window.fooComponent.getEl('button'), 'mousemove');
+        triggerMouseEvent(window.fooComponent.getEl("button"), "mousemove");
         expect(window.fooComponent.mouseMoveEvent != null).to.equal(true);
 
-        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('mousemove');
-        expect(window.fooComponent.mouseMoveEvent[1]).to.equal(window.fooComponent.getEl('button'));
+        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal(
+            "mousemove"
+        );
+        expect(window.fooComponent.mouseMoveEvent[1]).to.equal(
+            window.fooComponent.getEl("button")
+        );
     });
 
-    it('should invoke event handler method for non-bubbling events with extra args', function() {
+    it("should invoke event handler method for non-bubbling events with extra args", function() {
         window.fooComponent.mouseMoveEvent = null;
 
-        triggerMouseEvent(window.fooComponent.getEl('ok'), 'mousemove');
+        triggerMouseEvent(window.fooComponent.getEl("ok"), "mousemove");
 
         expect(window.fooComponent.mouseMoveEvent != null).to.equal(true);
-        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('ok');
-        expect(window.fooComponent.mouseMoveEvent[1].type).to.equal('mousemove');
-        expect(window.fooComponent.mouseMoveEvent[2]).to.equal(window.fooComponent.getEl('ok'));
+        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal("ok");
+        expect(window.fooComponent.mouseMoveEvent[1].type).to.equal(
+            "mousemove"
+        );
+        expect(window.fooComponent.mouseMoveEvent[2]).to.equal(
+            window.fooComponent.getEl("ok")
+        );
 
-        triggerMouseEvent(window.fooComponent.getEl('cancel'), 'mousemove');
+        triggerMouseEvent(window.fooComponent.getEl("cancel"), "mousemove");
 
         expect(window.fooComponent.mouseMoveEvent != null).to.equal(true);
-        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('cancel');
-        expect(window.fooComponent.mouseMoveEvent[1].type).to.equal('mousemove');
-        expect(window.fooComponent.mouseMoveEvent[2]).to.equal(window.fooComponent.getEl('cancel'));
+        expect(window.fooComponent.mouseMoveEvent[0].type).to.equal("cancel");
+        expect(window.fooComponent.mouseMoveEvent[1].type).to.equal(
+            "mousemove"
+        );
+        expect(window.fooComponent.mouseMoveEvent[2]).to.equal(
+            window.fooComponent.getEl("cancel")
+        );
     });
 
-    it('should invoke event handler method for bubbling events', function() {
+    it("should invoke event handler method for bubbling events", function() {
         window.fooComponent.clickEvent = null;
-        triggerMouseEvent(window.fooComponent.getEl('button'), 'click');
+        triggerMouseEvent(window.fooComponent.getEl("button"), "click");
         expect(window.fooComponent.clickEvent != null).to.equal(true);
-        expect(window.fooComponent.clickEvent[0].type).to.equal('click');
-        expect(window.fooComponent.clickEvent[1]).to.equal(window.fooComponent.getEl('button'));
+        expect(window.fooComponent.clickEvent[0].type).to.equal("click");
+        expect(window.fooComponent.clickEvent[1]).to.equal(
+            window.fooComponent.getEl("button")
+        );
     });
 
-    it('should invoke event handler method for bubbling events with extra args', function() {
+    it("should invoke event handler method for bubbling events with extra args", function() {
         var component = window.fooComponent;
 
         window.fooComponent.clickEvent = null;
 
-    	triggerClick(component.getEl('ok'));
+        triggerClick(component.getEl("ok"));
 
-        expect(component.clickEvent[0].type).to.equal('ok');
-        expect(component.clickEvent[1].stopPropagation).to.be.a('function');
-        expect(component.clickEvent[2].innerHTML).to.equal('OK');
+        expect(component.clickEvent[0].type).to.equal("ok");
+        expect(component.clickEvent[1].stopPropagation).to.be.a("function");
+        expect(component.clickEvent[2].innerHTML).to.equal("OK");
 
-        triggerClick(component.getEl('cancel'));
+        triggerClick(component.getEl("cancel"));
 
-        expect(component.clickEvent[0].type).to.equal('cancel');
-        expect(component.clickEvent[1].stopPropagation).to.be.a('function');
-        expect(component.clickEvent[2].innerHTML).to.equal('Cancel');
+        expect(component.clickEvent[0].type).to.equal("cancel");
+        expect(component.clickEvent[1].stopPropagation).to.be.a("function");
+        expect(component.clickEvent[2].innerHTML).to.equal("Cancel");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/empty-component/tests.js b/test/components-pages/fixtures/empty-component/tests.js
index dc2bbbd43..546e6df38 100644
--- a/test/components-pages/fixtures/empty-component/tests.js
+++ b/test/components-pages/fixtures/empty-component/tests.js
@@ -1,8 +1,7 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing html', function() {
+    it("should allow diffing html", function() {
         var app = window.app;
         app.forceUpdate();
         app.update();
diff --git a/test/components-pages/fixtures/getEl-no-rerender/marko.json b/test/components-pages/fixtures/getEl-no-rerender/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/getEl-no-rerender/marko.json
+++ b/test/components-pages/fixtures/getEl-no-rerender/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/getEl-no-rerender/tests.js b/test/components-pages/fixtures/getEl-no-rerender/tests.js
index 4cbddbee9..0ef1096db 100644
--- a/test/components-pages/fixtures/getEl-no-rerender/tests.js
+++ b/test/components-pages/fixtures/getEl-no-rerender/tests.js
@@ -1,10 +1,10 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow getEl() with a split component', function() {
+    it("should allow getEl() with a split component", function() {
         var hello = window.hello;
-        expect(hello.getEl('button') != null).to.equal(true);
-        expect(hello.getEl('button').nodeName).to.equal('BUTTON');
+        expect(hello.getEl("button") != null).to.equal(true);
+        expect(hello.getEl("button").nodeName).to.equal("BUTTON");
     });
 });
diff --git a/test/components-pages/fixtures/getEl-split/marko.json b/test/components-pages/fixtures/getEl-split/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/getEl-split/marko.json
+++ b/test/components-pages/fixtures/getEl-split/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/getEl-split/tests.js b/test/components-pages/fixtures/getEl-split/tests.js
index 499182d78..8547fa663 100644
--- a/test/components-pages/fixtures/getEl-split/tests.js
+++ b/test/components-pages/fixtures/getEl-split/tests.js
@@ -1,10 +1,10 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow getEl() with a split component', function() {
+    it("should allow getEl() with a split component", function() {
         var splitComponent = window.splitComponent;
-        expect(splitComponent.getEl('button') != null).to.equal(true);
-        expect(splitComponent.getEl('button').nodeName).to.equal('BUTTON');
+        expect(splitComponent.getEl("button") != null).to.equal(true);
+        expect(splitComponent.getEl("button").nodeName).to.equal("BUTTON");
     });
 });
diff --git a/test/components-pages/fixtures/getRenderedWidgets/browser.json b/test/components-pages/fixtures/getRenderedWidgets/browser.json
index 46d494be0..eb933998f 100644
--- a/test/components-pages/fixtures/getRenderedWidgets/browser.json
+++ b/test/components-pages/fixtures/getRenderedWidgets/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require-run: ./components/app-simple"
-    ]
+    "dependencies": ["require-run: ./components/app-simple"]
 }
diff --git a/test/components-pages/fixtures/getRenderedWidgets/components/app-simple/component.js b/test/components-pages/fixtures/getRenderedWidgets/components/app-simple/component.js
index d707f883a..c2d1567f8 100644
--- a/test/components-pages/fixtures/getRenderedWidgets/components/app-simple/component.js
+++ b/test/components-pages/fixtures/getRenderedWidgets/components/app-simple/component.js
@@ -1,27 +1,27 @@
-if (typeof window !== 'undefined') {
-	window.simpleComponents = [];
+if (typeof window !== "undefined") {
+    window.simpleComponents = [];
 }
 
 module.exports = {
-	onInput: function(input) {
-		this.type = 'component config';
-		this.name = input.name;
-		this.messageCount = input.messageCount;
+    onInput: function(input) {
+        this.type = "component config";
+        this.name = input.name;
+        this.messageCount = input.messageCount;
 
-		this.state = {
-			type: 'component state',
-			name: input.name,
+        this.state = {
+            type: "component state",
+            name: input.name,
             messageCount: input.messageCount
-		};
-	},
+        };
+    },
 
-	onMount: function() {
-		window.simpleComponents.push(this);
+    onMount: function() {
+        window.simpleComponents.push(this);
 
-		this.componentConfig = {
+        this.componentConfig = {
             type: this.type,
             name: this.name,
             messageCount: this.messageCount
         };
-	}
-};
\ No newline at end of file
+    }
+};
diff --git a/test/components-pages/fixtures/getRenderedWidgets/marko.json b/test/components-pages/fixtures/getRenderedWidgets/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/getRenderedWidgets/marko.json
+++ b/test/components-pages/fixtures/getRenderedWidgets/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/getRenderedWidgets/tests.js b/test/components-pages/fixtures/getRenderedWidgets/tests.js
index bd49d2190..1024521a1 100644
--- a/test/components-pages/fixtures/getRenderedWidgets/tests.js
+++ b/test/components-pages/fixtures/getRenderedWidgets/tests.js
@@ -1,37 +1,49 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
+var markoComponents = require("marko/components");
 
 describe(path.basename(__dirname), function() {
-
-    it('should serialize component config down to the browser', function() {
+    it("should serialize component config down to the browser", function() {
         expect(window.simpleComponents).to.deep.equal([]);
 
         var components = window.components;
         var html = components.html;
         var componentIds = components.componentIds;
 
-        document.getElementById('testsTarget').innerHTML = html; // Add the HTML to the DOM
+        document.getElementById("testsTarget").innerHTML = html; // Add the HTML to the DOM
 
         // Initialize the components to bind behavior!
         markoComponents.init(componentIds);
 
         expect(window.simpleComponents.length).to.equal(2);
-        expect(window.simpleComponents[0].state.type).to.equal('component state');
-        expect(window.simpleComponents[0].state.name).to.equal('John');
+        expect(window.simpleComponents[0].state.type).to.equal(
+            "component state"
+        );
+        expect(window.simpleComponents[0].state.name).to.equal("John");
         expect(window.simpleComponents[0].state.messageCount).to.equal(10);
-        expect(window.simpleComponents[0].componentConfig.type).to.equal('component config');
-        expect(window.simpleComponents[0].componentConfig.name).to.equal('John');
-        expect(window.simpleComponents[0].componentConfig.messageCount).to.equal(10);
+        expect(window.simpleComponents[0].componentConfig.type).to.equal(
+            "component config"
+        );
+        expect(window.simpleComponents[0].componentConfig.name).to.equal(
+            "John"
+        );
+        expect(
+            window.simpleComponents[0].componentConfig.messageCount
+        ).to.equal(10);
 
-
-        expect(window.simpleComponents[1].state.type).to.equal('component state');
-        expect(window.simpleComponents[1].state.name).to.equal('Frank');
+        expect(window.simpleComponents[1].state.type).to.equal(
+            "component state"
+        );
+        expect(window.simpleComponents[1].state.name).to.equal("Frank");
         expect(window.simpleComponents[1].state.messageCount).to.equal(20);
-        expect(window.simpleComponents[1].componentConfig.type).to.equal('component config');
-        expect(window.simpleComponents[1].componentConfig.name).to.equal('Frank');
-        expect(window.simpleComponents[1].componentConfig.messageCount).to.equal(20);
-
-
+        expect(window.simpleComponents[1].componentConfig.type).to.equal(
+            "component config"
+        );
+        expect(window.simpleComponents[1].componentConfig.name).to.equal(
+            "Frank"
+        );
+        expect(
+            window.simpleComponents[1].componentConfig.messageCount
+        ).to.equal(20);
     });
 });
diff --git a/test/components-pages/fixtures/if-empty-component/tests.js b/test/components-pages/fixtures/if-empty-component/tests.js
index d401cab2c..230c3a022 100644
--- a/test/components-pages/fixtures/if-empty-component/tests.js
+++ b/test/components-pages/fixtures/if-empty-component/tests.js
@@ -1,8 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing html', function() {
+    it("should allow diffing html", function() {
         var app = window.app;
         app.forceUpdate();
         app.update();
diff --git a/test/components-pages/fixtures/implicit-component-root/tests.js b/test/components-pages/fixtures/implicit-component-root/tests.js
index ad8c3a919..b1b0b4fc0 100644
--- a/test/components-pages/fixtures/implicit-component-root/tests.js
+++ b/test/components-pages/fixtures/implicit-component-root/tests.js
@@ -1,12 +1,14 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should mount explicit components', function() {
+    it("should mount explicit components", function() {
         expect(window.helloExplicitComponent != null).to.equal(true);
     });
 
-    it('should mount implicit components nested in an explicit component', function() {
-        expect(window.helloExplicitComponent.getComponent('nested') != null).to.equal(true);
+    it("should mount implicit components nested in an explicit component", function() {
+        expect(
+            window.helloExplicitComponent.getComponent("nested") != null
+        ).to.equal(true);
     });
 });
diff --git a/test/components-pages/fixtures/include-input-preserve-focus/tests.js b/test/components-pages/fixtures/include-input-preserve-focus/tests.js
index 167c4ac65..471b3515d 100644
--- a/test/components-pages/fixtures/include-input-preserve-focus/tests.js
+++ b/test/components-pages/fixtures/include-input-preserve-focus/tests.js
@@ -1,10 +1,10 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should update correctly', function() {
+    it("should update correctly", function() {
         var component = window.component;
-        var input = component.getEl('input');
+        var input = component.getEl("input");
 
         input.focus();
         expect(document.activeElement).to.eql(input);
diff --git a/test/components-pages/fixtures/include-preserve/browser.json b/test/components-pages/fixtures/include-preserve/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/include-preserve/browser.json
+++ b/test/components-pages/fixtures/include-preserve/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/include-preserve/marko.json b/test/components-pages/fixtures/include-preserve/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/include-preserve/marko.json
+++ b/test/components-pages/fixtures/include-preserve/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/include-preserve/tests.js b/test/components-pages/fixtures/include-preserve/tests.js
index d32dd8326..8e7ea5b3e 100644
--- a/test/components-pages/fixtures/include-preserve/tests.js
+++ b/test/components-pages/fixtures/include-preserve/tests.js
@@ -1,7 +1,7 @@
-var path = require('path');
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('preserve content included on the server', function() {
+    it("preserve content included on the server", function() {
         window.app.test();
     });
 });
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/browser.json b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/browser.json
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js
index ba0efe564..13901d5bb 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js
@@ -1,22 +1,21 @@
 module.exports = {
-    onInput: function(input) {
+    onInput: function() {
         var parent = {
-            child: {
-            }
+            child: {}
         };
 
         parent.child.parent = parent;
 
         this.state = {
-            name: 'app-foo',
+            name: "app-foo",
             parent: parent
         };
     },
 
-    onMount: function(componentConfig) {
+    onMount: function() {
         if (!window.fooComponents) {
             window.fooComponents = [];
         }
         window.fooComponents.push(this);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/marko.json b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/marko.json
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/tests.js b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/tests.js
index 1880b16a3..7fa415096 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/tests.js
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded-multiple-async/tests.js
@@ -1,9 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize all components', function() {
+    it("should initialize all components", function() {
         expect(window.fooComponents.length).to.equal(2);
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/browser.json b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/browser.json
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/components/app-foo/component.js
index 81738931e..080a2d210 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/components/app-foo/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function(input) {
+    onInput: function() {
         this.state = {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/marko.json b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/marko.json
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/tests.js b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/tests.js
index 408db7acc..5744eb837 100644
--- a/test/components-pages/fixtures/init-widgets-before-widgets-loaded/tests.js
+++ b/test/components-pages/fixtures/init-widgets-before-widgets-loaded/tests.js
@@ -1,9 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize component config down to the browser', function() {
-        expect(window.fooComponent.state.name).to.equal('app-foo');
+    it("should serialize component config down to the browser", function() {
+        expect(window.fooComponent.state.name).to.equal("app-foo");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/browser.json b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/browser.json
index c08375151..09aecba39 100644
--- a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/browser.json
+++ b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-foo",
         "require: ./components/app-bar"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-bar/component.js b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-bar/component.js
index 8df0876aa..7e229a4fb 100644
--- a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-bar/component.js
+++ b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-bar/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.barComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-foo/component.js
index 97bd15bd1..56a27cd6e 100644
--- a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/components/app-foo/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/marko.json b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/marko.json
+++ b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/tests.js b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/tests.js
index f5ea8e072..38d4b307a 100644
--- a/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/tests.js
+++ b/test/components-pages/fixtures/init-widgets-immediate-await-client-reorder/tests.js
@@ -1,10 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components before ready', function() {
-
+    it("should initialize components before ready", function() {
         expect(window.afterInitComponents_foo != null).to.equal(true);
         expect(window.afterInitComponents_bar == null).to.equal(true);
 
@@ -14,7 +12,7 @@ describe(path.basename(__dirname), function() {
         expect(window.fooComponent != null).to.equal(true);
         expect(window.barComponent != null).to.equal(true);
 
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/init-widgets-immediate/browser.json b/test/components-pages/fixtures/init-widgets-immediate/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/browser.json
+++ b/test/components-pages/fixtures/init-widgets-immediate/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-immediate/components/app-bar/component.js b/test/components-pages/fixtures/init-widgets-immediate/components/app-bar/component.js
index 8df0876aa..7e229a4fb 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/components/app-bar/component.js
+++ b/test/components-pages/fixtures/init-widgets-immediate/components/app-bar/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.barComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-immediate/components/app-baz/component.js b/test/components-pages/fixtures/init-widgets-immediate/components/app-baz/component.js
index 03767f4bd..c284a2b1b 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/components/app-baz/component.js
+++ b/test/components-pages/fixtures/init-widgets-immediate/components/app-baz/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.bazComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-immediate/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-immediate/components/app-foo/component.js
index f8f03710b..9f769b97e 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-immediate/components/app-foo/component.js
@@ -1,11 +1,11 @@
 module.exports = {
     onInput: function() {
         this.state = {
-            type: 'state',
-            name: 'foo'
+            type: "state",
+            name: "foo"
         };
-        this.type = 'config';
-        this.name = 'foo';
+        this.type = "config";
+        this.name = "foo";
     },
 
     onMount: function() {
@@ -15,4 +15,4 @@ module.exports = {
             name: this.name
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-immediate/marko.json b/test/components-pages/fixtures/init-widgets-immediate/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/marko.json
+++ b/test/components-pages/fixtures/init-widgets-immediate/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-immediate/tests.js b/test/components-pages/fixtures/init-widgets-immediate/tests.js
index 678a7f8cd..d568e6a26 100644
--- a/test/components-pages/fixtures/init-widgets-immediate/tests.js
+++ b/test/components-pages/fixtures/init-widgets-immediate/tests.js
@@ -1,41 +1,39 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components before ready', function() {
-
+    it("should initialize components before ready", function() {
         expect(window.afterInitComponentsFooComponent != null).to.equal(true);
         expect(window.afterInitComponentsBarComponent != null).to.equal(true);
 
         expect(window.fooComponent != null).to.equal(true);
         expect(window.barComponent != null).to.equal(true);
 
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
     });
 
-    it('should assign unique IDs to each component', function() {
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
-        expect(window.bazComponent.id).to.be.a('string');
+    it("should assign unique IDs to each component", function() {
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
+        expect(window.bazComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
         expect(window.fooComponent.id).to.not.equal(window.bazComponent.id);
         expect(window.bazComponent.id).to.contain(window.fooComponent.id);
     });
 
-    it('should assign a unique ID to a nested component based on the parent ID', function() {
-        expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-');
+    it("should assign a unique ID to a nested component based on the parent ID", function() {
+        expect(window.bazComponent.id).to.contain(window.fooComponent.id + "-");
     });
 
-    it('should serialize state correctly', function() {
-        expect(window.fooComponent.state.type).to.equal('state');
-        expect(window.fooComponent.state.name).to.equal('foo');
+    it("should serialize state correctly", function() {
+        expect(window.fooComponent.state.type).to.equal("state");
+        expect(window.fooComponent.state.name).to.equal("foo");
     });
 
-    it('should serialize component config correctly', function() {
-        expect(window.fooComponent.componentConfig.type).to.equal('config');
-        expect(window.fooComponent.componentConfig.name).to.equal('foo');
+    it("should serialize component config correctly", function() {
+        expect(window.fooComponent.componentConfig.type).to.equal("config");
+        expect(window.fooComponent.componentConfig.name).to.equal("foo");
     });
 });
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/browser.json b/test/components-pages/fixtures/init-widgets-tag-none/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/browser.json
+++ b/test/components-pages/fixtures/init-widgets-tag-none/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/components/app-bar/component.js b/test/components-pages/fixtures/init-widgets-tag-none/components/app-bar/component.js
index 8df0876aa..7e229a4fb 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/components/app-bar/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag-none/components/app-bar/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.barComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/components/app-baz/component.js b/test/components-pages/fixtures/init-widgets-tag-none/components/app-baz/component.js
index 03767f4bd..c284a2b1b 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/components/app-baz/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag-none/components/app-baz/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.bazComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-tag-none/components/app-foo/component.js
index 97bd15bd1..56a27cd6e 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag-none/components/app-foo/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/marko.json b/test/components-pages/fixtures/init-widgets-tag-none/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/marko.json
+++ b/test/components-pages/fixtures/init-widgets-tag-none/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-tag-none/tests.js b/test/components-pages/fixtures/init-widgets-tag-none/tests.js
index fa688591c..980e0322e 100644
--- a/test/components-pages/fixtures/init-widgets-tag-none/tests.js
+++ b/test/components-pages/fixtures/init-widgets-tag-none/tests.js
@@ -1,34 +1,32 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components after ready', function(done) {
-
+    it("should initialize components after ready", function(done) {
         expect(window.beforeInitComponentsFooComponent).to.equal(undefined);
         expect(window.afterInitComponentsBarComponent).to.equal(undefined);
 
         expect(window.fooComponent != null).to.equal(true);
         expect(window.barComponent != null).to.equal(true);
 
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
         done();
     });
 
-    it('should assign unique IDs to each component', function(done) {
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
-        expect(window.bazComponent.id).to.be.a('string');
+    it("should assign unique IDs to each component", function(done) {
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
+        expect(window.bazComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
         expect(window.fooComponent.id).to.not.equal(window.bazComponent.id);
         expect(window.bazComponent.id).to.contain(window.fooComponent.id);
         done();
     });
 
-    it('should assign a unique ID to a nested component based on the parent ID', function(done) {
-        expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-');
+    it("should assign a unique ID to a nested component based on the parent ID", function(done) {
+        expect(window.bazComponent.id).to.contain(window.fooComponent.id + "-");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/init-widgets-tag/browser.json b/test/components-pages/fixtures/init-widgets-tag/browser.json
index 8220c1210..a6c188365 100644
--- a/test/components-pages/fixtures/init-widgets-tag/browser.json
+++ b/test/components-pages/fixtures/init-widgets-tag/browser.json
@@ -4,4 +4,4 @@
         "require: ./components/app-bar",
         "require: ./components/app-baz"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-tag/components/app-bar/component.js b/test/components-pages/fixtures/init-widgets-tag/components/app-bar/component.js
index 8df0876aa..7e229a4fb 100644
--- a/test/components-pages/fixtures/init-widgets-tag/components/app-bar/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag/components/app-bar/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.barComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag/components/app-baz/component.js b/test/components-pages/fixtures/init-widgets-tag/components/app-baz/component.js
index 03767f4bd..c284a2b1b 100644
--- a/test/components-pages/fixtures/init-widgets-tag/components/app-baz/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag/components/app-baz/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.bazComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag/components/app-foo/component.js b/test/components-pages/fixtures/init-widgets-tag/components/app-foo/component.js
index 97bd15bd1..56a27cd6e 100644
--- a/test/components-pages/fixtures/init-widgets-tag/components/app-foo/component.js
+++ b/test/components-pages/fixtures/init-widgets-tag/components/app-foo/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/init-widgets-tag/marko.json b/test/components-pages/fixtures/init-widgets-tag/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/init-widgets-tag/marko.json
+++ b/test/components-pages/fixtures/init-widgets-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/init-widgets-tag/tests.js b/test/components-pages/fixtures/init-widgets-tag/tests.js
index fa688591c..980e0322e 100644
--- a/test/components-pages/fixtures/init-widgets-tag/tests.js
+++ b/test/components-pages/fixtures/init-widgets-tag/tests.js
@@ -1,34 +1,32 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components after ready', function(done) {
-
+    it("should initialize components after ready", function(done) {
         expect(window.beforeInitComponentsFooComponent).to.equal(undefined);
         expect(window.afterInitComponentsBarComponent).to.equal(undefined);
 
         expect(window.fooComponent != null).to.equal(true);
         expect(window.barComponent != null).to.equal(true);
 
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
         done();
     });
 
-    it('should assign unique IDs to each component', function(done) {
-        expect(window.fooComponent.id).to.be.a('string');
-        expect(window.barComponent.id).to.be.a('string');
-        expect(window.bazComponent.id).to.be.a('string');
+    it("should assign unique IDs to each component", function(done) {
+        expect(window.fooComponent.id).to.be.a("string");
+        expect(window.barComponent.id).to.be.a("string");
+        expect(window.bazComponent.id).to.be.a("string");
         expect(window.fooComponent.id).to.not.equal(window.barComponent.id);
         expect(window.fooComponent.id).to.not.equal(window.bazComponent.id);
         expect(window.bazComponent.id).to.contain(window.fooComponent.id);
         done();
     });
 
-    it('should assign a unique ID to a nested component based on the parent ID', function(done) {
-        expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-');
+    it("should assign a unique ID to a nested component based on the parent ID", function(done) {
+        expect(window.bazComponent.id).to.contain(window.fooComponent.id + "-");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/lifecycle-events/browser.json b/test/components-pages/fixtures/lifecycle-events/browser.json
index f1ccaeb1d..ff072b2bc 100644
--- a/test/components-pages/fixtures/lifecycle-events/browser.json
+++ b/test/components-pages/fixtures/lifecycle-events/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/**/index.marko",
         "require: ./components/**/component.js"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js
index 1642dfa77..a1640ee97 100644
--- a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js
+++ b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js
@@ -1,20 +1,19 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 function Component() {
-    throw new Error('THIS SHOULD NOT BE CALLED');
+    throw new Error("THIS SHOULD NOT BE CALLED");
 }
 
 Component.prototype = {
-
     onCreate: function(input, out) {
         // if (typeof window !== 'undefined') {
         //     throw new Error('onCreate should not be called in the browser');
         // }
         if (this.state != null) {
-            throw new Error('this.state should be undefined');
+            throw new Error("this.state should be undefined");
         }
         this.state = {
-            events: ['onCreate']
+            events: ["onCreate"]
         };
 
         this.onCreateInputName = input.name;
@@ -26,7 +25,7 @@ Component.prototype = {
         //     throw new Error('onRender should not be called in the browser');
         // }
 
-        this.state.events.push('onRender');
+        this.state.events.push("onRender");
 
         if (!out || !out.write) {
             throw new Error('"out" argument expected');
@@ -38,18 +37,22 @@ Component.prototype = {
         //     throw new Error('onInput should not be called in the browser');
         // }
 
-        this.state.events.push('onInput[' + input.name + ']');
+        this.state.events.push("onInput[" + input.name + "]");
     },
 
     onMount: function() {
         var componentsLookup = window.components || (window.components = {});
-        componentsLookup['lifecycle-events-component-class-ctor'] = this;
+        componentsLookup["lifecycle-events-component-class-ctor"] = this;
     },
 
     test: function() {
-        expect(this.state.events).to.deep.equal(['onCreate', 'onInput[Frank]', 'onRender']);
-        expect(this.onCreateInputName).to.equal('Frank');
-        expect(this.onCreateOutName).to.equal('FrankGlobal');
+        expect(this.state.events).to.deep.equal([
+            "onCreate",
+            "onInput[Frank]",
+            "onRender"
+        ]);
+        expect(this.onCreateInputName).to.equal("Frank");
+        expect(this.onCreateOutName).to.equal("FrankGlobal");
     }
 };
 
diff --git a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class/component.js b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class/component.js
index df5446b0f..889d1e568 100644
--- a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class/component.js
+++ b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-class/component.js
@@ -1,8 +1,6 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-function Component() {
-
-}
+function Component() {}
 
 Component.prototype = {
     onCreate: function(input, out) {
@@ -10,10 +8,10 @@ Component.prototype = {
         //     throw new Error('onCreate should not be called in the browser');
         // }
         if (this.state != null) {
-            throw new Error('this.state should be undefined');
+            throw new Error("this.state should be undefined");
         }
         this.state = {
-            events: ['onCreate']
+            events: ["onCreate"]
         };
 
         this.onCreateInputName = input.name;
@@ -25,7 +23,7 @@ Component.prototype = {
         //     throw new Error('onRender should not be called in the browser');
         // }
 
-        this.state.events.push('onRender');
+        this.state.events.push("onRender");
 
         if (!out || !out.write) {
             throw new Error('"out" argument expected');
@@ -37,18 +35,22 @@ Component.prototype = {
         //     throw new Error('onInput should not be called in the browser');
         // }
 
-        this.state.events.push('onInput[' + input.name + ']');
+        this.state.events.push("onInput[" + input.name + "]");
     },
 
     onMount: function() {
         var componentsLookup = window.components || (window.components = {});
-        componentsLookup['lifecycle-events-component-class'] = this;
+        componentsLookup["lifecycle-events-component-class"] = this;
     },
 
     test: function() {
-        expect(this.state.events).to.deep.equal(['onCreate', 'onInput[Frank]', 'onRender']);
-        expect(this.onCreateInputName).to.equal('Frank');
-        expect(this.onCreateOutName).to.equal('FrankGlobal');
+        expect(this.state.events).to.deep.equal([
+            "onCreate",
+            "onInput[Frank]",
+            "onRender"
+        ]);
+        expect(this.onCreateInputName).to.equal("Frank");
+        expect(this.onCreateOutName).to.equal("FrankGlobal");
     }
 };
 
diff --git a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-object/component.js b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-object/component.js
index 61263f4b7..630332207 100644
--- a/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-object/component.js
+++ b/test/components-pages/fixtures/lifecycle-events/components/lifecycle-events-component-object/component.js
@@ -1,4 +1,4 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
     onCreate: function(input, out) {
@@ -6,10 +6,10 @@ module.exports = {
         //     throw new Error('onCreate should not be called in the browser');
         // }
         if (this.state != null) {
-            throw new Error('this.state should be undefined');
+            throw new Error("this.state should be undefined");
         }
         this.state = {
-            events: ['onCreate']
+            events: ["onCreate"]
         };
 
         this.onCreateInputName = input.name;
@@ -21,7 +21,7 @@ module.exports = {
         //     throw new Error('onRender should not be called in the browser');
         // }
 
-        this.state.events.push('onRender');
+        this.state.events.push("onRender");
 
         if (!out || !out.write) {
             throw new Error('"out" argument expected');
@@ -33,17 +33,21 @@ module.exports = {
         //     throw new Error('onInput should not be called in the browser');
         // }
 
-        this.state.events.push('onInput[' + input.name + ']');
+        this.state.events.push("onInput[" + input.name + "]");
     },
 
     onMount: function() {
         var componentsLookup = window.components || (window.components = {});
-        componentsLookup['lifecycle-events-component-object'] = this;
+        componentsLookup["lifecycle-events-component-object"] = this;
     },
 
     test: function() {
-        expect(this.state.events).to.deep.equal(['onCreate', 'onInput[Frank]', 'onRender']);
-        expect(this.onCreateInputName).to.equal('Frank');
-        expect(this.onCreateOutName).to.equal('FrankGlobal');
+        expect(this.state.events).to.deep.equal([
+            "onCreate",
+            "onInput[Frank]",
+            "onRender"
+        ]);
+        expect(this.onCreateInputName).to.equal("Frank");
+        expect(this.onCreateOutName).to.equal("FrankGlobal");
     }
 };
diff --git a/test/components-pages/fixtures/lifecycle-events/marko.json b/test/components-pages/fixtures/lifecycle-events/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/lifecycle-events/marko.json
+++ b/test/components-pages/fixtures/lifecycle-events/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/lifecycle-events/tests.js b/test/components-pages/fixtures/lifecycle-events/tests.js
index ed095672d..33dda3303 100644
--- a/test/components-pages/fixtures/lifecycle-events/tests.js
+++ b/test/components-pages/fixtures/lifecycle-events/tests.js
@@ -1,23 +1,24 @@
-var path = require('path');
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should invoke lifecycle events correctly when a UI component is rendered on the server', function() {
-        var component = window.components['lifecycle-events'];
+    it("should invoke lifecycle events correctly when a UI component is rendered on the server", function() {
+        var component = window.components["lifecycle-events"];
         component.test();
     });
 
-    it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class', function() {
-        var component = window.components['lifecycle-events-component-class'];
+    it("should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class", function() {
+        var component = window.components["lifecycle-events-component-class"];
         component.test();
     });
 
-    it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class ctor', function() {
-        var component = window.components['lifecycle-events-component-class-ctor'];
+    it("should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class ctor", function() {
+        var component =
+            window.components["lifecycle-events-component-class-ctor"];
         component.test();
     });
 
-    it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports object', function() {
-        var component = window.components['lifecycle-events-component-object'];
+    it("should invoke lifecycle events correctly when a UI component is rendered on the server - component exports object", function() {
+        var component = window.components["lifecycle-events-component-object"];
         component.test();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/nesting/tests.js b/test/components-pages/fixtures/nesting/tests.js
index e4369a005..4642697dd 100644
--- a/test/components-pages/fixtures/nesting/tests.js
+++ b/test/components-pages/fixtures/nesting/tests.js
@@ -1,16 +1,16 @@
-var path = require('path');
-var expect = require('chai').expect;
-var Component = require('./components/a/index.marko');
+var path = require("path");
+var expect = require("chai").expect;
+var Component = require("./components/a/index.marko");
 
 describe(path.basename(__dirname), function() {
-    it('should allow diffing html', function() {
-        var parentNode = document.getElementById('test-result');
+    it("should allow diffing html", function() {
+        var parentNode = document.getElementById("test-result");
         var app = window.app;
         app.forceUpdate();
         app.update();
         expect(app.getEl().parentNode).to.equal(parentNode);
-        expect(parentNode.querySelectorAll('.d').length).to.equal(2);
+        expect(parentNode.querySelectorAll(".d").length).to.equal(2);
         // Ensure it produces the same output as rendering in the browser.
-        expect(Component.renderSync().toString(), parentNode.innerHTML)
+        expect(Component.renderSync().toString(), parentNode.innerHTML);
     });
 });
diff --git a/test/components-pages/fixtures/no-update/browser.json b/test/components-pages/fixtures/no-update/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/no-update/browser.json
+++ b/test/components-pages/fixtures/no-update/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/no-update/marko.json b/test/components-pages/fixtures/no-update/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/no-update/marko.json
+++ b/test/components-pages/fixtures/no-update/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/no-update/tests.js b/test/components-pages/fixtures/no-update/tests.js
index 830f7cfb2..57b676a67 100644
--- a/test/components-pages/fixtures/no-update/tests.js
+++ b/test/components-pages/fixtures/no-update/tests.js
@@ -1,70 +1,82 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow attributes to not be updated', function() {
+    it("should allow attributes to not be updated", function() {
         var app = window.app;
-        var noUpdateComponent = app.getComponent('no-update-attr');
-        var foo = noUpdateComponent.el.getAttribute('data-foo');
-        expect(foo).to.equal('server');
+        var noUpdateComponent = app.getComponent("no-update-attr");
+        var foo = noUpdateComponent.el.getAttribute("data-foo");
+        expect(foo).to.equal("server");
 
         noUpdateComponent.input = {
-            name: 'browser'
+            name: "browser"
         };
 
         noUpdateComponent.update();
 
-        expect(foo).to.equal('server');
+        expect(foo).to.equal("server");
     });
 
-    it('should allow a root element to not be updated', function() {
+    it("should allow a root element to not be updated", function() {
         var app = window.app;
-        var noUpdateComponent = app.getComponent('no-update-el');
+        var noUpdateComponent = app.getComponent("no-update-el");
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('server');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("server");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
 
         noUpdateComponent.input = {
-            name: 'browser'
+            name: "browser"
         };
 
         noUpdateComponent.update();
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('server');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("server");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
     });
 
-    it('should allow a nested element to not be updated', function() {
+    it("should allow a nested element to not be updated", function() {
         var app = window.app;
-        var noUpdateComponent = app.getComponent('no-update-el-nested');
+        var noUpdateComponent = app.getComponent("no-update-el-nested");
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('server');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("server");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
 
         noUpdateComponent.input = {
-            name: 'browser'
+            name: "browser"
         };
 
         noUpdateComponent.update();
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('server');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("server");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
     });
 
-    it('should allow a body element to not be updated', function() {
+    it("should allow a body element to not be updated", function() {
         var app = window.app;
-        var noUpdateComponent = app.getComponent('no-update-body-el');
+        var noUpdateComponent = app.getComponent("no-update-body-el");
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('server');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("server");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
 
         noUpdateComponent.input = {
-            name: 'browser'
+            name: "browser"
         };
 
         noUpdateComponent.update();
 
-        expect(noUpdateComponent.getNoUpdateEl().getAttribute('data-foo')).to.equal('browser');
-        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal('server');
+        expect(
+            noUpdateComponent.getNoUpdateEl().getAttribute("data-foo")
+        ).to.equal("browser");
+        expect(noUpdateComponent.getNoUpdateEl().innerHTML).to.equal("server");
     });
 });
diff --git a/test/components-pages/fixtures/onInput-noBrowserRerender/browser.json b/test/components-pages/fixtures/onInput-noBrowserRerender/browser.json
index a2dc221a3..8ddf43cbc 100644
--- a/test/components-pages/fixtures/onInput-noBrowserRerender/browser.json
+++ b/test/components-pages/fixtures/onInput-noBrowserRerender/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/**/index.marko"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/**/index.marko"]
+}
diff --git a/test/components-pages/fixtures/onInput-noBrowserRerender/marko.json b/test/components-pages/fixtures/onInput-noBrowserRerender/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/onInput-noBrowserRerender/marko.json
+++ b/test/components-pages/fixtures/onInput-noBrowserRerender/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/onInput-noBrowserRerender/tests.js b/test/components-pages/fixtures/onInput-noBrowserRerender/tests.js
index e2ee54b1f..427c53ea1 100644
--- a/test/components-pages/fixtures/onInput-noBrowserRerender/tests.js
+++ b/test/components-pages/fixtures/onInput-noBrowserRerender/tests.js
@@ -1,120 +1,122 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow return', function() {
-        var component = window.components['onInput-return'];
+    it("should allow return", function() {
+        var component = window.components["onInput-return"];
 
-        expect(component.input.name).to.equal('FRANK');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK');
+        expect(component.input.name).to.equal("FRANK");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("FRANK");
 
         component.input = {
-            name: 'John'
+            name: "John"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JOHN');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('JOHN');
+        expect(component.input.name).to.equal("JOHN");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("JOHN");
     });
 
-    it('should allow input to be assigned to null', function() {
-        var component = window.components['onInput-assign-null'];
+    it("should allow input to be assigned to null", function() {
+        var component = window.components["onInput-assign-null"];
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('John');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("John");
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Jane');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Henry');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Henry");
     });
 
-    it('should allow input to be assigned to null with return', function() {
-        var component = window.components['onInput-assign-null-and-return'];
+    it("should allow input to be assigned to null with return", function() {
+        var component = window.components["onInput-assign-null-and-return"];
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('JANE');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("JANE");
 
         component.input = {
-            name: 'Frank'
+            name: "Frank"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("FRANK");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('HENRY');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("HENRY");
     });
 
-    it('should allow input to be assigned to a new object', function() {
-        var component = window.components['onInput-assign-object'];
+    it("should allow input to be assigned to a new object", function() {
+        var component = window.components["onInput-assign-object"];
 
-        expect(component.input.name).to.equal('FRANK');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+        expect(component.input.name).to.equal("FRANK");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JANE');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Jane');
+        expect(component.input.name).to.equal("JANE");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('HENRY');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Henry');
+        expect(component.input.name).to.equal("HENRY");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Henry");
     });
 
-    it('should allow input to be assigned to a new object with return', function() {
-        var component = window.components['onInput-assign-object-and-return'];
+    it("should allow input to be assigned to a new object with return", function() {
+        var component = window.components["onInput-assign-object-and-return"];
 
-        expect(component.input.name).to.equal('HEATHER');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('heather');
+        expect(component.input.name).to.equal("HEATHER");
+        expect(component.el.querySelector(".name").innerHTML).to.equal(
+            "heather"
+        );
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JANE');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('jane');
+        expect(component.input.name).to.equal("JANE");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('HENRY');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('henry');
+        expect(component.input.name).to.equal("HENRY");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("henry");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/onInput/browser.json b/test/components-pages/fixtures/onInput/browser.json
index a2dc221a3..8ddf43cbc 100644
--- a/test/components-pages/fixtures/onInput/browser.json
+++ b/test/components-pages/fixtures/onInput/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/**/index.marko"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/**/index.marko"]
+}
diff --git a/test/components-pages/fixtures/onInput/marko.json b/test/components-pages/fixtures/onInput/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/onInput/marko.json
+++ b/test/components-pages/fixtures/onInput/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/onInput/tests.js b/test/components-pages/fixtures/onInput/tests.js
index e2ee54b1f..427c53ea1 100644
--- a/test/components-pages/fixtures/onInput/tests.js
+++ b/test/components-pages/fixtures/onInput/tests.js
@@ -1,120 +1,122 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow return', function() {
-        var component = window.components['onInput-return'];
+    it("should allow return", function() {
+        var component = window.components["onInput-return"];
 
-        expect(component.input.name).to.equal('FRANK');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK');
+        expect(component.input.name).to.equal("FRANK");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("FRANK");
 
         component.input = {
-            name: 'John'
+            name: "John"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JOHN');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('JOHN');
+        expect(component.input.name).to.equal("JOHN");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("JOHN");
     });
 
-    it('should allow input to be assigned to null', function() {
-        var component = window.components['onInput-assign-null'];
+    it("should allow input to be assigned to null", function() {
+        var component = window.components["onInput-assign-null"];
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('John');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("John");
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Jane');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Henry');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Henry");
     });
 
-    it('should allow input to be assigned to null with return', function() {
-        var component = window.components['onInput-assign-null-and-return'];
+    it("should allow input to be assigned to null with return", function() {
+        var component = window.components["onInput-assign-null-and-return"];
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('JANE');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("JANE");
 
         component.input = {
-            name: 'Frank'
+            name: "Frank"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("FRANK");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
         expect(component.input).to.equal(null);
-        expect(component.el.querySelector('.name').innerHTML).to.equal('HENRY');
+        expect(component.el.querySelector(".name").innerHTML).to.equal("HENRY");
     });
 
-    it('should allow input to be assigned to a new object', function() {
-        var component = window.components['onInput-assign-object'];
+    it("should allow input to be assigned to a new object", function() {
+        var component = window.components["onInput-assign-object"];
 
-        expect(component.input.name).to.equal('FRANK');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Frank');
+        expect(component.input.name).to.equal("FRANK");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Frank");
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JANE');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Jane');
+        expect(component.input.name).to.equal("JANE");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('HENRY');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('Henry');
+        expect(component.input.name).to.equal("HENRY");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("Henry");
     });
 
-    it('should allow input to be assigned to a new object with return', function() {
-        var component = window.components['onInput-assign-object-and-return'];
+    it("should allow input to be assigned to a new object with return", function() {
+        var component = window.components["onInput-assign-object-and-return"];
 
-        expect(component.input.name).to.equal('HEATHER');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('heather');
+        expect(component.input.name).to.equal("HEATHER");
+        expect(component.el.querySelector(".name").innerHTML).to.equal(
+            "heather"
+        );
 
         component.input = {
-            name: 'Jane'
+            name: "Jane"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('JANE');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('jane');
+        expect(component.input.name).to.equal("JANE");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("jane");
 
         component.input = {
-            name: 'Henry'
+            name: "Henry"
         };
 
         component.update();
 
-        expect(component.input.name).to.equal('HENRY');
-        expect(component.el.querySelector('.name').innerHTML).to.equal('henry');
+        expect(component.input.name).to.equal("HENRY");
+        expect(component.el.querySelector(".name").innerHTML).to.equal("henry");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/remove-last-multi-root-component/tests.js b/test/components-pages/fixtures/remove-last-multi-root-component/tests.js
index 85e39e8ce..d8ecb3177 100644
--- a/test/components-pages/fixtures/remove-last-multi-root-component/tests.js
+++ b/test/components-pages/fixtures/remove-last-multi-root-component/tests.js
@@ -1,11 +1,11 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should remove the child nodes', function() {
+    it("should remove the child nodes", function() {
         var component = window.testComponent;
-        var el = component.getEl('root');
-    
+        var el = component.getEl("root");
+
         expect(el.children.length).to.equal(2);
         component.toggle();
         component.forceUpdate();
diff --git a/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js b/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js
index dd8cc8e63..0bad27171 100644
--- a/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js
+++ b/test/components-pages/fixtures/repeated-list-items-unkeyed/tests.js
@@ -1,49 +1,74 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should update correctly', function() {
+    it("should update correctly", function() {
         var listItemsComponent = window.listItemsComponent;
-        expect(listItemsComponent.getEl('root').querySelectorAll('li').length).to.equal(4);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a').length).to.equal(4);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[0].innerHTML).to.equal('apples');
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[1].innerHTML).to.equal('bananas');
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[2].innerHTML).to.equal('cherries');
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[3].innerHTML).to.equal('dates');
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("li").length
+        ).to.equal(4);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a").length
+        ).to.equal(4);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML
+        ).to.equal("apples");
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML
+        ).to.equal("bananas");
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[2].innerHTML
+        ).to.equal("cherries");
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[3].innerHTML
+        ).to.equal("dates");
 
         listItemsComponent.input = {
-            options: [
-                    'apples',
-                    'bananas'
-                ]
+            options: ["apples", "bananas"]
         };
         listItemsComponent.update();
 
-        expect(listItemsComponent.getEl('root').querySelectorAll('li').length).to.equal(2);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a').length).to.equal(2);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[0].innerHTML).to.equal('apples');
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[1].innerHTML).to.equal('bananas');
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("li").length
+        ).to.equal(2);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a").length
+        ).to.equal(2);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML
+        ).to.equal("apples");
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML
+        ).to.equal("bananas");
 
         listItemsComponent.input = {
             options: []
         };
         listItemsComponent.update();
 
-        expect(listItemsComponent.getEl('root').querySelectorAll('li').length).to.equal(0);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a').length).to.equal(0);
-
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("li").length
+        ).to.equal(0);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a").length
+        ).to.equal(0);
 
         listItemsComponent.input = {
-            options: [
-                    'apples',
-                    'bananas'
-                ]
+            options: ["apples", "bananas"]
         };
         listItemsComponent.update();
 
-        expect(listItemsComponent.getEl('root').querySelectorAll('li').length).to.equal(2);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a').length).to.equal(2);
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[0].innerHTML).to.equal('apples');
-        expect(listItemsComponent.getEl('root').querySelectorAll('a')[1].innerHTML).to.equal('bananas');
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("li").length
+        ).to.equal(2);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a").length
+        ).to.equal(2);
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[0].innerHTML
+        ).to.equal("apples");
+        expect(
+            listItemsComponent.getEl("root").querySelectorAll("a")[1].innerHTML
+        ).to.equal("bananas");
     });
 });
diff --git a/test/components-pages/fixtures/server-browser-unique-ids/browser.json b/test/components-pages/fixtures/server-browser-unique-ids/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/server-browser-unique-ids/browser.json
+++ b/test/components-pages/fixtures/server-browser-unique-ids/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/server-browser-unique-ids/components/app-foo/component.js b/test/components-pages/fixtures/server-browser-unique-ids/components/app-foo/component.js
index 97bd15bd1..56a27cd6e 100644
--- a/test/components-pages/fixtures/server-browser-unique-ids/components/app-foo/component.js
+++ b/test/components-pages/fixtures/server-browser-unique-ids/components/app-foo/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/server-browser-unique-ids/marko.json b/test/components-pages/fixtures/server-browser-unique-ids/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/server-browser-unique-ids/marko.json
+++ b/test/components-pages/fixtures/server-browser-unique-ids/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/server-browser-unique-ids/tests.js b/test/components-pages/fixtures/server-browser-unique-ids/tests.js
index 460c75d0d..eecb71b36 100644
--- a/test/components-pages/fixtures/server-browser-unique-ids/tests.js
+++ b/test/components-pages/fixtures/server-browser-unique-ids/tests.js
@@ -1,15 +1,16 @@
-var path = require('path');
-var expect = require('chai').expect;
-var appFooComponent = require('./components/app-foo');
+var path = require("path");
+var expect = require("chai").expect;
+var appFooComponent = require("./components/app-foo");
 
 describe(path.basename(__dirname), function() {
-    it('should generate a unique ID that is different for a UI component rendered on the server and browser', function() {
-
+    it("should generate a unique ID that is different for a UI component rendered on the server and browser", function() {
         var serverFooComponent = window.fooComponent;
-        var browserFooComponent = appFooComponent.renderSync({}).appendTo(document.body).getComponent();
-        expect(browserFooComponent.id).to.be.a('string');
-        expect(serverFooComponent.id).to.be.a('string');
+        var browserFooComponent = appFooComponent
+            .renderSync({})
+            .appendTo(document.body)
+            .getComponent();
+        expect(browserFooComponent.id).to.be.a("string");
+        expect(serverFooComponent.id).to.be.a("string");
         expect(serverFooComponent.id).to.not.equal(browserFooComponent.id);
     });
-
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/server-render-dom-event-handlers/browser.json b/test/components-pages/fixtures/server-render-dom-event-handlers/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/server-render-dom-event-handlers/browser.json
+++ b/test/components-pages/fixtures/server-render-dom-event-handlers/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/server-render-dom-event-handlers/marko.json b/test/components-pages/fixtures/server-render-dom-event-handlers/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/server-render-dom-event-handlers/marko.json
+++ b/test/components-pages/fixtures/server-render-dom-event-handlers/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/server-render-dom-event-handlers/tests.js b/test/components-pages/fixtures/server-render-dom-event-handlers/tests.js
index fc259c9b8..7b6fc20f9 100644
--- a/test/components-pages/fixtures/server-render-dom-event-handlers/tests.js
+++ b/test/components-pages/fixtures/server-render-dom-event-handlers/tests.js
@@ -1,7 +1,7 @@
-var path = require('path');
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components correctly across async boundaries', function() {
+    it("should initialize components correctly across async boundaries", function() {
         window.app.test();
     });
 });
diff --git a/test/components-pages/fixtures/server-render-function-references/browser.json b/test/components-pages/fixtures/server-render-function-references/browser.json
index 6012af6d2..ae487d5c5 100644
--- a/test/components-pages/fixtures/server-render-function-references/browser.json
+++ b/test/components-pages/fixtures/server-render-function-references/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app"
-    ]
+    "dependencies": ["require: ./components/app"]
 }
diff --git a/test/components-pages/fixtures/server-render-function-references/marko.json b/test/components-pages/fixtures/server-render-function-references/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/server-render-function-references/marko.json
+++ b/test/components-pages/fixtures/server-render-function-references/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/server-render-function-references/tests.js b/test/components-pages/fixtures/server-render-function-references/tests.js
index fc259c9b8..7b6fc20f9 100644
--- a/test/components-pages/fixtures/server-render-function-references/tests.js
+++ b/test/components-pages/fixtures/server-render-function-references/tests.js
@@ -1,7 +1,7 @@
-var path = require('path');
+var path = require("path");
 
 describe(path.basename(__dirname), function() {
-    it('should initialize components correctly across async boundaries', function() {
+    it("should initialize components correctly across async boundaries", function() {
         window.app.test();
     });
 });
diff --git a/test/components-pages/fixtures/split-emit-multi-args/components/split-component/component-browser.js b/test/components-pages/fixtures/split-emit-multi-args/components/split-component/component-browser.js
index dd8a0cc4a..9d725e0b2 100644
--- a/test/components-pages/fixtures/split-emit-multi-args/components/split-component/component-browser.js
+++ b/test/components-pages/fixtures/split-emit-multi-args/components/split-component/component-browser.js
@@ -3,7 +3,7 @@ module.exports = {
         window.splitComponent = this;
         this.clicked = false;
     },
-    handleClick: function (value) {
+    handleClick: function(value) {
         this.clicked = value;
     }
 };
diff --git a/test/components-pages/fixtures/split-emit-multi-args/marko.json b/test/components-pages/fixtures/split-emit-multi-args/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/split-emit-multi-args/marko.json
+++ b/test/components-pages/fixtures/split-emit-multi-args/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/split-emit-multi-args/tests.js b/test/components-pages/fixtures/split-emit-multi-args/tests.js
index ee70354b3..6076c7d6a 100644
--- a/test/components-pages/fixtures/split-emit-multi-args/tests.js
+++ b/test/components-pages/fixtures/split-emit-multi-args/tests.js
@@ -1,25 +1,34 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 function triggerMouseEvent(el, type) {
     var ev = document.createEvent("MouseEvent");
     ev.initMouseEvent(
         type,
-        true /* bubble */, true /* cancelable */,
-        window, null,
-        0, 0, 0, 0, /* coordinates */
-        false, false, false, false, /* modifier keys */
-        0 /*left*/, null
+        true /* bubble */,
+        true /* cancelable */,
+        window,
+        null,
+        0,
+        0,
+        0,
+        0 /* coordinates */,
+        false,
+        false,
+        false,
+        false /* modifier keys */,
+        0 /*left*/,
+        null
     );
     el.dispatchEvent(ev);
 }
 
 function triggerClick(el) {
-    triggerMouseEvent(el, 'click');
+    triggerMouseEvent(el, "click");
 }
 
 describe(path.basename(__dirname), function() {
-    it('should allow getEl() with a split component', function() {
+    it("should allow getEl() with a split component", function() {
         var app = window.splitComponent;
         triggerClick(app.el);
         expect(app.clicked).to.equal(true);
diff --git a/test/components-pages/fixtures/split-widget-renderer/browser.json b/test/components-pages/fixtures/split-widget-renderer/browser.json
index 1c51c64be..5ffd7149d 100644
--- a/test/components-pages/fixtures/split-widget-renderer/browser.json
+++ b/test/components-pages/fixtures/split-widget-renderer/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-button-split/component-browser",
         "require: ./components/component-only/component-browser"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/component-browser.js b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/component-browser.js
index 26f51d382..dd557310e 100644
--- a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/component-browser.js
+++ b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/component-browser.js
@@ -1,6 +1,4 @@
-function Component() {
-
-}
+function Component() {}
 
 Component.prototype = {
     onMount: function() {
diff --git a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/marko-tag.json b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/marko-tag.json
+++ b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split-export-class/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/component-browser.js b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/component-browser.js
index fe26af768..14e9b425c 100644
--- a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/component-browser.js
+++ b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/component-browser.js
@@ -8,4 +8,4 @@ module.exports = {
     setLabel: function(label) {
         this.el.innerHTML = label;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/marko-tag.json b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/marko-tag.json
index 1937298d5..fdc7ae863 100644
--- a/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/marko-tag.json
+++ b/test/components-pages/fixtures/split-widget-renderer/components/app-button-split/marko-tag.json
@@ -16,4 +16,4 @@
         },
         "*": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/split-widget-renderer/components/component-only/component-browser.js b/test/components-pages/fixtures/split-widget-renderer/components/component-only/component-browser.js
index f2117d1a5..470c4421d 100644
--- a/test/components-pages/fixtures/split-widget-renderer/components/component-only/component-browser.js
+++ b/test/components-pages/fixtures/split-widget-renderer/components/component-only/component-browser.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.componentOnly = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/split-widget-renderer/marko.json b/test/components-pages/fixtures/split-widget-renderer/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/split-widget-renderer/marko.json
+++ b/test/components-pages/fixtures/split-widget-renderer/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/split-widget-renderer/tests.js b/test/components-pages/fixtures/split-widget-renderer/tests.js
index c5eb36cf6..23444a7c4 100644
--- a/test/components-pages/fixtures/split-widget-renderer/tests.js
+++ b/test/components-pages/fixtures/split-widget-renderer/tests.js
@@ -1,22 +1,22 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow component to be split from renderer', function() {
+    it("should allow component to be split from renderer", function() {
         var component = window.appButtonSplit;
-        expect(component.el.innerHTML).to.equal('Test Button');
-        component.setLabel('New Label');
-        expect(component.el.innerHTML).to.equal('New Label');
+        expect(component.el.innerHTML).to.equal("Test Button");
+        component.setLabel("New Label");
+        expect(component.el.innerHTML).to.equal("New Label");
     });
 
-    it('should allow component to be split from renderer and for browser file to export class', function() {
+    it("should allow component to be split from renderer and for browser file to export class", function() {
         var component = window.appButtonSplitExportClass;
-        expect(component.el.innerHTML).to.equal('Test Button');
-        component.setLabel('New Label');
-        expect(component.el.innerHTML).to.equal('New Label');
+        expect(component.el.innerHTML).to.equal("Test Button");
+        component.setLabel("New Label");
+        expect(component.el.innerHTML).to.equal("New Label");
     });
 
-    it('should allow UI component to only have a component and an index.marko', function() {
-        expect(window.componentOnly).to.be.an('object');
+    it("should allow UI component to only have a component and an index.marko", function() {
+        expect(window.componentOnly).to.be.an("object");
     });
 });
diff --git a/test/components-pages/fixtures/widget-config/browser.json b/test/components-pages/fixtures/widget-config/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/widget-config/browser.json
+++ b/test/components-pages/fixtures/widget-config/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/widget-config/components/app-foo/component.js b/test/components-pages/fixtures/widget-config/components/app-foo/component.js
index 9e74b8d94..70127c135 100644
--- a/test/components-pages/fixtures/widget-config/components/app-foo/component.js
+++ b/test/components-pages/fixtures/widget-config/components/app-foo/component.js
@@ -1,12 +1,12 @@
 module.exports = {
     onInput: function() {
-        this.name = 'app-foo';
+        this.name = "app-foo";
     },
 
-    onMount: function(componentConfig) {
+    onMount: function() {
         this.componentConfig = {
             name: this.name
         };
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-config/marko.json b/test/components-pages/fixtures/widget-config/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/widget-config/marko.json
+++ b/test/components-pages/fixtures/widget-config/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-config/tests.js b/test/components-pages/fixtures/widget-config/tests.js
index fed19daa0..0dc3e6eff 100644
--- a/test/components-pages/fixtures/widget-config/tests.js
+++ b/test/components-pages/fixtures/widget-config/tests.js
@@ -1,9 +1,8 @@
-var path = require('path');
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize component config down to the browser', function() {
-        expect(window.fooComponent.componentConfig.name).to.equal('app-foo');
+    it("should serialize component config down to the browser", function() {
+        expect(window.fooComponent.componentConfig.name).to.equal("app-foo");
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/widget-fixed-id/browser.json b/test/components-pages/fixtures/widget-fixed-id/browser.json
index 340c12311..b91d06094 100644
--- a/test/components-pages/fixtures/widget-fixed-id/browser.json
+++ b/test/components-pages/fixtures/widget-fixed-id/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-fixed-id",
         "require: ./components/app-hello/component"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-fixed-id/components/app-fixed-id/component.js b/test/components-pages/fixtures/widget-fixed-id/components/app-fixed-id/component.js
index 80805a683..9331fc009 100644
--- a/test/components-pages/fixtures/widget-fixed-id/components/app-fixed-id/component.js
+++ b/test/components-pages/fixtures/widget-fixed-id/components/app-fixed-id/component.js
@@ -1,20 +1,20 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 module.exports = {
     onInput: function(input) {
-        this.label = input.label || 'app-fixed-id';
+        this.label = input.label || "app-fixed-id";
     },
 
     onMount: function() {
-        this.name = 'app-fixed-id';
+        this.name = "app-fixed-id";
         window.appFixedId = this;
     },
     testGetComponent: function() {
-        var helloComponent = this.getComponent('hello');
+        var helloComponent = this.getComponent("hello");
         expect(helloComponent != null).to.equal(true);
     },
     testGetEl: function() {
-        var wrapperEl = this.getEl('wrapper');
+        var wrapperEl = this.getEl("wrapper");
         expect(wrapperEl != null).to.equal(true);
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-fixed-id/components/app-hello/component.js b/test/components-pages/fixtures/widget-fixed-id/components/app-hello/component.js
index e43456321..ad774f46f 100644
--- a/test/components-pages/fixtures/widget-fixed-id/components/app-hello/component.js
+++ b/test/components-pages/fixtures/widget-fixed-id/components/app-hello/component.js
@@ -4,6 +4,6 @@ module.exports = {
     },
 
     onMount: function() {
-        this.type = 'app-hello';
+        this.type = "app-hello";
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-fixed-id/marko.json b/test/components-pages/fixtures/widget-fixed-id/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/widget-fixed-id/marko.json
+++ b/test/components-pages/fixtures/widget-fixed-id/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-fixed-id/tests.js b/test/components-pages/fixtures/widget-fixed-id/tests.js
index df1e308b0..11df6c153 100644
--- a/test/components-pages/fixtures/widget-fixed-id/tests.js
+++ b/test/components-pages/fixtures/widget-fixed-id/tests.js
@@ -1,10 +1,10 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should allow fixed IDs for components', function() {
+    it("should allow fixed IDs for components", function() {
         var component = window.appFixedId;
-        expect(document.getElementById('appFixedId') != null).to.equal(true);
+        expect(document.getElementById("appFixedId") != null).to.equal(true);
         component.testGetComponent();
         component.testGetEl();
     });
diff --git a/test/components-pages/fixtures/widget-input-ref/browser.json b/test/components-pages/fixtures/widget-input-ref/browser.json
index c08375151..09aecba39 100644
--- a/test/components-pages/fixtures/widget-input-ref/browser.json
+++ b/test/components-pages/fixtures/widget-input-ref/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-foo",
         "require: ./components/app-bar"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-input-ref/components/app-bar/component.js b/test/components-pages/fixtures/widget-input-ref/components/app-bar/component.js
index 8df0876aa..7e229a4fb 100644
--- a/test/components-pages/fixtures/widget-input-ref/components/app-bar/component.js
+++ b/test/components-pages/fixtures/widget-input-ref/components/app-bar/component.js
@@ -2,4 +2,4 @@ module.exports = {
     onMount: function() {
         window.barComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-input-ref/components/app-foo/component.js b/test/components-pages/fixtures/widget-input-ref/components/app-foo/component.js
index 4d2818a50..a86645e20 100644
--- a/test/components-pages/fixtures/widget-input-ref/components/app-foo/component.js
+++ b/test/components-pages/fixtures/widget-input-ref/components/app-foo/component.js
@@ -1,7 +1,7 @@
 module.exports = {
     onInput: function() {
         this.state = {
-            counter:0
+            counter: 0
         };
     },
 
@@ -12,4 +12,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-input-ref/marko.json b/test/components-pages/fixtures/widget-input-ref/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/widget-input-ref/marko.json
+++ b/test/components-pages/fixtures/widget-input-ref/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-input-ref/tests.js b/test/components-pages/fixtures/widget-input-ref/tests.js
index 7d28fa91a..5b8cd5d62 100644
--- a/test/components-pages/fixtures/widget-input-ref/tests.js
+++ b/test/components-pages/fixtures/widget-input-ref/tests.js
@@ -1,16 +1,28 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize component input down to the browser', function() {
-        expect(window.barComponent.getComponent('foo')).to.equal(window.fooComponent);
-        expect(window.fooComponent.input.color).to.equal('#800');
-        expect(window.fooComponent.el.textContent).to.equal('The current count is 0');
-        expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;');
+    it("should serialize component input down to the browser", function() {
+        expect(window.barComponent.getComponent("foo")).to.equal(
+            window.fooComponent
+        );
+        expect(window.fooComponent.input.color).to.equal("#800");
+        expect(window.fooComponent.el.textContent).to.equal(
+            "The current count is 0"
+        );
+        expect(window.fooComponent.el.getAttribute("style")).to.equal(
+            "color:#800;"
+        );
         window.fooComponent.increment();
         window.fooComponent.update();
-        expect(window.fooComponent.el.textContent).to.equal('The current count is 1');
-        expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;');
-        expect(window.barComponent.getComponent('foo')).to.equal(window.fooComponent);
+        expect(window.fooComponent.el.textContent).to.equal(
+            "The current count is 1"
+        );
+        expect(window.fooComponent.el.getAttribute("style")).to.equal(
+            "color:#800;"
+        );
+        expect(window.barComponent.getComponent("foo")).to.equal(
+            window.fooComponent
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/widget-input/browser.json b/test/components-pages/fixtures/widget-input/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/widget-input/browser.json
+++ b/test/components-pages/fixtures/widget-input/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/widget-input/components/app-foo/component.js b/test/components-pages/fixtures/widget-input/components/app-foo/component.js
index 4d2818a50..a86645e20 100644
--- a/test/components-pages/fixtures/widget-input/components/app-foo/component.js
+++ b/test/components-pages/fixtures/widget-input/components/app-foo/component.js
@@ -1,7 +1,7 @@
 module.exports = {
     onInput: function() {
         this.state = {
-            counter:0
+            counter: 0
         };
     },
 
@@ -12,4 +12,4 @@ module.exports = {
     onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-input/marko.json b/test/components-pages/fixtures/widget-input/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/widget-input/marko.json
+++ b/test/components-pages/fixtures/widget-input/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-input/tests.js b/test/components-pages/fixtures/widget-input/tests.js
index e580ecd83..2653a258f 100644
--- a/test/components-pages/fixtures/widget-input/tests.js
+++ b/test/components-pages/fixtures/widget-input/tests.js
@@ -1,14 +1,22 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize component input down to the browser', function() {
-        expect(window.fooComponent.input.color).to.equal('#800');
-        expect(window.fooComponent.el.textContent).to.equal('The current count is 0');
-        expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;');
+    it("should serialize component input down to the browser", function() {
+        expect(window.fooComponent.input.color).to.equal("#800");
+        expect(window.fooComponent.el.textContent).to.equal(
+            "The current count is 0"
+        );
+        expect(window.fooComponent.el.getAttribute("style")).to.equal(
+            "color:#800;"
+        );
         window.fooComponent.increment();
         window.fooComponent.update();
-        expect(window.fooComponent.el.textContent).to.equal('The current count is 1');
-        expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;');
+        expect(window.fooComponent.el.textContent).to.equal(
+            "The current count is 1"
+        );
+        expect(window.fooComponent.el.getAttribute("style")).to.equal(
+            "color:#800;"
+        );
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/widget-state/browser.json b/test/components-pages/fixtures/widget-state/browser.json
index 788bdfbcc..47c496aef 100644
--- a/test/components-pages/fixtures/widget-state/browser.json
+++ b/test/components-pages/fixtures/widget-state/browser.json
@@ -3,4 +3,4 @@
         "require: ./components/app-foo",
         "require: ./components/app-state-watch"
     ]
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-state/components/app-foo/component.js b/test/components-pages/fixtures/widget-state/components/app-foo/component.js
index 38d12b3ec..080a2d210 100644
--- a/test/components-pages/fixtures/widget-state/components/app-foo/component.js
+++ b/test/components-pages/fixtures/widget-state/components/app-foo/component.js
@@ -1,11 +1,11 @@
 module.exports = {
-    onInput: function(input) {
+    onInput: function() {
         this.state = {
-            name: 'app-foo'
+            name: "app-foo"
         };
     },
 
-    onMount: function(componentConfig) {
+    onMount: function() {
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/widget-state/marko.json b/test/components-pages/fixtures/widget-state/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/widget-state/marko.json
+++ b/test/components-pages/fixtures/widget-state/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/widget-state/tests.js b/test/components-pages/fixtures/widget-state/tests.js
index b565eb879..0619c30a0 100644
--- a/test/components-pages/fixtures/widget-state/tests.js
+++ b/test/components-pages/fixtures/widget-state/tests.js
@@ -1,12 +1,12 @@
-var path = require('path');
-var expect = require('chai').expect;
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-    it('should serialize component state down to the browser', function() {
-        expect(window.fooComponent.state.name).to.equal('app-foo');
+    it("should serialize component state down to the browser", function() {
+        expect(window.fooComponent.state.name).to.equal("app-foo");
     });
 
-    it('should serialize component config down to the browser', function() {
+    it("should serialize component config down to the browser", function() {
         window.appStateWatch.test();
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/fixtures/xss/browser.json b/test/components-pages/fixtures/xss/browser.json
index 36bd7c876..d98daa24b 100644
--- a/test/components-pages/fixtures/xss/browser.json
+++ b/test/components-pages/fixtures/xss/browser.json
@@ -1,5 +1,3 @@
 {
-    "dependencies": [
-        "require: ./components/app-foo"
-    ]
-}
\ No newline at end of file
+    "dependencies": ["require: ./components/app-foo"]
+}
diff --git a/test/components-pages/fixtures/xss/components/app-foo/component.js b/test/components-pages/fixtures/xss/components/app-foo/component.js
index d528d68c1..ca7fbeba3 100644
--- a/test/components-pages/fixtures/xss/components/app-foo/component.js
+++ b/test/components-pages/fixtures/xss/components/app-foo/component.js
@@ -1,16 +1,16 @@
 module.exports = {
-    onInput: function(input) {
+    onInput: function() {
         this.state = {
-            'evil': '</script><script>alert("hello")</script>'
+            evil: '</script><script>alert("hello")</script>'
         };
 
         this.evil = '</script><script>alert("hello")</script>';
     },
 
-    onMount: function(componentConfig) {
+    onMount: function() {
         this.componentConfig = {
             evil: this.evil
         };
         window.fooComponent = this;
     }
-};
\ No newline at end of file
+};
diff --git a/test/components-pages/fixtures/xss/marko.json b/test/components-pages/fixtures/xss/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-pages/fixtures/xss/marko.json
+++ b/test/components-pages/fixtures/xss/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-pages/fixtures/xss/tests.js b/test/components-pages/fixtures/xss/tests.js
index 4606ace12..bcc2840bf 100644
--- a/test/components-pages/fixtures/xss/tests.js
+++ b/test/components-pages/fixtures/xss/tests.js
@@ -1,18 +1,18 @@
-var path = require('path');
-var expect = require('chai').expect;
-
+var path = require("path");
+var expect = require("chai").expect;
 
 describe(path.basename(__dirname), function() {
-
-
-    it('should handle ending </script> tag', function(done) {
-
-        var ready = require('marko/ready');
+    it("should handle ending </script> tag", function(done) {
+        var ready = require("marko/ready");
 
         ready(function() {
-            expect(window.fooComponent.state.evil).to.equal('</script><script>alert("hello")</script>');
-            expect(window.fooComponent.componentConfig.evil).to.equal('</script><script>alert("hello")</script>');
+            expect(window.fooComponent.state.evil).to.equal(
+                '</script><script>alert("hello")</script>'
+            );
+            expect(window.fooComponent.componentConfig.evil).to.equal(
+                '</script><script>alert("hello")</script>'
+            );
             done();
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/components-pages/index.test.js b/test/components-pages/index.test.js
index 1b35569b3..5b52c6d06 100644
--- a/test/components-pages/index.test.js
+++ b/test/components-pages/index.test.js
@@ -1,47 +1,45 @@
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var path = require('path');
-var autotest = require('../autotest');
-var asyncTestSuite = require('../__util__/async-test-suite');
-var createJSDOMModule = require('../__util__/create-marko-jsdom-module');
-var TEST_NAME = path.basename(__dirname)
+var path = require("path");
+var autotest = require("../autotest");
+var asyncTestSuite = require("../__util__/async-test-suite");
+var createJSDOMModule = require("../__util__/create-marko-jsdom-module");
+var TEST_NAME = path.basename(__dirname);
 
-describe(TEST_NAME, function () {
-  autotest.scanDir(
-    path.join(__dirname, './fixtures'),
-    run,
-    { type: 'describe', name: false }
-  );
+describe(TEST_NAME, function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures"), run, {
+        type: "describe",
+        name: false
+    });
 });
 
-describe(TEST_NAME + ' (deprecated)', function () {
-  autotest.scanDir(
-    path.join(__dirname, './fixtures-deprecated'),
-    run,
-    { type: 'describe', name: false }
-  );
+describe(TEST_NAME + " (deprecated)", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures-deprecated"), run, {
+        type: "describe",
+        name: false
+    });
 });
 
 /**
  * Builds a page with marko & lasso and then pipes it through jsdom, loading co-located tests.
  */
 function run(dir) {
-  asyncTestSuite(function () {
-    var testFile = path.join(dir, 'tests.js');
-    var templateFile = path.join(dir, 'template.marko');
-    var template = require(templateFile);
-    return template
-      .render({})
-      .then(function (html) {
-        var browser = createJSDOMModule(__dirname, String(html), {
-          beforeParse(window,  browser) {
-            browser.require('../../components');
-            browser.require(templateFile);
-          }
+    asyncTestSuite(function() {
+        var testFile = path.join(dir, "tests.js");
+        var templateFile = path.join(dir, "template.marko");
+        var template = require(templateFile);
+        return template.render({}).then(function(html) {
+            var browser = createJSDOMModule(__dirname, String(html), {
+                beforeParse(window, browser) {
+                    browser.require("../../components");
+                    browser.require(templateFile);
+                }
+            });
+            after(function() {
+                browser.window.close();
+            });
+            browser.require(testFile);
+            browser.window.$initComponents();
         });
-        after(function () { browser.window.close(); });
-        browser.require(testFile);
-        browser.window.$initComponents();
-      });
-  });
+    });
 }
diff --git a/test/components-server/fixtures/cspNonce/marko.json b/test/components-server/fixtures/cspNonce/marko.json
index f3410fb25..60fd6ab09 100644
--- a/test/components-server/fixtures/cspNonce/marko.json
+++ b/test/components-server/fixtures/cspNonce/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./components"
-}
\ No newline at end of file
+}
diff --git a/test/components-server/fixtures/cspNonce/test.js b/test/components-server/fixtures/cspNonce/test.js
index 159129321..3ff300bae 100644
--- a/test/components-server/fixtures/cspNonce/test.js
+++ b/test/components-server/fixtures/cspNonce/test.js
@@ -1,10 +1,10 @@
-module.exports = function (helpers, done) {
-    var template = require('./template.marko');
+module.exports = function(helpers, done) {
+    var template = require("./template.marko");
 
-    template.render({ $global: { cspNonce: 'abc123' } }, function (err, html, out) {
+    template.render({ $global: { cspNonce: "abc123" } }, function(err, html) {
         if (!/<script.*nonce="abc123".*>/.test(html)) {
-            throw new Error('script tag does not contain a nonce');
+            throw new Error("script tag does not contain a nonce");
         }
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-server/fixtures/getRenderedWidgets-noBrowserRerender/test.js b/test/components-server/fixtures/getRenderedWidgets-noBrowserRerender/test.js
index dff673f01..e101e2d63 100644
--- a/test/components-server/fixtures/getRenderedWidgets-noBrowserRerender/test.js
+++ b/test/components-server/fixtures/getRenderedWidgets-noBrowserRerender/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var expect = require("chai").expect;
+var markoComponents = require("marko/components");
 
-module.exports = function (helpers, done) {
-    var template = require('./index.marko');
+module.exports = function(helpers, done) {
+    var template = require("./index.marko");
 
-    template.renderToString({}, function (err, html, out) {
+    template.renderToString({}, function(err, html, out) {
         if (err) {
             return done(err);
         }
 
         var renderedComponents = markoComponents.getRenderedComponents(out);
-        expect(renderedComponents).to.be.an('object');
+        expect(renderedComponents).to.be.an("object");
 
         // console.log('HTML', html);
 
@@ -18,9 +18,9 @@ module.exports = function (helpers, done) {
         var componentDefs = renderedComponents.w;
         expect(componentDefs.length).to.equal(3);
 
-        expect(componentDefs[0][0]).to.equal('s0-0-2');
-        expect(componentDefs[1][0]).to.equal('s0-0-1');
-        expect(componentDefs[2][0]).to.equal('s0-0');
+        expect(componentDefs[0][0]).to.equal("s0-0-2");
+        expect(componentDefs[1][0]).to.equal("s0-0-1");
+        expect(componentDefs[2][0]).to.equal("s0-0");
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-server/fixtures/getRenderedWidgets/test.js b/test/components-server/fixtures/getRenderedWidgets/test.js
index 31f316a1e..6f0cb24d2 100644
--- a/test/components-server/fixtures/getRenderedWidgets/test.js
+++ b/test/components-server/fixtures/getRenderedWidgets/test.js
@@ -1,16 +1,16 @@
-var expect = require('chai').expect;
-var markoComponents = require('marko/components');
+var expect = require("chai").expect;
+var markoComponents = require("marko/components");
 
-module.exports = function (helpers, done) {
-    var template = require('./index.marko');
+module.exports = function(helpers, done) {
+    var template = require("./index.marko");
 
-    template.renderToString({}, function (err, html, out) {
+    template.renderToString({}, function(err, html, out) {
         if (err) {
             return done(err);
         }
 
         var renderedComponents = markoComponents.getRenderedComponents(out);
-        expect(renderedComponents).to.be.an('object');
+        expect(renderedComponents).to.be.an("object");
 
         // console.log('HTML', html);
 
@@ -18,8 +18,8 @@ module.exports = function (helpers, done) {
         var componentDefs = renderedComponents.w;
         expect(componentDefs.length).to.equal(1);
 
-        expect(componentDefs[0][0]).to.equal('s0');
+        expect(componentDefs[0][0]).to.equal("s0");
 
         done();
     });
-};
\ No newline at end of file
+};
diff --git a/test/components-server/fixtures/invalid-missing-template/test.js b/test/components-server/fixtures/invalid-missing-template/test.js
index 124e15ab5..248570cfd 100644
--- a/test/components-server/fixtures/invalid-missing-template/test.js
+++ b/test/components-server/fixtures/invalid-missing-template/test.js
@@ -1,12 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var defineComponent = require('marko/components/legacy').defineComponent;
-    expect(function () {
+module.exports = function() {
+    var defineComponent = require("marko/components/legacy").defineComponent;
+    expect(function() {
         defineComponent({
             // template: require.resolve('./template.marko'),
 
-            getTemplateData: function (state, input) {
+            getTemplateData: function(state, input) {
                 return {
                     name: input.name,
                     messageCount: input.messageCount
@@ -14,4 +14,4 @@ module.exports = function (helpers) {
             }
         });
     }).to.throw(/Expected "template"/);
-};
\ No newline at end of file
+};
diff --git a/test/components-server/fixtures/invalid-missing-template/widget.js b/test/components-server/fixtures/invalid-missing-template/widget.js
index 51ee77d89..d4e160a7e 100644
--- a/test/components-server/fixtures/invalid-missing-template/widget.js
+++ b/test/components-server/fixtures/invalid-missing-template/widget.js
@@ -1,3 +1,3 @@
 function Component() {}
 
-module.exports = Component;
\ No newline at end of file
+module.exports = Component;
diff --git a/test/components-server/fixtures/w-bind-missing-widget/test.js b/test/components-server/fixtures/w-bind-missing-widget/test.js
index 89f8bee33..d694c5ee2 100644
--- a/test/components-server/fixtures/w-bind-missing-widget/test.js
+++ b/test/components-server/fixtures/w-bind-missing-widget/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    expect(function () {
-        require('./template.marko');
-    }).to.throw(/No corresponding JavaScript module found in the same directory/);
-};
\ No newline at end of file
+module.exports = function() {
+    expect(function() {
+        require("./template.marko");
+    }).to.throw(
+        /No corresponding JavaScript module found in the same directory/
+    );
+};
diff --git a/test/components-server/index.test.js b/test/components-server/index.test.js
index efa3f6212..118da3256 100644
--- a/test/components-server/index.test.js
+++ b/test/components-server/index.test.js
@@ -1,28 +1,24 @@
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var path = require('path');
-var autotest = require('../autotest');
-var compiler = require('../../compiler');
+var path = require("path");
+var autotest = require("../autotest");
+var compiler = require("../../compiler");
 var TEST_NAME = path.basename(__dirname);
 
-describe(TEST_NAME, function () {
-    before(function () {
-        compiler.configure({ output: 'html', assumeUpToDate: false });
+describe(TEST_NAME, function() {
+    before(function() {
+        compiler.configure({ output: "html", assumeUpToDate: false });
     });
 
-    autotest.scanDir(
-        path.join(__dirname, './fixtures'),
-        run
-    );
+    autotest.scanDir(path.join(__dirname, "./fixtures"), run);
 });
 
-function run (dir, helpers, done) {
-    var testFunc = require(path.join(dir, 'test.js'));
-    if (testFunc.length === 1) {
+function run(dir, helpers, done) {
+    var testFunc = require(path.join(dir, "test.js"));
+    if (testFunc.length <= 1) {
         testFunc(helpers);
         done();
     } else {
         testFunc(helpers, done);
     }
 }
-
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-args/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-args/test.js
index d75a7aeb9..7c7ef5748 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-args/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-args/test.js
@@ -22,9 +22,9 @@ var users = {
 };
 
 exports.templateData = {
-    userInfo: function (arg, done) {
-        setTimeout(function () {
+    userInfo: function(arg, done) {
+        setTimeout(function() {
             done(null, users[arg.userId]);
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-mixed/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-mixed/test.js
index f1551ac20..773562f47 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-mixed/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-mixed/test.js
@@ -1,21 +1,21 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     }
 };
 
-exports.checkEvents = function (events, helpers) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -28,5 +28,5 @@ exports.checkEvents = function (events, helpers) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-nested/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-nested/test.js
index debe9e861..26f3d70cd 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-nested/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder-nested/test.js
@@ -1,26 +1,26 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     },
-    inner2: function (callback) {
-        setTimeout(function () {
+    inner2: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 600);
     }
 };
 
-exports.checkEvents = function (events, helpers) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -33,5 +33,5 @@ exports.checkEvents = function (events, helpers) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder/test.js
index debe9e861..26f3d70cd 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-client-reorder/test.js
@@ -1,26 +1,26 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    outer: function (callback) {
-        setTimeout(function () {
+    outer: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 400);
     },
-    inner1: function (callback) {
-        setTimeout(function () {
+    inner1: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 500);
     },
-    inner2: function (callback) {
-        setTimeout(function () {
+    inner2: function(callback) {
+        setTimeout(function() {
             callback(null, {});
         }, 600);
     }
 };
 
-exports.checkEvents = function (events, helpers) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -33,5 +33,5 @@ exports.checkEvents = function (events, helpers) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-data-providers/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-data-providers/test.js
index 43fd782d0..5c4db2a55 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-data-providers/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-data-providers/test.js
@@ -1,16 +1,16 @@
 exports.templateData = {
-    sharedData: function (args, done) {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
-                resolve({ name: 'testSharedData' });
+    sharedData: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
+                resolve({ name: "testSharedData" });
             }, 100);
         });
     },
-    contextData: function (args, done) {
-        setTimeout(function () {
+    contextData: function(args, done) {
+        setTimeout(function() {
             done(null, {
                 name: "testContextData"
             });
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-error-message-attr/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-error-message-attr/test.js
index cb46aa567..191ba8500 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-error-message-attr/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-error-message-attr/test.js
@@ -1,8 +1,8 @@
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            var err = new Error('Something went wrong!');
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            var err = new Error("Something went wrong!");
             done(err, null);
         }, 200);
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-error/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-error/test.js
index cb46aa567..191ba8500 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-error/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-error/test.js
@@ -1,8 +1,8 @@
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            var err = new Error('Something went wrong!');
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            var err = new Error("Something went wrong!");
             done(err, null);
         }, 200);
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-callback/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-callback/test.js
index 97402b44a..6cb7bf385 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-callback/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-callback/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    userInfo: function (arg, done) {
+    userInfo: function(arg, done) {
         done(null, {
-            name: 'John'
+            name: "John"
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-return-promise/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-return-promise/test.js
index cabb6262d..cdd1566a1 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-return-promise/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-return-promise/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    userInfo: function () {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
-                resolve({ name: 'John' });
+    userInfo: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
+                resolve({ name: "John" });
             }, 100);
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-sync/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-sync/test.js
index 4062acd20..2aabe33aa 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-sync/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-function-data-provider-sync/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    userInfo: function () {
+    userInfo: function() {
         return {
-            name: 'John'
+            name: "John"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-if/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-if/test.js
index b81f71b84..a17bd8be2 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-if/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-if/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    userProvider: function (cb) {
-        setTimeout(function () {
-            cb(null, { name: 'Frank' });
+    userProvider: function(cb) {
+        setTimeout(function() {
+            cb(null, { name: "Frank" });
         }, 100);
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-macros/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-macros/test.js
index 0d865df0a..9268ab1a8 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-macros/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-macros/test.js
@@ -1,14 +1,16 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-ordering/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-ordering/test.js
index f07cf151d..0a4989ace 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-ordering/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-ordering/test.js
@@ -1,41 +1,46 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800)
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(200),
-        'D3': delayedDataProvider(300),
-        'D4': delayedDataProvider(150)
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(200),
+            D3: delayedDataProvider(300),
+            D4: delayedDataProvider(150)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(800),
-        'D2': delayedDataProvider(200),
-        'D3': delayedDataProvider(300),
-        'D4': delayedDataProvider(100)
+    {
+        templateData: {
+            D1: delayedDataProvider(800),
+            D2: delayedDataProvider(200),
+            D3: delayedDataProvider(300),
+            D4: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(800),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(100)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+    {
+        templateData: {
+            D1: delayedDataProvider(800),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(100)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-ordering2/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-ordering2/test.js
index a047d469c..64af9719d 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-ordering2/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-ordering2/test.js
@@ -1,42 +1,46 @@
 function delayedDataProvider(delay, value) {
-    return function (args, done) {
-        setTimeout(function () {
+    return function(args, done) {
+        setTimeout(function() {
             done(null, value);
         }, delay);
     };
 }
 
-exports.tests = [{
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(900),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(50)
+exports.tests = [
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(900),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(50)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(100),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(900),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(200)
+    {
+        templateData: {
+            D1: delayedDataProvider(100),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(900),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(200)
+        },
+        expectedFile: require.resolve("./expected.html")
     },
-    expectedFile: require.resolve('./expected.html')
-}, {
-    templateData: {
-        'D1': delayedDataProvider(900),
-        'D2': delayedDataProvider(300),
-        'D3': delayedDataProvider(200),
-        'D4': delayedDataProvider(800),
-        'D5': delayedDataProvider(100),
-        'D6': delayedDataProvider(100),
-        'D7': delayedDataProvider(200)
-    },
-    expectedFile: require.resolve('./expected.html')
-}];
\ No newline at end of file
+    {
+        templateData: {
+            D1: delayedDataProvider(900),
+            D2: delayedDataProvider(300),
+            D3: delayedDataProvider(200),
+            D4: delayedDataProvider(800),
+            D5: delayedDataProvider(100),
+            D6: delayedDataProvider(100),
+            D7: delayedDataProvider(200)
+        },
+        expectedFile: require.resolve("./expected.html")
+    }
+];
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-placeholder/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-placeholder/test.js
index d4b967eff..b8a574e83 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-placeholder/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-placeholder/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {
-    testDataProvider: function (done) {
-        setTimeout(function () {
-            done(null, { name: 'Frank' });
+    testDataProvider: function(done) {
+        setTimeout(function() {
+            done(null, { name: "Frank" });
         }, 200);
     }
 };
 
-exports.checkHtml = function (html) {
-    expect(html).to.contain('Loading main...');
-    expect(html).to.contain('Hello Frank');
-};
\ No newline at end of file
+exports.checkHtml = function(html) {
+    expect(html).to.contain("Loading main...");
+    expect(html).to.contain("Hello Frank");
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-bluebird/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-bluebird/test.js
index e6ae568bf..1dac74909 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-bluebird/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-bluebird/test.js
@@ -1,9 +1,9 @@
-var deferred = require('bluebird').defer();
+var deferred = require("bluebird").defer();
 
-setTimeout(function () {
+setTimeout(function() {
     deferred.resolve({});
 }, 200);
 
 exports.templateData = {
     promiseData: deferred.promise
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-q/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-q/test.js
index 9ae6efcdf..616494b11 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-q/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-promise-error-q/test.js
@@ -1,9 +1,9 @@
-var promise = new Promise(function (resolve, reject) {
-    setTimeout(function () {
+var promise = new Promise(function(resolve) {
+    setTimeout(function() {
         resolve({});
     }, 100);
 });
 
 exports.templateData = {
     promiseData: promise
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-promise/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-promise/test.js
index a55997af4..0fdf89ced 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-promise/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-promise/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    promiseData: function (arg, done) {
-        return new Promise(function (resolve, reject) {
-            setTimeout(function () {
-                resolve('Test promise');
+    promiseData: function() {
+        return new Promise(function(resolve) {
+            setTimeout(function() {
+                resolve("Test promise");
             }, 100);
         });
     }
-};
\ No newline at end of file
+};
diff --git a/test/deprecated-async-fragments/fixtures/async-fragment-timeout/test.js b/test/deprecated-async-fragments/fixtures/async-fragment-timeout/test.js
index 1cc2306ad..22d85183b 100644
--- a/test/deprecated-async-fragments/fixtures/async-fragment-timeout/test.js
+++ b/test/deprecated-async-fragments/fixtures/async-fragment-timeout/test.js
@@ -1,21 +1,21 @@
-var extend = require('raptor-util/extend');
-var expect = require('chai').expect;
+var extend = require("raptor-util/extend");
+var expect = require("chai").expect;
 
 exports.templateData = {
-    userInfoShort: function (done) {
-        setTimeout(function () {
+    userInfoShort: function(done) {
+        setTimeout(function() {
             done(null, {});
         }, 600);
     },
-    userInfoLong: function (done) {
-        setTimeout(function () {
+    userInfoLong: function(done) {
+        setTimeout(function() {
             done(null, {});
         }, 1000);
     }
 };
 
-exports.checkEvents = function (events, helpers) {
-    events = events.map(function (eventInfo) {
+exports.checkEvents = function(events, helpers) {
+    events = events.map(function(eventInfo) {
         var arg = extend({}, eventInfo.arg);
         expect(arg.out != null).to.equal(true);
 
@@ -28,5 +28,5 @@ exports.checkEvents = function (events, helpers) {
         };
     });
 
-    helpers.compare(events, '-events.json');
-};
\ No newline at end of file
+    helpers.compare(events, "-events.json");
+};
diff --git a/test/deprecated-async-fragments/index.test.js b/test/deprecated-async-fragments/index.test.js
index dd8e05496..a85b64df7 100644
--- a/test/deprecated-async-fragments/index.test.js
+++ b/test/deprecated-async-fragments/index.test.js
@@ -1,22 +1,22 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var expect = require('chai').expect;
-var path = require('path');
-var marko = require('../../');
-var markoRuntimeHtml = require('marko/runtime/html');
-var autotest = require('../autotest');
-var fs = require('fs');
+var expect = require("chai").expect;
+var path = require("path");
+var marko = require("../../");
+var markoRuntimeHtml = require("marko/runtime/html");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('async-fragments (deprecated)', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("async-fragments (deprecated)", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var templatePath = path.join(dir, 'template.marko');
-        var mainPath = path.join(dir, 'test.js');
+        var templatePath = path.join(dir, "template.marko");
+        var mainPath = path.join(dir, "test.js");
 
         var main = fs.existsSync(mainPath) ? require(mainPath) : {};
         var loadOptions = main && main.loadOptions;
@@ -31,7 +31,7 @@ describe('async-fragments (deprecated)', function () {
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
@@ -43,8 +43,8 @@ describe('async-fragments (deprecated)', function () {
             var events = [];
             var eventsByFragmentName = {};
 
-            var addEventListener = function (event) {
-                out.on(event, function (arg) {
+            var addEventListener = function(event) {
+                out.on(event, function(arg) {
                     var name = arg.name;
 
                     if (!eventsByFragmentName[name]) {
@@ -60,21 +60,21 @@ describe('async-fragments (deprecated)', function () {
                 });
             };
 
-            addEventListener('asyncFragmentBegin');
-            addEventListener('asyncFragmentBeforeRender');
-            addEventListener('asyncFragmentFinish');
+            addEventListener("asyncFragmentBegin");
+            addEventListener("asyncFragmentBeforeRender");
+            addEventListener("asyncFragmentFinish");
 
             template.render(templateData, out);
 
-            out.on('error', done);
+            out.on("error", done);
 
-            out.on('finish', function () {
+            out.on("finish", function() {
                 var html = out.toString();
 
                 if (main.checkHtml) {
                     main.checkHtml(html);
                 } else {
-                    helpers.compare(html, '.html');
+                    helpers.compare(html, ".html");
                 }
 
                 if (main.checkEvents) {
@@ -82,9 +82,15 @@ describe('async-fragments (deprecated)', function () {
                 }
 
                 // Make sure all of the async fragments were correctly ended
-                Object.keys(eventsByFragmentName).forEach(function (fragmentName) {
+                Object.keys(eventsByFragmentName).forEach(function(
+                    fragmentName
+                ) {
                     var events = eventsByFragmentName[fragmentName];
-                    expect(events).to.deep.equal(['asyncFragmentBegin', 'asyncFragmentBeforeRender', 'asyncFragmentFinish']);
+                    expect(events).to.deep.equal([
+                        "asyncFragmentBegin",
+                        "asyncFragmentBeforeRender",
+                        "asyncFragmentFinish"
+                    ]);
                 });
 
                 done();
diff --git a/test/express/fixtures/autotests/multiple-express-instances/test.js b/test/express/fixtures/autotests/multiple-express-instances/test.js
index 1ea20d36a..b0f76abde 100644
--- a/test/express/fixtures/autotests/multiple-express-instances/test.js
+++ b/test/express/fixtures/autotests/multiple-express-instances/test.js
@@ -1,27 +1,27 @@
-const expect = require('chai').expect;
+const expect = require("chai").expect;
 
-exports.test = function (done) {
+exports.test = function(done) {
     // should be able to register for multiple express instances
 
-    const express = require('express');
+    const express = require("express");
     // test res.marko is added to the real express response
-    require('marko/express');
-    expect(express.response.marko).to.be.a('function');
+    require("marko/express");
+    expect(express.response.marko).to.be.a("function");
 
     // set up an express mock object and hijack require
     var expressMock = { response: {} };
     var _require = module.require;
 
-    module.require = function () {
-        if (arguments[0] === 'express') return expressMock;
+    module.require = function() {
+        if (arguments[0] === "express") return expressMock;
         return _require.apply(module, arguments);
     };
 
     // check that res.marko is added to the mocked expressß response
-    require('marko/express');
-    expect(expressMock.response.marko).to.be.a('function');
+    require("marko/express");
+    expect(expressMock.response.marko).to.be.a("function");
 
     // return require to its original state
     module.require = _require;
     done();
-};
\ No newline at end of file
+};
diff --git a/test/express/fixtures/autotests/res.marko-reg-multiple/test.js b/test/express/fixtures/autotests/res.marko-reg-multiple/test.js
index 939de32e0..1961b86c8 100644
--- a/test/express/fixtures/autotests/res.marko-reg-multiple/test.js
+++ b/test/express/fixtures/autotests/res.marko-reg-multiple/test.js
@@ -1,14 +1,14 @@
-const expect = require('chai').expect;
+const expect = require("chai").expect;
 
-exports.test = function (done) {
-  // should not register the res.marko function multiple times
-  const express = require('express');
-  require('marko/express');
+exports.test = function(done) {
+    // should not register the res.marko function multiple times
+    const express = require("express");
+    require("marko/express");
 
-  const fn = express.response.marko;
+    const fn = express.response.marko;
 
-  require('marko/express');
+    require("marko/express");
 
-  expect(express.response.marko).to.equal(fn);
-  done();
-};
\ No newline at end of file
+    expect(express.response.marko).to.equal(fn);
+    done();
+};
diff --git a/test/express/fixtures/autotests/server-headers/test.js b/test/express/fixtures/autotests/server-headers/test.js
index ad1a3a2ef..c17b25bc0 100644
--- a/test/express/fixtures/autotests/server-headers/test.js
+++ b/test/express/fixtures/autotests/server-headers/test.js
@@ -1,25 +1,27 @@
-exports.createApp = function (express, markoExpressPath) {
+exports.createApp = function(express, markoExpressPath) {
     var app = express();
     var markoExpress = require(markoExpressPath);
 
-    app.locals.foo = 'FOO';
+    app.locals.foo = "FOO";
 
     app.use(markoExpress());
-    app.use(function (req, res, next) {
-        res.locals.bar = 'BAR';
+    app.use(function(req, res, next) {
+        res.locals.bar = "BAR";
         next();
     });
 
     return app;
 };
 
-exports.createController = function (template) {
-    return function (req, res) {
+exports.createController = function(template) {
+    return function(req, res) {
         res.marko(template);
     };
 };
 
-exports.checkResponse = function (response, expect, helpers) {
-    expect(response.headers['content-type']).to.equal('text/html; charset=utf-8');
-    expect(response.body).to.equal('<div></div>');
-};
\ No newline at end of file
+exports.checkResponse = function(response, expect) {
+    expect(response.headers["content-type"]).to.equal(
+        "text/html; charset=utf-8"
+    );
+    expect(response.body).to.equal("<div></div>");
+};
diff --git a/test/express/fixtures/autotests/server-incorrect-usage/test.js b/test/express/fixtures/autotests/server-incorrect-usage/test.js
index b0eeba6a2..0f7c25026 100644
--- a/test/express/fixtures/autotests/server-incorrect-usage/test.js
+++ b/test/express/fixtures/autotests/server-incorrect-usage/test.js
@@ -1,4 +1,4 @@
-exports.createApp = function (express, markoExpressPath) {
+exports.createApp = function(express, markoExpressPath) {
     var app = express();
     var markoExpress = require(markoExpressPath);
 
@@ -7,15 +7,14 @@ exports.createApp = function (express, markoExpressPath) {
     return app;
 };
 
-exports.createController = function (template) {
-    return function (req, res) {
-        res.marko('home');
+exports.createController = function() {
+    return function(req, res) {
+        res.marko("home");
     };
 };
 
-exports.checkResponse = function (response, expect, helpers) {
+exports.checkResponse = function(response, expect) {
     expect(response.statusCode).to.equal(500);
-    console.log('response.body', response.body);
-    expect(response.body).to.include('res.marko');
-    expect(response.body).to.include('res.render');
-};
\ No newline at end of file
+    expect(response.body).to.include("res.marko");
+    expect(response.body).to.include("res.render");
+};
diff --git a/test/express/fixtures/autotests/server-locals/test.js b/test/express/fixtures/autotests/server-locals/test.js
index 6285c060a..cd22af181 100644
--- a/test/express/fixtures/autotests/server-locals/test.js
+++ b/test/express/fixtures/autotests/server-locals/test.js
@@ -1,20 +1,20 @@
-exports.createApp = function (express, markoExpressPath) {
+exports.createApp = function(express, markoExpressPath) {
     var app = express();
     var markoExpress = require(markoExpressPath);
 
-    app.locals.foo = 'FOO';
+    app.locals.foo = "FOO";
 
     app.use(markoExpress());
-    app.use(function (req, res, next) {
-        res.locals.bar = 'BAR';
+    app.use(function(req, res, next) {
+        res.locals.bar = "BAR";
         next();
     });
 
     return app;
 };
 
-exports.createController = function (template) {
-    return function (req, res) {
+exports.createController = function(template) {
+    return function(req, res) {
         res.marko(template);
     };
-};
\ No newline at end of file
+};
diff --git a/test/express/fixtures/autotests/server-priority/test.js b/test/express/fixtures/autotests/server-priority/test.js
index 17417fce0..0b6373460 100644
--- a/test/express/fixtures/autotests/server-priority/test.js
+++ b/test/express/fixtures/autotests/server-priority/test.js
@@ -1,23 +1,23 @@
-exports.createApp = function (express, markoExpressPath) {
+exports.createApp = function(express, markoExpressPath) {
     var app = express();
     var markoExpress = require(markoExpressPath);
 
-    app.locals.foo = 'APP';
-    app.locals.bar = 'APP';
-    app.locals.baz = 'APP';
+    app.locals.foo = "APP";
+    app.locals.bar = "APP";
+    app.locals.baz = "APP";
 
     app.use(markoExpress());
-    app.use(function (req, res, next) {
-        res.locals.foo = 'RES';
-        res.locals.bar = 'RES';
+    app.use(function(req, res, next) {
+        res.locals.foo = "RES";
+        res.locals.bar = "RES";
         next();
     });
 
     return app;
 };
 
-exports.createController = function (template) {
-    return function (req, res) {
-        res.marko(template, { $global: { foo: 'DATA' }, test: 'HELLO' });
+exports.createController = function(template) {
+    return function(req, res) {
+        res.marko(template, { $global: { foo: "DATA" }, test: "HELLO" });
     };
-};
\ No newline at end of file
+};
diff --git a/test/express/fixtures/autotests/server-return-promise/test.js b/test/express/fixtures/autotests/server-return-promise/test.js
index 2de291be5..b0fb211c4 100644
--- a/test/express/fixtures/autotests/server-return-promise/test.js
+++ b/test/express/fixtures/autotests/server-return-promise/test.js
@@ -1,8 +1,8 @@
-'use strict';
+"use strict";
 
 let fulfilled = false;
 
-exports.createApp = function (express, markoExpressPath) {
+exports.createApp = function(express, markoExpressPath) {
     var app = express();
     var markoExpress = require(markoExpressPath);
 
@@ -10,17 +10,15 @@ exports.createApp = function (express, markoExpressPath) {
     return app;
 };
 
-exports.createController = function (template) {
-    return function (req, res) {
+exports.createController = function(template) {
+    return function(req, res) {
         return res.marko(template).then(() => {
             fulfilled = true;
-        }).catch(err => {
-            console.error('Error fulfilling res.marko: ', err);
         });
     };
 };
 
-exports.checkResponse = function (response, expect, helpers) {
+exports.checkResponse = function(response, expect) {
     expect(fulfilled).to.equal(true);
-    expect(response.body).to.equal('<div></div>');
-};
\ No newline at end of file
+    expect(response.body).to.equal("<div></div>");
+};
diff --git a/test/express/fixtures/express-4/package.json b/test/express/fixtures/express-4/package.json
index c1108c2c4..8ef4b2d62 100644
--- a/test/express/fixtures/express-4/package.json
+++ b/test/express/fixtures/express-4/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "marko-test-express-4",
-  "version": "1.0.0",
-  "dependencies": {
-    "express": "^4"
-  }
+    "name": "marko-test-express-4",
+    "version": "1.0.0",
+    "dependencies": {
+        "express": "^4"
+    }
 }
diff --git a/test/express/fixtures/express-5/package.json b/test/express/fixtures/express-5/package.json
index 1bada39d2..6724a4c54 100644
--- a/test/express/fixtures/express-5/package.json
+++ b/test/express/fixtures/express-5/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "marko-test-express-4",
-  "version": "1.0.0",
-  "dependencies": {
-    "express": ">5.0.0-alpha"
-  }
+    "name": "marko-test-express-4",
+    "version": "1.0.0",
+    "dependencies": {
+        "express": ">5.0.0-alpha"
+    }
 }
diff --git a/test/express/fixtures/loadExpressTests.js b/test/express/fixtures/loadExpressTests.js
index 15730ae58..d168ec214 100644
--- a/test/express/fixtures/loadExpressTests.js
+++ b/test/express/fixtures/loadExpressTests.js
@@ -1,36 +1,40 @@
-'use strict';
+"use strict";
 
-require('../../__util__/test-init');
+require("../../__util__/test-init");
 
-const chai = require('chai');
+const chai = require("chai");
 chai.config.includeStack = true;
 const expect = chai.expect;
-const path = require('path');
-const autotest = require('../../autotest');
-const request = require('request');
-const fs = require('fs');
-const marko = require('../../../');
-const markoExpressPath = require.resolve('../../../express');
-const shell = require('shelljs');
-const execSync = require('child_process').execSync;
-const resolveFrom = require('resolve-from');
+const path = require("path");
+const autotest = require("../../autotest");
+const request = require("request");
+const fs = require("fs");
+const marko = require("../../../");
+const markoExpressPath = require.resolve("../../../express");
+const shell = require("shelljs");
+const execSync = require("child_process").execSync;
+const resolveFrom = require("resolve-from");
 
-const autoTestDirSrc = path.join(__dirname, './autotests');
+const autoTestDirSrc = path.join(__dirname, "./autotests");
 
 module.exports = function loadExpressTests(expressVersion) {
     const projectDir = path.join(__dirname, expressVersion);
     // Run `npm install` to install express
-    execSync('npm install', { cwd: projectDir });
+    execSync("npm install", { cwd: projectDir });
 
     // Load the installed express
-    let express = require(resolveFrom(projectDir, 'express'));
+    let express = require(resolveFrom(projectDir, "express"));
 
     // Copy the autotests directory into the target project
-    shell.cp('-R', autoTestDirSrc, projectDir);
+    shell.cp("-R", autoTestDirSrc, projectDir);
 
-    autotest.scanDir(path.join(projectDir, 'autotests'), function run(dir, helpers, done) {
-        var mainPath = path.join(dir, 'test.js');
-        var templatePath = path.join(dir, 'template.marko');
+    autotest.scanDir(path.join(projectDir, "autotests"), function run(
+        dir,
+        helpers,
+        done
+    ) {
+        var mainPath = path.join(dir, "test.js");
+        var templatePath = path.join(dir, "template.marko");
 
         var main = fs.existsSync(mainPath) ? require(mainPath) : {};
         var loadOptions = main && main.loadOptions;
@@ -45,7 +49,7 @@ module.exports = function loadExpressTests(expressVersion) {
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
@@ -54,7 +58,7 @@ module.exports = function loadExpressTests(expressVersion) {
             var app = main.createApp(express, markoExpressPath);
             var template = marko.load(templatePath, loadOptions);
 
-            app.get('/test', main.createController(template));
+            app.get("/test", main.createController(template));
 
             app.use(function errorHandler(err, req, res, next) {
                 if (res.headersSent) {
@@ -65,7 +69,7 @@ module.exports = function loadExpressTests(expressVersion) {
                 res.end(err.toString());
             });
 
-            var server = app.listen(0, function (err) {
+            var server = app.listen(0, function(err) {
                 if (err) {
                     return done(err);
                 }
@@ -73,7 +77,7 @@ module.exports = function loadExpressTests(expressVersion) {
                 var port = server.address().port;
                 var address = `http://localhost:${port}/test`;
 
-                request(address, function (error, response, body) {
+                request(address, function(error, response, body) {
                     try {
                         if (main.checkResponse) {
                             response.body = body;
@@ -84,7 +88,7 @@ module.exports = function loadExpressTests(expressVersion) {
                                 return done(error);
                             }
                             chai.expect(response.statusCode).to.equal(200);
-                            helpers.compare(body, '.html');
+                            helpers.compare(body, ".html");
                         }
                     } catch (error) {
                         server.close();
diff --git a/test/express/fixtures/package.json b/test/express/fixtures/package.json
index ffd0c719a..339622850 100644
--- a/test/express/fixtures/package.json
+++ b/test/express/fixtures/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "marko-test-express-4",
-  "version": "1.0.0",
-  "devDependencies": {
-    "express": "^4.13.4"
-  }
-}
\ No newline at end of file
+    "name": "marko-test-express-4",
+    "version": "1.0.0",
+    "devDependencies": {
+        "express": "^4.13.4"
+    }
+}
diff --git a/test/express/index.test.js b/test/express/index.test.js
index 52dc4ec04..cc10a792b 100644
--- a/test/express/index.test.js
+++ b/test/express/index.test.js
@@ -1,17 +1,17 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-const loadExpressTests = require('./fixtures/loadExpressTests.js');
+const loadExpressTests = require("./fixtures/loadExpressTests.js");
 
-describe('express-4', function () {
+describe("express-4", function() {
     this.timeout(15000);
 
-    loadExpressTests('express-4');
+    loadExpressTests("express-4");
 });
 
-describe('express-5', function () {
+describe("express-5", function() {
     this.timeout(10000);
 
-    loadExpressTests('express-5');
-});
\ No newline at end of file
+    loadExpressTests("express-5");
+});
diff --git a/test/expression-toString/index.test.js b/test/expression-toString/index.test.js
index a3310a95f..c0b6dbf7b 100644
--- a/test/expression-toString/index.test.js
+++ b/test/expression-toString/index.test.js
@@ -1,23 +1,25 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var path = require('path');
-var compiler = require('../../compiler');
+var path = require("path");
+var compiler = require("../../compiler");
 var builder = compiler.createBuilder();
-var autotest = require('../autotest');
-var fs = require('fs');
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('compiler/expression-toString', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("compiler/expression-toString", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var input = fs.readFileSync(path.join(dir, 'input.js'), { encoding: 'utf8' });
+        var input = fs.readFileSync(path.join(dir, "input.js"), {
+            encoding: "utf8"
+        });
         var parsed = builder.parseExpression(input);
-        helpers.compare(parsed.toString(), '.js');
+        helpers.compare(parsed.toString(), ".js");
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/hot-reload/fixtures/component-to-template/a/component.js b/test/hot-reload/fixtures/component-to-template/a/component.js
index 1e70b9676..292add829 100644
--- a/test/hot-reload/fixtures/component-to-template/a/component.js
+++ b/test/hot-reload/fixtures/component-to-template/a/component.js
@@ -4,4 +4,4 @@ module.exports = {
             name: input.name
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/component-to-template/test.js b/test/hot-reload/fixtures/component-to-template/test.js
index f1b63b38e..4160a7692 100644
--- a/test/hot-reload/fixtures/component-to-template/test.js
+++ b/test/hot-reload/fixtures/component-to-template/test.js
@@ -1,7 +1,7 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-var tempDir = nodePath.join(__dirname, 'temp');
+var tempDir = nodePath.join(__dirname, "temp");
 
 function copyFiles(dir) {
     var files = fs.readdirSync(dir);
@@ -11,37 +11,53 @@ function copyFiles(dir) {
     });
 }
 
-exports.check = function (marko, hotReload, expect, helpers) {
+exports.check = function(marko, hotReload, expect, helpers) {
     try {
-        fs.mkdirSync(nodePath.join(__dirname, 'temp'));
-    } catch (e) {}
+        fs.mkdirSync(nodePath.join(__dirname, "temp"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/component.js'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/component.js"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/index.marko'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/index.marko"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/index.marko.js'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/index.marko.js"));
+    } catch (e) {
+        /* ignore error */
+    }
 
-    var tempTemplatePath = nodePath.join(__dirname, 'temp/index.marko');
+    var tempTemplatePath = nodePath.join(__dirname, "temp/index.marko");
 
-    copyFiles(nodePath.join(__dirname, 'a'));
+    copyFiles(nodePath.join(__dirname, "a"));
     var component = require(tempTemplatePath);
 
-    helpers.compareSequence(component.renderToString({ name: 'Frank' }), '.html');
+    helpers.compareSequence(
+        component.renderToString({ name: "Frank" }),
+        ".html"
+    );
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/component.js'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/component.js"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     hotReload.handleFileModified(tempTemplatePath);
 
-    copyFiles(nodePath.join(__dirname, 'b'));
+    copyFiles(nodePath.join(__dirname, "b"));
 
-    helpers.compareSequence(component.renderToString({ name: 'Jane' }), '.html');
-};
\ No newline at end of file
+    helpers.compareSequence(
+        component.renderToString({ name: "Jane" }),
+        ".html"
+    );
+};
diff --git a/test/hot-reload/fixtures/load/test.js b/test/hot-reload/fixtures/load/test.js
index 100104ca0..a8e80cdf3 100644
--- a/test/hot-reload/fixtures/load/test.js
+++ b/test/hot-reload/fixtures/load/test.js
@@ -1,22 +1,22 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-exports.check = function (marko, hotReload, expect, helpers) {
-    var srcTemplatePath = nodePath.join(__dirname, 'template.marko');
-    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: 'utf8' });
+exports.check = function(marko, hotReload, expect, helpers) {
+    var srcTemplatePath = nodePath.join(__dirname, "template.marko");
+    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: "utf8" });
 
-    var tempTemplatePath = nodePath.join(__dirname, 'template.temp.marko');
-    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: 'utf8' });
+    var tempTemplatePath = nodePath.join(__dirname, "template.temp.marko");
+    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: "utf8" });
 
     var template = marko.load(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
-    fs.writeFileSync(tempTemplatePath, templateSrc + '!', { encoding: 'utf8' });
+    fs.writeFileSync(tempTemplatePath, templateSrc + "!", { encoding: "utf8" });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
-};
\ No newline at end of file
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
+};
diff --git a/test/hot-reload/fixtures/require-custom-extension/test.js b/test/hot-reload/fixtures/require-custom-extension/test.js
index 3ae156195..1d6869ac1 100644
--- a/test/hot-reload/fixtures/require-custom-extension/test.js
+++ b/test/hot-reload/fixtures/require-custom-extension/test.js
@@ -1,24 +1,24 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-exports.check = function (marko, hotReload, expect, helpers) {
-    var srcTemplatePath = nodePath.join(__dirname, 'template.html');
-    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: 'utf8' });
+exports.check = function(marko, hotReload, expect, helpers) {
+    var srcTemplatePath = nodePath.join(__dirname, "template.html");
+    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: "utf8" });
 
-    var tempTemplatePath = nodePath.join(__dirname, 'template.temp.html');
-    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: 'utf8' });
+    var tempTemplatePath = nodePath.join(__dirname, "template.temp.html");
+    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: "utf8" });
 
     var template = marko.load(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
-    fs.writeFileSync(tempTemplatePath, templateSrc + '!', { encoding: 'utf8' });
+    fs.writeFileSync(tempTemplatePath, templateSrc + "!", { encoding: "utf8" });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath, {
-        extension: '.html'
+        extension: ".html"
     });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
-};
\ No newline at end of file
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
+};
diff --git a/test/hot-reload/fixtures/require-custom-multiple-extensions/test.js b/test/hot-reload/fixtures/require-custom-multiple-extensions/test.js
index 1e4f202bb..43768730b 100644
--- a/test/hot-reload/fixtures/require-custom-multiple-extensions/test.js
+++ b/test/hot-reload/fixtures/require-custom-multiple-extensions/test.js
@@ -1,24 +1,24 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-exports.check = function (marko, hotReload, expect, helpers) {
-    var srcTemplatePath = nodePath.join(__dirname, 'template.html');
-    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: 'utf8' });
+exports.check = function(marko, hotReload, expect, helpers) {
+    var srcTemplatePath = nodePath.join(__dirname, "template.html");
+    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: "utf8" });
 
-    var tempTemplatePath = nodePath.join(__dirname, 'template.temp.html');
-    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: 'utf8' });
+    var tempTemplatePath = nodePath.join(__dirname, "template.temp.html");
+    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: "utf8" });
 
     var template = marko.load(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
-    fs.writeFileSync(tempTemplatePath, templateSrc + '!', { encoding: 'utf8' });
+    fs.writeFileSync(tempTemplatePath, templateSrc + "!", { encoding: "utf8" });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath, {
-        extensions: ['.html']
+        extensions: [".html"]
     });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
-};
\ No newline at end of file
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
+};
diff --git a/test/hot-reload/fixtures/require-custom-without-period/test.js b/test/hot-reload/fixtures/require-custom-without-period/test.js
index 59cb3c5eb..2a1fb64ab 100644
--- a/test/hot-reload/fixtures/require-custom-without-period/test.js
+++ b/test/hot-reload/fixtures/require-custom-without-period/test.js
@@ -1,24 +1,24 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-exports.check = function (marko, hotReload, expect, helpers) {
-    var srcTemplatePath = nodePath.join(__dirname, 'template.html');
-    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: 'utf8' });
+exports.check = function(marko, hotReload, expect, helpers) {
+    var srcTemplatePath = nodePath.join(__dirname, "template.html");
+    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: "utf8" });
 
-    var tempTemplatePath = nodePath.join(__dirname, 'template.temp.html');
-    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: 'utf8' });
+    var tempTemplatePath = nodePath.join(__dirname, "template.temp.html");
+    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: "utf8" });
 
     var template = marko.load(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
-    fs.writeFileSync(tempTemplatePath, templateSrc + '!', { encoding: 'utf8' });
+    fs.writeFileSync(tempTemplatePath, templateSrc + "!", { encoding: "utf8" });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath, {
-        extensions: ['html']
+        extensions: ["html"]
     });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
-};
\ No newline at end of file
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
+};
diff --git a/test/hot-reload/fixtures/require/test.js b/test/hot-reload/fixtures/require/test.js
index 924088e61..f5a141130 100644
--- a/test/hot-reload/fixtures/require/test.js
+++ b/test/hot-reload/fixtures/require/test.js
@@ -1,22 +1,22 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-exports.check = function (marko, hotReload, expect, helpers) {
-    var srcTemplatePath = nodePath.join(__dirname, 'template.marko');
-    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: 'utf8' });
+exports.check = function(marko, hotReload, expect, helpers) {
+    var srcTemplatePath = nodePath.join(__dirname, "template.marko");
+    var templateSrc = fs.readFileSync(srcTemplatePath, { encoding: "utf8" });
 
-    var tempTemplatePath = nodePath.join(__dirname, 'template.temp.marko');
-    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: 'utf8' });
+    var tempTemplatePath = nodePath.join(__dirname, "template.temp.marko");
+    fs.writeFileSync(tempTemplatePath, templateSrc, { encoding: "utf8" });
 
     var template = require(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
-    fs.writeFileSync(tempTemplatePath, templateSrc + '!', { encoding: 'utf8' });
+    fs.writeFileSync(tempTemplatePath, templateSrc + "!", { encoding: "utf8" });
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath);
 
-    helpers.compareSequence(template.renderSync({ name: 'John' }).toString());
-};
\ No newline at end of file
+    helpers.compareSequence(template.renderSync({ name: "John" }).toString());
+};
diff --git a/test/hot-reload/fixtures/template-export-component/a/component.js b/test/hot-reload/fixtures/template-export-component/a/component.js
index 144f097f1..a73c6f7a6 100644
--- a/test/hot-reload/fixtures/template-export-component/a/component.js
+++ b/test/hot-reload/fixtures/template-export-component/a/component.js
@@ -1,7 +1,7 @@
 module.exports = {
     onInput() {
         this.state = {
-            name: 'Frank'
+            name: "Frank"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/template-export-component/b/component.js b/test/hot-reload/fixtures/template-export-component/b/component.js
index 6379c8f87..d3a02e317 100644
--- a/test/hot-reload/fixtures/template-export-component/b/component.js
+++ b/test/hot-reload/fixtures/template-export-component/b/component.js
@@ -1,7 +1,7 @@
 module.exports = {
     onInput() {
         this.state = {
-            name: 'John'
+            name: "John"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/template-export-component/test.js b/test/hot-reload/fixtures/template-export-component/test.js
index 863b2af78..ebe4ede3d 100644
--- a/test/hot-reload/fixtures/template-export-component/test.js
+++ b/test/hot-reload/fixtures/template-export-component/test.js
@@ -1,7 +1,7 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-var tempDir = nodePath.join(__dirname, 'temp');
+var tempDir = nodePath.join(__dirname, "temp");
 
 function copyFiles(dir) {
     var files = fs.readdirSync(dir);
@@ -11,19 +11,21 @@ function copyFiles(dir) {
     });
 }
 
-exports.check = function (marko, hotReload, expect, helpers) {
+exports.check = function(marko, hotReload, expect, helpers) {
     try {
-        fs.mkdirSync(nodePath.join(__dirname, 'temp'));
-    } catch (e) {}
+        fs.mkdirSync(nodePath.join(__dirname, "temp"));
+    } catch (e) {
+        /* ignore error */
+    }
 
-    var tempTemplatePath = nodePath.join(__dirname, 'temp/index.marko');
+    var tempTemplatePath = nodePath.join(__dirname, "temp/index.marko");
 
-    copyFiles(nodePath.join(__dirname, 'a'));
+    copyFiles(nodePath.join(__dirname, "a"));
     var component = require(tempTemplatePath);
     helpers.compareSequence(component.renderSync().toString());
 
     hotReload.handleFileModified(tempTemplatePath);
 
-    copyFiles(nodePath.join(__dirname, 'b'));
+    copyFiles(nodePath.join(__dirname, "b"));
     helpers.compareSequence(component.renderSync().toString());
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/template-to-component/b/component.js b/test/hot-reload/fixtures/template-to-component/b/component.js
index 1e70b9676..292add829 100644
--- a/test/hot-reload/fixtures/template-to-component/b/component.js
+++ b/test/hot-reload/fixtures/template-to-component/b/component.js
@@ -4,4 +4,4 @@ module.exports = {
             name: input.name
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/template-to-component/temp/component.js b/test/hot-reload/fixtures/template-to-component/temp/component.js
index 1e70b9676..292add829 100644
--- a/test/hot-reload/fixtures/template-to-component/temp/component.js
+++ b/test/hot-reload/fixtures/template-to-component/temp/component.js
@@ -4,4 +4,4 @@ module.exports = {
             name: input.name
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/hot-reload/fixtures/template-to-component/test.js b/test/hot-reload/fixtures/template-to-component/test.js
index 93821ed10..57f261707 100644
--- a/test/hot-reload/fixtures/template-to-component/test.js
+++ b/test/hot-reload/fixtures/template-to-component/test.js
@@ -1,7 +1,7 @@
-var fs = require('fs');
-var nodePath = require('path');
+var fs = require("fs");
+var nodePath = require("path");
 
-var tempDir = nodePath.join(__dirname, 'temp');
+var tempDir = nodePath.join(__dirname, "temp");
 
 function copyFiles(dir) {
     var files = fs.readdirSync(dir);
@@ -11,31 +11,39 @@ function copyFiles(dir) {
     });
 }
 
-exports.check = function (marko, hotReload, expect, helpers) {
+exports.check = function(marko, hotReload, expect, helpers) {
     try {
-        fs.mkdirSync(nodePath.join(__dirname, 'temp'));
-    } catch (e) {}
+        fs.mkdirSync(nodePath.join(__dirname, "temp"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/component.js'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/component.js"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/index.marko'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/index.marko"));
+    } catch (e) {
+        /* ignore error */
+    }
 
     try {
-        fs.unlinkSync(nodePath.join(__dirname, 'temp/index.marko.js'));
-    } catch (e) {}
+        fs.unlinkSync(nodePath.join(__dirname, "temp/index.marko.js"));
+    } catch (e) {
+        /* ignore error */
+    }
 
-    var tempTemplatePath = nodePath.join(__dirname, 'temp/index.marko');
+    var tempTemplatePath = nodePath.join(__dirname, "temp/index.marko");
 
-    copyFiles(nodePath.join(__dirname, 'a'));
+    copyFiles(nodePath.join(__dirname, "a"));
     var component = require(tempTemplatePath);
-    helpers.compareSequence(component.renderSync({ name: 'Frank' }).toString());
+    helpers.compareSequence(component.renderSync({ name: "Frank" }).toString());
 
     hotReload.handleFileModified(tempTemplatePath);
 
-    copyFiles(nodePath.join(__dirname, 'b'));
-    helpers.compareSequence(component.renderSync({ name: 'Jane' }).toString());
-};
\ No newline at end of file
+    copyFiles(nodePath.join(__dirname, "b"));
+    helpers.compareSequence(component.renderSync({ name: "Jane" }).toString());
+};
diff --git a/test/hot-reload/index.test.js b/test/hot-reload/index.test.js
index d33733375..e7d5842b3 100644
--- a/test/hot-reload/index.test.js
+++ b/test/hot-reload/index.test.js
@@ -1,27 +1,27 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
+var expect = require("chai").expect;
+var nodePath = require("path");
 
-var autotest = require('../autotest');
-var marko = require('marko');
+var autotest = require("../autotest");
+var marko = require("marko");
 
-var hotReload = require('marko/hot-reload');
+var hotReload = require("marko/hot-reload");
 hotReload.enable();
-describe('hot-reload', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("hot-reload", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        require('marko/compiler').configure({
+        require("marko/compiler").configure({
             assumeUpToDate: false
         });
 
-        var test = require(nodePath.join(dir, 'test.js'));
+        var test = require(nodePath.join(dir, "test.js"));
 
         test.check(marko, hotReload, expect, helpers);
         done();
diff --git a/test/inline/.eslintrc b/test/inline/.eslintrc
new file mode 100644
index 000000000..b67664adb
--- /dev/null
+++ b/test/inline/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "globals": {
+        "marko":true,
+        "data":true
+    }
+}
\ No newline at end of file
diff --git a/test/inline/fixtures/concise/index.js b/test/inline/fixtures/concise/index.js
index cd36de271..bf886f7fc 100644
--- a/test/inline/fixtures/concise/index.js
+++ b/test/inline/fixtures/concise/index.js
@@ -1,5 +1,5 @@
-module.exports = function () {
-    var name = 'Frank';
+module.exports = function() {
+    var name = "Frank";
     var template = marko`
         div
             -- Hello ${name}!
@@ -7,4 +7,4 @@ module.exports = function () {
         `;
 
     return template.renderSync();
-};
\ No newline at end of file
+};
diff --git a/test/inline/fixtures/layout-template/index.js b/test/inline/fixtures/layout-template/index.js
index 6d8c7ce53..5946e64ce 100644
--- a/test/inline/fixtures/layout-template/index.js
+++ b/test/inline/fixtures/layout-template/index.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-vars */
+
 var layout = marko`
     <!DOCTYPE html>
     html lang="en"
@@ -10,9 +12,9 @@ var layout = marko`
                 layout-placeholder name="body"
     `;
 
-module.exports = function () {
-    var title = 'Hello World';
-    var name = 'Frank';
+module.exports = function() {
+    var title = "Hello World";
+    var name = "Frank";
 
     var template = marko`
         layout-use(layout) title=title
@@ -21,4 +23,4 @@ module.exports = function () {
     `;
 
     return template.renderSync();
-};
\ No newline at end of file
+};
diff --git a/test/inline/fixtures/local-vars/index.js b/test/inline/fixtures/local-vars/index.js
index b721f0c4c..9ce56071e 100644
--- a/test/inline/fixtures/local-vars/index.js
+++ b/test/inline/fixtures/local-vars/index.js
@@ -1,9 +1,9 @@
-module.exports = function () {
-    var name = 'Frank';
+module.exports = function() {
+    var name = "Frank";
     var template = marko`
         <div>
             Hello ${name}!
         </div>`;
 
     return template.renderSync();
-};
\ No newline at end of file
+};
diff --git a/test/inline/fixtures/multiple-templates-custom-tags/index.js b/test/inline/fixtures/multiple-templates-custom-tags/index.js
index 5a557ff6b..2b362a5b1 100644
--- a/test/inline/fixtures/multiple-templates-custom-tags/index.js
+++ b/test/inline/fixtures/multiple-templates-custom-tags/index.js
@@ -1,6 +1,4 @@
-module.exports = function () {
-    var name = 'Frank';
-
+module.exports = function() {
     var template1 = marko`
         test-foo
         test-foo`;
@@ -9,5 +7,9 @@ module.exports = function () {
         test-bar
         test-bar`;
 
-    return template1.renderSync().toString() + '\n' + template2.renderSync().toString();
-};
\ No newline at end of file
+    return (
+        template1.renderSync().toString() +
+        "\n" +
+        template2.renderSync().toString()
+    );
+};
diff --git a/test/inline/fixtures/render-callback/index.js b/test/inline/fixtures/render-callback/index.js
index c60eb9c6a..779b2b67f 100644
--- a/test/inline/fixtures/render-callback/index.js
+++ b/test/inline/fixtures/render-callback/index.js
@@ -1,9 +1,9 @@
-module.exports = function (done) {
-    var name = 'Frank';
+module.exports = function(done) {
+    var name = "Frank";
     var template = marko`
         <div>
             Hello ${name}!
         </div>`;
 
     return template.render(null, done);
-};
\ No newline at end of file
+};
diff --git a/test/inline/index.test.js b/test/inline/index.test.js
index 3f872954a..79e29d38d 100644
--- a/test/inline/index.test.js
+++ b/test/inline/index.test.js
@@ -1,25 +1,25 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
-var fs = require('fs');
+var path = require("path");
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('inline', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("inline", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var indexPath = path.join(dir, 'index.js');
+        var indexPath = path.join(dir, "index.js");
         var inlineCompiler = compiler.createInlineCompiler(indexPath);
 
         var compilerOptions = { writeVersionComment: false };
-        var src = fs.readFileSync(indexPath, { encoding: 'utf8' });
+        var src = fs.readFileSync(indexPath, { encoding: "utf8" });
 
-        src = src.replace(/marko`([^`]*)`/g, function (match, templateSrc) {
+        src = src.replace(/marko`([^`]*)`/g, function(match, templateSrc) {
             var compiled = inlineCompiler.compile(templateSrc, compilerOptions);
             return compiled.code;
         });
@@ -27,16 +27,16 @@ describe('inline', function () {
         var staticCode = inlineCompiler.staticCode;
 
         if (staticCode) {
-            src = staticCode + '\n\n' + src;
+            src = staticCode + "\n\n" + src;
         }
 
-        var outputFile = path.join(dir, 'index.generated.js');
-        fs.writeFileSync(outputFile, src, { encoding: 'utf8' });
+        var outputFile = path.join(dir, "index.generated.js");
+        fs.writeFileSync(outputFile, src, { encoding: "utf8" });
 
         var func = require(outputFile);
 
         function handleOutput(result) {
-            helpers.compare(result.toString(), '.html');
+            helpers.compare(result.toString(), ".html");
             done();
         }
 
diff --git a/test/marko-debug-babel-plugin/fixtures/compiles/test.js b/test/marko-debug-babel-plugin/fixtures/compiles/test.js
index 2937c5e95..e0316e17f 100644
--- a/test/marko-debug-babel-plugin/fixtures/compiles/test.js
+++ b/test/marko-debug-babel-plugin/fixtures/compiles/test.js
@@ -1,13 +1,17 @@
-const fs = require('fs');
-const path = require('path');
-const babel = require('babel-core');
-const pluginPath = require.resolve('../../../../scripts/babel-plugin-marko-debug');
+const fs = require("fs");
+const path = require("path");
+const babel = require("babel-core");
+const pluginPath = require.resolve(
+    "../../../../scripts/babel-plugin-marko-debug"
+);
 
-exports.check = function (expect, helpers, done) {
-    const input = fs.readFileSync(path.join(__dirname, 'input.js'), 'utf-8');
-    const expected = fs.readFileSync(path.join(__dirname, 'expected.js'), 'utf-8').trim();
+exports.check = function(expect, helpers, done) {
+    const input = fs.readFileSync(path.join(__dirname, "input.js"), "utf-8");
+    const expected = fs
+        .readFileSync(path.join(__dirname, "expected.js"), "utf-8")
+        .trim();
     const actual = babel.transform(input, { plugins: [pluginPath] }).code;
 
     expect(expected).to.equal(actual);
     done();
-};
\ No newline at end of file
+};
diff --git a/test/marko-debug-babel-plugin/index.test.js b/test/marko-debug-babel-plugin/index.test.js
index 92a76b500..d94d668e7 100644
--- a/test/marko-debug-babel-plugin/index.test.js
+++ b/test/marko-debug-babel-plugin/index.test.js
@@ -1,19 +1,19 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var nodePath = require('path');
-var chai = require('chai');
+var nodePath = require("path");
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var autotest = require('../autotest');
+var expect = require("chai").expect;
+var autotest = require("../autotest");
 
-describe('marko-debug-babel-plugin', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("marko-debug-babel-plugin", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
+        var test = require(nodePath.join(dir, "test.js"));
         test.check(expect, helpers, done);
     });
 });
diff --git a/test/markoc/fixtures/clean-dir/test.js b/test/markoc/fixtures/clean-dir/test.js
index 15747da5c..c10376168 100644
--- a/test/markoc/fixtures/clean-dir/test.js
+++ b/test/markoc/fixtures/clean-dir/test.js
@@ -1,15 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
+exports.test = function(helpers) {
+    helpers.spawnSync(["template1.marko"]);
+    helpers.spawnSync(["template2.marko"]);
 
-    helpers.spawnSync(['template1.marko']);
-    helpers.spawnSync(['template2.marko']);
+    expect(helpers.existsSync("template1.marko.js")).to.equal(true);
+    expect(helpers.existsSync("template2.marko.js")).to.equal(true);
 
-    expect(helpers.existsSync('template1.marko.js')).to.equal(true);
-    expect(helpers.existsSync('template2.marko.js')).to.equal(true);
+    helpers.spawnSync([".", "--clean"]);
 
-    helpers.spawnSync(['.', '--clean']);
-
-    expect(helpers.existsSync('template1.marko.js')).to.equal(false);
-    expect(helpers.existsSync('template2.marko.js')).to.equal(false);
-};
\ No newline at end of file
+    expect(helpers.existsSync("template1.marko.js")).to.equal(false);
+    expect(helpers.existsSync("template2.marko.js")).to.equal(false);
+};
diff --git a/test/markoc/fixtures/compile-dir-no-template/test.js b/test/markoc/fixtures/compile-dir-no-template/test.js
index 789cc33cc..44c199ab0 100644
--- a/test/markoc/fixtures/compile-dir-no-template/test.js
+++ b/test/markoc/fixtures/compile-dir-no-template/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
-    var result = helpers.spawnSync(['.'], { encoding: 'utf8' });
+exports.test = function(helpers) {
+    var result = helpers.spawnSync(["."], { encoding: "utf8" });
 
-    expect(result.stdout).to.contain('No templates found');
-};
\ No newline at end of file
+    expect(result.stdout).to.contain("No templates found");
+};
diff --git a/test/markoc/fixtures/compile-dir/test.js b/test/markoc/fixtures/compile-dir/test.js
index 92a33ecb7..bf07e5cca 100644
--- a/test/markoc/fixtures/compile-dir/test.js
+++ b/test/markoc/fixtures/compile-dir/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
-    expect(helpers.existsSync('template1.marko.js')).to.equal(false);
-    expect(helpers.existsSync('template2.marko.js')).to.equal(false);
+exports.test = function(helpers) {
+    expect(helpers.existsSync("template1.marko.js")).to.equal(false);
+    expect(helpers.existsSync("template2.marko.js")).to.equal(false);
 
-    helpers.spawnSync(['.']);
+    helpers.spawnSync(["."]);
 
-    expect(helpers.existsSync('template1.marko.js')).to.equal(true);
-    expect(helpers.existsSync('template2.marko.js')).to.equal(true);
-};
\ No newline at end of file
+    expect(helpers.existsSync("template1.marko.js")).to.equal(true);
+    expect(helpers.existsSync("template2.marko.js")).to.equal(true);
+};
diff --git a/test/markoc/fixtures/multiple-dirs/test.js b/test/markoc/fixtures/multiple-dirs/test.js
index a18e38dd1..ab07dd691 100644
--- a/test/markoc/fixtures/multiple-dirs/test.js
+++ b/test/markoc/fixtures/multiple-dirs/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
-    expect(helpers.existsSync('a/template.marko.js')).to.equal(false);
-    expect(helpers.existsSync('b/template.marko.js')).to.equal(false);
-    expect(helpers.existsSync('excluded/template.marko.js')).to.equal(false);
+exports.test = function(helpers) {
+    expect(helpers.existsSync("a/template.marko.js")).to.equal(false);
+    expect(helpers.existsSync("b/template.marko.js")).to.equal(false);
+    expect(helpers.existsSync("excluded/template.marko.js")).to.equal(false);
 
-    helpers.spawnSync(['a', 'b']);
+    helpers.spawnSync(["a", "b"]);
 
-    expect(helpers.existsSync('a/template.marko.js')).to.equal(true);
-    expect(helpers.existsSync('b/template.marko.js')).to.equal(true);
-    expect(helpers.existsSync('excluded/template.marko.js')).to.equal(false);
-};
\ No newline at end of file
+    expect(helpers.existsSync("a/template.marko.js")).to.equal(true);
+    expect(helpers.existsSync("b/template.marko.js")).to.equal(true);
+    expect(helpers.existsSync("excluded/template.marko.js")).to.equal(false);
+};
diff --git a/test/markoc/fixtures/single-template-write-version-comment/test.js b/test/markoc/fixtures/single-template-write-version-comment/test.js
index 4bb948c7d..b911ce35f 100644
--- a/test/markoc/fixtures/single-template-write-version-comment/test.js
+++ b/test/markoc/fixtures/single-template-write-version-comment/test.js
@@ -1,8 +1,10 @@
-var expect = require('chai').expect;
-var markoVersion = require('../../../../package.json').version;
+var expect = require("chai").expect;
+var markoVersion = require("../../../../package.json").version;
 
-exports.test = function (helpers) {
-    helpers.spawnSync(['template.marko']);
-    var compiledFile = helpers.readSync('template.marko.js').toString();
-    expect(compiledFile).to.contain('// Compiled using markoc@' + markoVersion + ' - DO NOT EDIT\n');
-};
\ No newline at end of file
+exports.test = function(helpers) {
+    helpers.spawnSync(["template.marko"]);
+    var compiledFile = helpers.readSync("template.marko.js").toString();
+    expect(compiledFile).to.contain(
+        "// Compiled using markoc@" + markoVersion + " - DO NOT EDIT\n"
+    );
+};
diff --git a/test/markoc/fixtures/single-template/test.js b/test/markoc/fixtures/single-template/test.js
index b6d42dc13..2b8d15814 100644
--- a/test/markoc/fixtures/single-template/test.js
+++ b/test/markoc/fixtures/single-template/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
-    expect(helpers.existsSync('template.marko.js')).to.equal(false);
-    var result = helpers.spawnSync(['template.marko']);
-    expect(helpers.existsSync('template.marko.js')).to.equal(true);
+exports.test = function(helpers) {
+    expect(helpers.existsSync("template.marko.js")).to.equal(false);
+    var result = helpers.spawnSync(["template.marko"]);
+    expect(helpers.existsSync("template.marko.js")).to.equal(true);
     expect(result.status).to.equal(0);
-};
\ No newline at end of file
+};
diff --git a/test/markoc/fixtures/single-xml-template/test.js b/test/markoc/fixtures/single-xml-template/test.js
index 258bc10c4..6c677c744 100644
--- a/test/markoc/fixtures/single-xml-template/test.js
+++ b/test/markoc/fixtures/single-xml-template/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
-    expect(helpers.existsSync('template.marko.xml.js')).to.equal(false);
-    var result = helpers.spawnSync(['template.marko.xml']);
-    expect(helpers.existsSync('template.marko.xml.js')).to.equal(true);
+exports.test = function(helpers) {
+    expect(helpers.existsSync("template.marko.xml.js")).to.equal(false);
+    var result = helpers.spawnSync(["template.marko.xml"]);
+    expect(helpers.existsSync("template.marko.xml.js")).to.equal(true);
     expect(result.status).to.equal(0);
-};
\ No newline at end of file
+};
diff --git a/test/markoc/fixtures/usage/test.js b/test/markoc/fixtures/usage/test.js
index 3996122f5..6b148abf7 100644
--- a/test/markoc/fixtures/usage/test.js
+++ b/test/markoc/fixtures/usage/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.test = function (helpers) {
+exports.test = function(helpers) {
     var result = helpers.spawnSync([], {
-        encoding: 'utf8'
+        encoding: "utf8"
     });
 
-    expect(result.stdout).to.contain('Usage: markoc');
-};
\ No newline at end of file
+    expect(result.stdout).to.contain("Usage: markoc");
+};
diff --git a/test/markoc/index.test.js b/test/markoc/index.test.js
index 7645b4b36..a6014b345 100644
--- a/test/markoc/index.test.js
+++ b/test/markoc/index.test.js
@@ -1,42 +1,46 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var nodePath = require('path');
-require('../../compiler');
-var autotest = require('../autotest');
-var markocPath = require.resolve('../../bin/markoc');
-var childProcess = require('child_process');
-var fs = require('fs');
+var nodePath = require("path");
+require("../../compiler");
+var autotest = require("../autotest");
+var markocPath = require.resolve("../../bin/markoc");
+var childProcess = require("child_process");
+var fs = require("fs");
 
-describe('markoc', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("markoc", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
-    autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        const testModule = require(nodePath.join(dir, 'test.js'));
+    autotest.scanDir(
+        autoTestDir,
+        function run(dir, helpers, done) {
+            const testModule = require(nodePath.join(dir, "test.js"));
 
-        helpers.existsSync = function (filename) {
-            return fs.existsSync(nodePath.join(dir, filename));
-        };
+            helpers.existsSync = function(filename) {
+                return fs.existsSync(nodePath.join(dir, filename));
+            };
 
-        helpers.readSync = function (filename) {
-            return fs.readFileSync(nodePath.join(dir, filename));
-        };
+            helpers.readSync = function(filename) {
+                return fs.readFileSync(nodePath.join(dir, filename));
+            };
 
-        helpers.spawnSync = function (args, options) {
-            options = options || {};
-            if (!options.cwd) {
-                options.cwd = dir;
-            }
-            return childProcess.spawnSync(markocPath, args, options);
-        };
+            helpers.spawnSync = function(args, options) {
+                options = options || {};
+                if (!options.cwd) {
+                    options.cwd = dir;
+                }
+                return childProcess.spawnSync(markocPath, args, options);
+            };
 
-        helpers.spawnSync(['.', '--clean']);
+            helpers.spawnSync([".", "--clean"]);
 
-        testModule.test(helpers);
-        done();
-    }, { timeout: 20000 });
+            testModule.test(helpers);
+            done();
+        },
+        { timeout: 20000 }
+    );
 });
diff --git a/test/morphdom/fixtures/input-element-disabled/index.js b/test/morphdom/fixtures/input-element-disabled/index.js
index 9834ccebb..5af462164 100644
--- a/test/morphdom/fixtures/input-element-disabled/index.js
+++ b/test/morphdom/fixtures/input-element-disabled/index.js
@@ -1,4 +1,4 @@
-exports.verify = function (context, expect) {
+exports.verify = function(context, expect) {
     var rootNode = context.rootNode;
     expect(rootNode.disabled).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/morphdom/fixtures/input-element-enabled/index.js b/test/morphdom/fixtures/input-element-enabled/index.js
index 14b4464cd..04689255b 100644
--- a/test/morphdom/fixtures/input-element-enabled/index.js
+++ b/test/morphdom/fixtures/input-element-enabled/index.js
@@ -1,4 +1,4 @@
-exports.verify = function (context, expect) {
+exports.verify = function(context, expect) {
     var rootNode = context.rootNode;
     expect(rootNode.disabled).to.equal(false);
-};
\ No newline at end of file
+};
diff --git a/test/morphdom/fixtures/select-element/index.js b/test/morphdom/fixtures/select-element/index.js
index c092feff1..70afed8ca 100644
--- a/test/morphdom/fixtures/select-element/index.js
+++ b/test/morphdom/fixtures/select-element/index.js
@@ -1,5 +1,5 @@
-exports.verify = function (context, expect) {
+exports.verify = function(context, expect) {
     var rootNode = context.rootNode;
-    var selectNode = rootNode.querySelector('select');
+    var selectNode = rootNode.querySelector("select");
     expect(selectNode.selectedIndex).to.equal(2);
-};
\ No newline at end of file
+};
diff --git a/test/morphdom/index.test.js b/test/morphdom/index.test.js
index bb1c3f484..6654bfd2b 100644
--- a/test/morphdom/index.test.js
+++ b/test/morphdom/index.test.js
@@ -1,29 +1,27 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var path = require('path');
+var path = require("path");
 
-var autotest = require('../autotest');
-const fs = require('fs');
-const morphdom = require('marko/morphdom');
-const createJSDOMModule = require('../__util__/create-jsdom-module');
-const expect = require('chai').expect;
+var autotest = require("../autotest");
+const fs = require("fs");
+const morphdom = require("marko/morphdom");
+const createJSDOMModule = require("../__util__/create-jsdom-module");
 function serializeNode(node) {
-
     // NOTE: We don't use XMLSerializer because we need to sort the attributes to correctly compare output HTML strings
     // BAD: return (new XMLSerializer()).serializeToString(node);
-    var html = '';
+    var html = "";
     function serializeHelper(node, indent) {
         if (node.nodeType === 1) {
             serializeElHelper(node, indent);
         } else if (node.nodeType === 3) {
             serializeTextHelper(node, indent);
         } else {
-            throw new Error('Unexpected node type');
+            throw new Error("Unexpected node type");
         }
     }
 
@@ -32,15 +30,15 @@ function serializeNode(node) {
 
         var namespaceURI = el.namespaceURI;
 
-        if (namespaceURI === 'http://www.w3.org/2000/svg') {
-            nodeName = 'svg:' + nodeName;
-        } else if (namespaceURI === 'http://www.w3.org/1998/Math/MathML') {
-            nodeName = 'math:' + nodeName;
-        } else if (namespaceURI !== 'http://www.w3.org/1999/xhtml') {
-            nodeName = namespaceURI + ':' + nodeName;
+        if (namespaceURI === "http://www.w3.org/2000/svg") {
+            nodeName = "svg:" + nodeName;
+        } else if (namespaceURI === "http://www.w3.org/1998/Math/MathML") {
+            nodeName = "math:" + nodeName;
+        } else if (namespaceURI !== "http://www.w3.org/1999/xhtml") {
+            nodeName = namespaceURI + ":" + nodeName;
         }
 
-        html += indent + '<' + nodeName;
+        html += indent + "<" + nodeName;
 
         var attributes = el.attributes;
         var attributesArray = [];
@@ -55,77 +53,68 @@ function serializeNode(node) {
                 }
 
                 if (attr.namespaceURI) {
-                    qualifiedName = attr.namespaceURI + ':' + qualifiedName;
+                    qualifiedName = attr.namespaceURI + ":" + qualifiedName;
                 }
-                attributesArray.push(' ' + qualifiedName + '="' + attr.value + '"');
+                attributesArray.push(
+                    " " + qualifiedName + '="' + attr.value + '"'
+                );
             }
         }
 
         attributesArray.sort();
 
-        html += attributesArray.join('');
+        html += attributesArray.join("");
 
-        html += '>\n';
+        html += ">\n";
 
         var childNodes = el.childNodes;
 
         if (childNodes && childNodes.length) {
             for (i = 0; i < childNodes.length; i++) {
-                serializeHelper(childNodes[i], indent + '  ');
+                serializeHelper(childNodes[i], indent + "  ");
             }
         }
     }
 
     function serializeTextHelper(node, indent) {
-        html += indent + JSON.stringify(node.nodeValue) + '\n';
+        html += indent + JSON.stringify(node.nodeValue) + "\n";
     }
 
-    serializeHelper(node, '');
+    serializeHelper(node, "");
 
     return html;
 }
 
-function buildElLookup(node) {
-    var map = {};
-
-    function buildMapHelper(node) {
-        if (node.nodeType !== 1) {
-            return;
-        }
-
-        var id = node.getAttribute('id');
-        if (id) {
-            map[id] = node;
-        }
-
-        var curNode = node.firstChild;
-        while (curNode) {
-            buildMapHelper(curNode);
-            curNode = curNode.nextSibling;
-        }
-    }
-
-    buildMapHelper(node);
-    return map;
-}
-
-describe('morphdom', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("morphdom", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
+        var fromHTML = fs.readFileSync(path.join(dir, "from.html"), {
+            encoding: "utf8"
+        });
+        var toHTML = fs.readFileSync(path.join(dir, "to.html"), {
+            encoding: "utf8"
+        });
 
-        var fromHTML = fs.readFileSync(path.join(dir, 'from.html'), { encoding: 'utf8' });
-        var toHTML = fs.readFileSync(path.join(dir, 'to.html'), { encoding: 'utf8' });
-
-        let fromDocument = createJSDOMModule({ dir: __dirname, html: '<html><body>' + fromHTML + '</body></html>' }).window.document;
-        let toDocument = createJSDOMModule({ dir: __dirname, html: '<html><body>' + toHTML + '</body></html>' }).window.document;
+        let fromDocument = createJSDOMModule({
+            dir: __dirname,
+            html: "<html><body>" + fromHTML + "</body></html>"
+        }).window.document;
+        let toDocument = createJSDOMModule({
+            dir: __dirname,
+            html: "<html><body>" + toHTML + "</body></html>"
+        }).window.document;
 
         let fromNode = fromDocument.body;
         let realToNode = toDocument.body;
 
-        var targetVEl = require('marko/runtime/vdom/vdom').___virtualize(realToNode);
+        var targetVEl = require("marko/runtime/vdom/vdom").___virtualize(
+            realToNode
+        );
         var expectedHTML = serializeNode(realToNode);
-        fs.writeFileSync(path.join(dir, 'expected.html'), expectedHTML, { encoding: 'utf8' });
+        fs.writeFileSync(path.join(dir, "expected.html"), expectedHTML, {
+            encoding: "utf8"
+        });
 
         var parentNode = fromNode;
         var startNode = fromNode.firstChild;
@@ -140,10 +129,17 @@ describe('morphdom', function () {
             }
         };
 
-        morphdom(parentNode, startNode, endNode, toNode, doc, componentsContext);
+        morphdom(
+            parentNode,
+            startNode,
+            endNode,
+            toNode,
+            doc,
+            componentsContext
+        );
 
         var actualHTML = serializeNode(fromNode);
-        helpers.compare(actualHTML, '.html');
+        helpers.compare(actualHTML, ".html");
 
         return done();
     });
diff --git a/test/node-require/index.test.js b/test/node-require/index.test.js
index 079a61de8..d01cc65a3 100644
--- a/test/node-require/index.test.js
+++ b/test/node-require/index.test.js
@@ -1,13 +1,13 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-const chai = require('chai');
+const chai = require("chai");
 chai.Assertion.includeStack = true;
-require('chai').should();
-const expect = require('chai').expect;
+require("chai").should();
+const expect = require("chai").expect;
 
-var nodeRequire = require('../../node-require');
+var nodeRequire = require("../../node-require");
 
 function testNodeRequireInstall(options, expected) {
     let requireObj = {
@@ -20,7 +20,7 @@ function testNodeRequireInstall(options, expected) {
 
     for (let i = 0; i < expected.length; i++) {
         let ext = expected[i];
-        expect(requireObj.extensions[ext]).to.be.a('function');
+        expect(requireObj.extensions[ext]).to.be.a("function");
     }
 
     expected.sort();
@@ -29,42 +29,56 @@ function testNodeRequireInstall(options, expected) {
     expect(expected).to.deep.equal(actualKeys);
 }
 
-describe('node-require', function () {
-
-    it('should consolidate using both extension and extensions', function () {
-        testNodeRequireInstall({
-            extension: '.marko.xml',
-            extensions: ['.marko', '.html']
-        }, ['.marko.xml', '.marko', '.html']);
+describe("node-require", function() {
+    it("should consolidate using both extension and extensions", function() {
+        testNodeRequireInstall(
+            {
+                extension: ".marko.xml",
+                extensions: [".marko", ".html"]
+            },
+            [".marko.xml", ".marko", ".html"]
+        );
     });
 
-    it('should consolidate using only extensions', function () {
-        testNodeRequireInstall({
-            extensions: ['.marko', '.html']
-        }, ['.marko', '.html']);
+    it("should consolidate using only extensions", function() {
+        testNodeRequireInstall(
+            {
+                extensions: [".marko", ".html"]
+            },
+            [".marko", ".html"]
+        );
     });
 
-    it('should consolidate using only extension', function () {
-        testNodeRequireInstall({
-            extension: '.marko.xml'
-        }, ['.marko.xml']);
+    it("should consolidate using only extension", function() {
+        testNodeRequireInstall(
+            {
+                extension: ".marko.xml"
+            },
+            [".marko.xml"]
+        );
     });
 
-    it('should consolidate using extension and empty array of extensions', function () {
-        testNodeRequireInstall({
-            extension: '.marko.xml',
-            extensions: []
-        }, ['.marko.xml']);
+    it("should consolidate using extension and empty array of extensions", function() {
+        testNodeRequireInstall(
+            {
+                extension: ".marko.xml",
+                extensions: []
+            },
+            [".marko.xml"]
+        );
     });
 
-    it('should consolidate with .marko when neither extension or extensions provided', function () {
-        testNodeRequireInstall({}, ['.marko']);
+    it("should consolidate with .marko when neither extension or extensions provided", function() {
+        testNodeRequireInstall({}, [".marko"]);
     });
 
-    it('should insert missing period into extensions', function () {
-        testNodeRequireInstall({
-            extension: 'marko.xml',
-            extensions: ['html']
-        }, ['.marko.xml', '.html']);
+    it("should insert missing period into extensions", function() {
+        testNodeRequireInstall(
+            {
+                extension: "marko.xml",
+                extensions: ["html"]
+            },
+            [".marko.xml", ".html"]
+        );
     });
 });
diff --git a/test/parseExpression/index.test.js b/test/parseExpression/index.test.js
index 62a462650..abcdaa904 100644
--- a/test/parseExpression/index.test.js
+++ b/test/parseExpression/index.test.js
@@ -1,23 +1,22 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var autotest = require('../autotest');
-var fs = require('fs');
-var path = require('path');
-var compiler = require('../../compiler');
+var autotest = require("../autotest");
+var fs = require("fs");
+var path = require("path");
+var compiler = require("../../compiler");
 
-describe('parseExpression', function () {
-
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("parseExpression", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var inputPath = path.join(dir, 'input.txt');
-        var input = fs.readFileSync(inputPath, { encoding: 'utf8' });
+        var inputPath = path.join(dir, "input.txt");
+        var input = fs.readFileSync(inputPath, { encoding: "utf8" });
         var parsed = compiler.builder.parseExpression(input);
-        helpers.compare(parsed, '.json');
+        helpers.compare(parsed, ".json");
         return done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/parseFor/index.test.js b/test/parseFor/index.test.js
index 597480009..af937dcbe 100644
--- a/test/parseFor/index.test.js
+++ b/test/parseFor/index.test.js
@@ -1,35 +1,37 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var parseFor = require('marko/taglibs/core/util/parseFor.js');
-var autotest = require('../autotest');
-var fs = require('fs');
-var path = require('path');
+var parseFor = require("marko/taglibs/core/util/parseFor.js");
+var autotest = require("../autotest");
+var fs = require("fs");
+var path = require("path");
 
-describe('parseFor', function () {
-
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("parseFor", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        let inputPath = path.join(dir, 'input.txt');
-        let input = fs.readFileSync(inputPath, { encoding: 'utf8' });
+        let inputPath = path.join(dir, "input.txt");
+        let input = fs.readFileSync(inputPath, { encoding: "utf8" });
 
         try {
             let parsed = parseFor(input);
-            helpers.compare(parsed, '.json');
+            helpers.compare(parsed, ".json");
             return done();
         } catch (e) {
-            if (e.code === 'INVALID_FOR') {
-                helpers.compare({
-                    error: e.message
-                }, '.json');
+            if (e.code === "INVALID_FOR") {
+                helpers.compare(
+                    {
+                        error: e.message
+                    },
+                    ".json"
+                );
                 return done();
             } else {
                 throw e;
             }
         }
     });
-});
\ No newline at end of file
+});
diff --git a/test/parseImport/index.test.js b/test/parseImport/index.test.js
index 41d95e487..f40dd6610 100644
--- a/test/parseImport/index.test.js
+++ b/test/parseImport/index.test.js
@@ -1,35 +1,37 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var parseFor = require('marko/taglibs/core/util/parseImport.js');
-var autotest = require('../autotest');
-var fs = require('fs');
-var path = require('path');
+var parseFor = require("marko/taglibs/core/util/parseImport.js");
+var autotest = require("../autotest");
+var fs = require("fs");
+var path = require("path");
 
-describe('parseImport', function () {
-
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("parseImport", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        let inputPath = path.join(dir, 'input.txt');
-        let input = fs.readFileSync(inputPath, { encoding: 'utf8' });
+        let inputPath = path.join(dir, "input.txt");
+        let input = fs.readFileSync(inputPath, { encoding: "utf8" });
 
         try {
             let parsed = parseFor(input);
-            helpers.compare(parsed, '.json');
+            helpers.compare(parsed, ".json");
             return done();
         } catch (e) {
-            if (e.code === 'INVALID_FOR') {
-                helpers.compare({
-                    error: e.message
-                }, '.json');
+            if (e.code === "INVALID_FOR") {
+                helpers.compare(
+                    {
+                        error: e.message
+                    },
+                    ".json"
+                );
                 return done();
             } else {
                 throw e;
             }
         }
     });
-});
\ No newline at end of file
+});
diff --git a/test/parseJavaScriptArgs/index.test.js b/test/parseJavaScriptArgs/index.test.js
index 191eca33b..ff0550350 100644
--- a/test/parseJavaScriptArgs/index.test.js
+++ b/test/parseJavaScriptArgs/index.test.js
@@ -1,23 +1,22 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
-var fs = require('fs');
-var path = require('path');
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
+var fs = require("fs");
+var path = require("path");
 
-describe('parseJavaScriptArgs', function () {
-
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("parseJavaScriptArgs", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var inputPath = path.join(dir, 'input.txt');
-        var input = fs.readFileSync(inputPath, { encoding: 'utf8' });
+        var inputPath = path.join(dir, "input.txt");
+        var input = fs.readFileSync(inputPath, { encoding: "utf8" });
         var parsed = compiler.builder.parseJavaScriptArgs(input);
-        helpers.compare(parsed, '.json');
+        helpers.compare(parsed, ".json");
         return done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/parser/index.test.js b/test/parser/index.test.js
index 014cf5c38..644322c67 100644
--- a/test/parser/index.test.js
+++ b/test/parser/index.test.js
@@ -1,31 +1,30 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('marko/compiler');
+var path = require("path");
+var compiler = require("marko/compiler");
 var builder = compiler.createBuilder();
-var autotest = require('../autotest');
-var fs = require('fs');
-var compiler = require('marko/compiler');
-var CompileContext = require('marko/compiler/CompileContext');
-var HtmlJsParser = require('marko/compiler/HtmlJsParser');
-var Parser = require('marko/compiler/Parser');
+var autotest = require("../autotest");
+var fs = require("fs");
+var CompileContext = require("marko/compiler/CompileContext");
+var HtmlJsParser = require("marko/compiler/HtmlJsParser");
+var Parser = require("marko/compiler/Parser");
 var parser = new Parser(new HtmlJsParser());
 
 compiler.buildTaglibLookup(__dirname);
 
-describe('compiler/parser', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("compiler/parser", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var templatePath = path.join(dir, 'template.marko');
-        var src = fs.readFileSync(templatePath, { encoding: 'utf8' });
+        var templatePath = path.join(dir, "template.marko");
+        var src = fs.readFileSync(templatePath, { encoding: "utf8" });
         var context = new CompileContext(src, templatePath, builder);
         var ast = parser.parse(src, context);
-        helpers.compare(ast, '.json');
+        helpers.compare(ast, ".json");
         return done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/pretty-print/fixtures/assignment/index.js b/test/pretty-print/fixtures/assignment/index.js
index 02f005e82..fc3f39e4e 100644
--- a/test/pretty-print/fixtures/assignment/index.js
+++ b/test/pretty-print/fixtures/assignment/index.js
@@ -1,6 +1,6 @@
-module.exports = function (builder) {
+module.exports = function(builder) {
     var templateRoot = builder.templateRoot;
     var assignment = builder.assignment;
 
-    return templateRoot([assignment('a', '1')]);
-};
\ No newline at end of file
+    return templateRoot([assignment("a", "1")]);
+};
diff --git a/test/pretty-print/fixtures/marko-template/index.js b/test/pretty-print/fixtures/marko-template/index.js
index c1fd313bb..84fa7d52b 100644
--- a/test/pretty-print/fixtures/marko-template/index.js
+++ b/test/pretty-print/fixtures/marko-template/index.js
@@ -1,4 +1,4 @@
-module.exports = function (builder) {
+module.exports = function(builder) {
     var templateRoot = builder.templateRoot;
     var literal = builder.literal;
     var functionDeclaration = builder.functionDeclaration;
@@ -10,5 +10,62 @@ module.exports = function (builder) {
     var html = builder.html;
     var htmlElement = builder.htmlElement;
 
-    return templateRoot([functionDeclaration('create', ['__helpers'], [vars([{ id: 'str', init: '__helpers.s' }, { id: 'empty', init: '__helpers.e' }, { id: 'notEmpty', init: '__helpers.ne' }]), returnStatement(functionDeclaration('render', ['data', 'out'], [text(literal('Hello')), html('data.name'), text(literal('!')), ifStatement(functionCall('notEmpty', ['data.colors']), [htmlElement('ul', [{ name: 'class', value: literal('colors') }], [functionCall('forEach', ['data.colors', functionDeclaration(null, ['color'], [htmlElement('li', { 'class': literal('color') }, [text('color')])])])])])]))])]);
-};
\ No newline at end of file
+    return templateRoot([
+        functionDeclaration(
+            "create",
+            ["__helpers"],
+            [
+                vars([
+                    { id: "str", init: "__helpers.s" },
+                    { id: "empty", init: "__helpers.e" },
+                    { id: "notEmpty", init: "__helpers.ne" }
+                ]),
+                returnStatement(
+                    functionDeclaration(
+                        "render",
+                        ["data", "out"],
+                        [
+                            text(literal("Hello")),
+                            html("data.name"),
+                            text(literal("!")),
+                            ifStatement(
+                                functionCall("notEmpty", ["data.colors"]),
+                                [
+                                    htmlElement(
+                                        "ul",
+                                        [
+                                            {
+                                                name: "class",
+                                                value: literal("colors")
+                                            }
+                                        ],
+                                        [
+                                            functionCall("forEach", [
+                                                "data.colors",
+                                                functionDeclaration(
+                                                    null,
+                                                    ["color"],
+                                                    [
+                                                        htmlElement(
+                                                            "li",
+                                                            {
+                                                                class: literal(
+                                                                    "color"
+                                                                )
+                                                            },
+                                                            [text("color")]
+                                                        )
+                                                    ]
+                                                )
+                                            ])
+                                        ]
+                                    )
+                                ]
+                            )
+                        ]
+                    )
+                )
+            ]
+        )
+    ]);
+};
diff --git a/test/pretty-print/index.test.js b/test/pretty-print/index.test.js
index d608c5853..48300e951 100644
--- a/test/pretty-print/index.test.js
+++ b/test/pretty-print/index.test.js
@@ -1,21 +1,21 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('../../compiler');
+var path = require("path");
+var compiler = require("../../compiler");
 var builder = compiler.createBuilder();
-var autotest = require('../autotest');
+var autotest = require("../autotest");
 
-describe('compiler/pretty-print', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("compiler/pretty-print", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var getAST = require(path.join(dir, 'index.js'));
+        var getAST = require(path.join(dir, "index.js"));
         var ast = getAST(builder);
-        helpers.compare(ast, '.json');
+        helpers.compare(ast, ".json");
         return done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/render/fixtures-deprecated/assign-computed-prop/test.js b/test/render/fixtures-deprecated/assign-computed-prop/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assign-computed-prop/test.js
+++ b/test/render/fixtures-deprecated/assign-computed-prop/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/assign-tag-unary-postfix/test.js b/test/render/fixtures-deprecated/assign-tag-unary-postfix/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assign-tag-unary-postfix/test.js
+++ b/test/render/fixtures-deprecated/assign-tag-unary-postfix/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/assign-tag-unary-prefix/test.js b/test/render/fixtures-deprecated/assign-tag-unary-prefix/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assign-tag-unary-prefix/test.js
+++ b/test/render/fixtures-deprecated/assign-tag-unary-prefix/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/assign-tag/test.js b/test/render/fixtures-deprecated/assign-tag/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assign-tag/test.js
+++ b/test/render/fixtures-deprecated/assign-tag/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/assignment-concise/test.js b/test/render/fixtures-deprecated/assignment-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assignment-concise/test.js
+++ b/test/render/fixtures-deprecated/assignment-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/assignment/test.js b/test/render/fixtures-deprecated/assignment/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/assignment/test.js
+++ b/test/render/fixtures-deprecated/assignment/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/component-aria-key/test.js b/test/render/fixtures-deprecated/component-aria-key/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/render/fixtures-deprecated/component-aria-key/test.js
+++ b/test/render/fixtures-deprecated/component-aria-key/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures-deprecated/data/test.js b/test/render/fixtures-deprecated/data/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures-deprecated/data/test.js
+++ b/test/render/fixtures-deprecated/data/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures-deprecated/invoke/test.js b/test/render/fixtures-deprecated/invoke/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/invoke/test.js
+++ b/test/render/fixtures-deprecated/invoke/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/layout-use-dashed/test.js b/test/render/fixtures-deprecated/layout-use-dashed/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures-deprecated/layout-use-dashed/test.js
+++ b/test/render/fixtures-deprecated/layout-use-dashed/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures-deprecated/layout-use-data-attrs/test.js b/test/render/fixtures-deprecated/layout-use-data-attrs/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures-deprecated/layout-use-data-attrs/test.js
+++ b/test/render/fixtures-deprecated/layout-use-data-attrs/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures-deprecated/layout-use-data/test.js b/test/render/fixtures-deprecated/layout-use-data/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures-deprecated/layout-use-data/test.js
+++ b/test/render/fixtures-deprecated/layout-use-data/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures-deprecated/layout-use-html-ext/test.js b/test/render/fixtures-deprecated/layout-use-html-ext/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/layout-use-html-ext/test.js
+++ b/test/render/fixtures-deprecated/layout-use-html-ext/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/layout-use/test.js b/test/render/fixtures-deprecated/layout-use/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures-deprecated/layout-use/test.js
+++ b/test/render/fixtures-deprecated/layout-use/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures-deprecated/reserved-words-var/marko.json b/test/render/fixtures-deprecated/reserved-words-var/marko.json
index e8d84d80a..100feeffc 100644
--- a/test/render/fixtures-deprecated/reserved-words-var/marko.json
+++ b/test/render/fixtures-deprecated/reserved-words-var/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./my-custom-tag.js",
         "@short": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures-deprecated/reserved-words-var/my-custom-tag.js b/test/render/fixtures-deprecated/reserved-words-var/my-custom-tag.js
index d3b076460..8c2aa9941 100644
--- a/test/render/fixtures-deprecated/reserved-words-var/my-custom-tag.js
+++ b/test/render/fixtures-deprecated/reserved-words-var/my-custom-tag.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('[my-custom-tag] ' + input.short);
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("[my-custom-tag] " + input.short);
+};
diff --git a/test/render/fixtures-deprecated/reserved-words-var/test.js b/test/render/fixtures-deprecated/reserved-words-var/test.js
index 9fa72c742..3cd7190ac 100644
--- a/test/render/fixtures-deprecated/reserved-words-var/test.js
+++ b/test/render/fixtures-deprecated/reserved-words-var/test.js
@@ -1,14 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {
-    short: 'short'
+    short: "short"
 };
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:0');
-    expect(message).to.contain('Invalid JavaScript variable name: short');
-};
\ No newline at end of file
+    expect(message).to.contain("template.marko:1:0");
+    expect(message).to.contain("Invalid JavaScript variable name: short");
+};
diff --git a/test/render/fixtures-deprecated/var-scoped/test.js b/test/render/fixtures-deprecated/var-scoped/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/var-scoped/test.js
+++ b/test/render/fixtures-deprecated/var-scoped/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/var-scoped2/test.js b/test/render/fixtures-deprecated/var-scoped2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/var-scoped2/test.js
+++ b/test/render/fixtures-deprecated/var-scoped2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/var/test.js b/test/render/fixtures-deprecated/var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/var/test.js
+++ b/test/render/fixtures-deprecated/var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures-deprecated/whitespace-var-scoped/test.js b/test/render/fixtures-deprecated/whitespace-var-scoped/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures-deprecated/whitespace-var-scoped/test.js
+++ b/test/render/fixtures-deprecated/whitespace-var-scoped/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-boolean-dynamic/test.js b/test/render/fixtures/attr-boolean-dynamic/test.js
index bb3acc331..73ffdbf79 100644
--- a/test/render/fixtures/attr-boolean-dynamic/test.js
+++ b/test/render/fixtures/attr-boolean-dynamic/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
     isGreenSelected: true,
     isBlueSelected: false
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-boolean-placeholder/test.js b/test/render/fixtures/attr-boolean-placeholder/test.js
index a98bcb7fe..135bfb311 100644
--- a/test/render/fixtures/attr-boolean-placeholder/test.js
+++ b/test/render/fixtures/attr-boolean-placeholder/test.js
@@ -1,14 +1,18 @@
 exports.templateData = {
-    "options": [{
-        "value": "red",
-        "selected": false
-    }, {
-        "value": "green",
-        "selected": true
-    }, {
-        "value": "blue",
-        "selected": false
-    }],
-    "disabled": false,
-    "checked": true
-};
\ No newline at end of file
+    options: [
+        {
+            value: "red",
+            selected: false
+        },
+        {
+            value: "green",
+            selected: true
+        },
+        {
+            value: "blue",
+            selected: false
+        }
+    ],
+    disabled: false,
+    checked: true
+};
diff --git a/test/render/fixtures/attr-boolean-static/test.js b/test/render/fixtures/attr-boolean-static/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-boolean-static/test.js
+++ b/test/render/fixtures/attr-boolean-static/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-empty-dynamic/test.js b/test/render/fixtures/attr-empty-dynamic/test.js
index 5c6f7a5e5..7e616a8db 100644
--- a/test/render/fixtures/attr-empty-dynamic/test.js
+++ b/test/render/fixtures/attr-empty-dynamic/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
     myAlt: null
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-empty/test.js b/test/render/fixtures/attr-empty/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-empty/test.js
+++ b/test/render/fixtures/attr-empty/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-escape-xml/test.js b/test/render/fixtures/attr-escape-xml/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-escape-xml/test.js
+++ b/test/render/fixtures/attr-escape-xml/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-newline-concise/test.js b/test/render/fixtures/attr-newline-concise/test.js
index bb3acc331..73ffdbf79 100644
--- a/test/render/fixtures/attr-newline-concise/test.js
+++ b/test/render/fixtures/attr-newline-concise/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
     isGreenSelected: true,
     isBlueSelected: false
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-newline-escaped/test.js b/test/render/fixtures/attr-newline-escaped/test.js
index bb3acc331..73ffdbf79 100644
--- a/test/render/fixtures/attr-newline-escaped/test.js
+++ b/test/render/fixtures/attr-newline-escaped/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
     isGreenSelected: true,
     isBlueSelected: false
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-newline/test.js b/test/render/fixtures/attr-newline/test.js
index bb3acc331..73ffdbf79 100644
--- a/test/render/fixtures/attr-newline/test.js
+++ b/test/render/fixtures/attr-newline/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
     isGreenSelected: true,
     isBlueSelected: false
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-number/test.js b/test/render/fixtures/attr-number/test.js
index a3998af96..fb664dd37 100644
--- a/test/render/fixtures/attr-number/test.js
+++ b/test/render/fixtures/attr-number/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
     message: {
-        safeHTML: '<span>Hello World</span>'
+        safeHTML: "<span>Hello World</span>"
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-object-dynamic/test.js b/test/render/fixtures/attr-object-dynamic/test.js
index 769ffb4e3..4fd76fda3 100644
--- a/test/render/fixtures/attr-object-dynamic/test.js
+++ b/test/render/fixtures/attr-object-dynamic/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    myObject: { hello: 'world\'s' }
-};
\ No newline at end of file
+    myObject: { hello: "world's" }
+};
diff --git a/test/render/fixtures/attr-object/test.js b/test/render/fixtures/attr-object/test.js
index 015cec295..ad2491da5 100644
--- a/test/render/fixtures/attr-object/test.js
+++ b/test/render/fixtures/attr-object/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = false;
\ No newline at end of file
+exports.vdomSkip = false;
diff --git a/test/render/fixtures/attr-path/foo-tag.js b/test/render/fixtures/attr-path/foo-tag.js
index d0cd6be6e..294df0e15 100644
--- a/test/render/fixtures/attr-path/foo-tag.js
+++ b/test/render/fixtures/attr-path/foo-tag.js
@@ -1,5 +1,5 @@
-var fs = require('fs');
+var fs = require("fs");
 
-module.exports = function (input, out) {
-    out.write('File: ' + fs.readFileSync(input.file, { encoding: 'utf8' }));
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("File: " + fs.readFileSync(input.file, { encoding: "utf8" }));
+};
diff --git a/test/render/fixtures/attr-path/marko.json b/test/render/fixtures/attr-path/marko.json
index b83fa4189..345b852e2 100644
--- a/test/render/fixtures/attr-path/marko.json
+++ b/test/render/fixtures/attr-path/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./foo-tag.js",
         "@file": "path"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/attr-placeholder-escaped-undefined/test.js b/test/render/fixtures/attr-placeholder-escaped-undefined/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-placeholder-escaped-undefined/test.js
+++ b/test/render/fixtures/attr-placeholder-escaped-undefined/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-placeholder-unescaped-undefined/test.js b/test/render/fixtures/attr-placeholder-unescaped-undefined/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-placeholder-unescaped-undefined/test.js
+++ b/test/render/fixtures/attr-placeholder-unescaped-undefined/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-set-flag/marko.json b/test/render/fixtures/attr-set-flag/marko.json
index 1084f5a43..7db195fc0 100644
--- a/test/render/fixtures/attr-set-flag/marko.json
+++ b/test/render/fixtures/attr-set-flag/marko.json
@@ -8,4 +8,4 @@
         },
         "transformer": "./transformer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/attr-set-flag/transformer.js b/test/render/fixtures/attr-set-flag/transformer.js
index 8e1f96967..30a4e37cb 100644
--- a/test/render/fixtures/attr-set-flag/transformer.js
+++ b/test/render/fixtures/attr-set-flag/transformer.js
@@ -1,5 +1,5 @@
 module.exports = function transform(el, context) {
-    if (el.isFlagSet('testFlag')) {
-        el.setAttributeValue('FLAG_SET', context.builder.literalTrue());
+    if (el.isFlagSet("testFlag")) {
+        el.setAttributeValue("FLAG_SET", context.builder.literalTrue());
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-special-object-expression/test.js b/test/render/fixtures/attr-special-object-expression/test.js
index e60c209de..2c5ca4d6a 100644
--- a/test/render/fixtures/attr-special-object-expression/test.js
+++ b/test/render/fixtures/attr-special-object-expression/test.js
@@ -1,6 +1,6 @@
 exports.templateData = {
     specialData: {
-        foo: 'bar'
+        foo: "bar"
     }
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/attr-special-object-literal/test.js b/test/render/fixtures/attr-special-object-literal/test.js
index e60c209de..2c5ca4d6a 100644
--- a/test/render/fixtures/attr-special-object-literal/test.js
+++ b/test/render/fixtures/attr-special-object-literal/test.js
@@ -1,6 +1,6 @@
 exports.templateData = {
     specialData: {
-        foo: 'bar'
+        foo: "bar"
     }
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/attr-template/foo-tag.js b/test/render/fixtures/attr-template/foo-tag.js
index 4242d84ae..5f9925ecf 100644
--- a/test/render/fixtures/attr-template/foo-tag.js
+++ b/test/render/fixtures/attr-template/foo-tag.js
@@ -1,4 +1,4 @@
-module.exports = function (input, out) {
-    out.write('Rendered template:');
+module.exports = function(input, out) {
+    out.write("Rendered template:");
     input.template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/attr-template/marko.json b/test/render/fixtures/attr-template/marko.json
index 9b535c3ce..3e0845945 100644
--- a/test/render/fixtures/attr-template/marko.json
+++ b/test/render/fixtures/attr-template/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./foo-tag.js",
         "@template": "template"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/attr-value-number/test.js b/test/render/fixtures/attr-value-number/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-value-number/test.js
+++ b/test/render/fixtures/attr-value-number/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attr-value-obj/test.js b/test/render/fixtures/attr-value-obj/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attr-value-obj/test.js
+++ b/test/render/fixtures/attr-value-obj/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/marko-tag.json b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/marko-tag.json
+++ b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/renderer.js b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/renderer.js
+++ b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/components/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/test.js b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag-mixed/test.js
+++ b/test/render/fixtures/attributes-dynamic-custom-tag-mixed/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/marko-tag.json b/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/marko-tag.json
+++ b/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/renderer.js b/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/renderer.js
+++ b/test/render/fixtures/attributes-dynamic-custom-tag/components/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/attributes-dynamic-custom-tag/test.js b/test/render/fixtures/attributes-dynamic-custom-tag/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/attributes-dynamic-custom-tag/test.js
+++ b/test/render/fixtures/attributes-dynamic-custom-tag/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/attrs/test.js b/test/render/fixtures/attrs/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/attrs/test.js
+++ b/test/render/fixtures/attrs/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/autocomplete/marko.json b/test/render/fixtures/autocomplete/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/autocomplete/marko.json
+++ b/test/render/fixtures/autocomplete/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/autocomplete/tags/test-hello/marko-tag.json b/test/render/fixtures/autocomplete/tags/test-hello/marko-tag.json
index 4af8ad434..2355b56ba 100644
--- a/test/render/fixtures/autocomplete/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/autocomplete/tags/test-hello/marko-tag.json
@@ -18,4 +18,4 @@
             "snippet": "test-hello foo=$1"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/autocomplete/tags/test-hello/renderer.js b/test/render/fixtures/autocomplete/tags/test-hello/renderer.js
index 9b450f7f3..c618ded1c 100644
--- a/test/render/fixtures/autocomplete/tags/test-hello/renderer.js
+++ b/test/render/fixtures/autocomplete/tags/test-hello/renderer.js
@@ -1,3 +1,3 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+};
diff --git a/test/render/fixtures/autocomplete/test.js b/test/render/fixtures/autocomplete/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/autocomplete/test.js
+++ b/test/render/fixtures/autocomplete/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/body-only-if-custom-tag/test.js b/test/render/fixtures/body-only-if-custom-tag/test.js
index 888c6c13b..4eb98bd9a 100644
--- a/test/render/fixtures/body-only-if-custom-tag/test.js
+++ b/test/render/fixtures/body-only-if-custom-tag/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "url": "/foo"
-};
\ No newline at end of file
+    url: "/foo"
+};
diff --git a/test/render/fixtures/body-only-if/test.js b/test/render/fixtures/body-only-if/test.js
index 888c6c13b..4eb98bd9a 100644
--- a/test/render/fixtures/body-only-if/test.js
+++ b/test/render/fixtures/body-only-if/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "url": "/foo"
-};
\ No newline at end of file
+    url: "/foo"
+};
diff --git a/test/render/fixtures/body-placeholder-literal-escaped/test.js b/test/render/fixtures/body-placeholder-literal-escaped/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/body-placeholder-literal-escaped/test.js
+++ b/test/render/fixtures/body-placeholder-literal-escaped/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/body-placeholder-literal-unescaped-escaped/test.js b/test/render/fixtures/body-placeholder-literal-unescaped-escaped/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/body-placeholder-literal-unescaped-escaped/test.js
+++ b/test/render/fixtures/body-placeholder-literal-unescaped-escaped/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/body-placeholder-literal-unescaped/test.js b/test/render/fixtures/body-placeholder-literal-unescaped/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/body-placeholder-literal-unescaped/test.js
+++ b/test/render/fixtures/body-placeholder-literal-unescaped/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/body-placeholder-literal/test.js b/test/render/fixtures/body-placeholder-literal/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/body-placeholder-literal/test.js
+++ b/test/render/fixtures/body-placeholder-literal/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/body-placeholder-literal2/test.js b/test/render/fixtures/body-placeholder-literal2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/body-placeholder-literal2/test.js
+++ b/test/render/fixtures/body-placeholder-literal2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/bodyText/marko.json b/test/render/fixtures/bodyText/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/bodyText/marko.json
+++ b/test/render/fixtures/bodyText/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/bodyText/tags/test-bodyText/code-generator.js b/test/render/fixtures/bodyText/tags/test-bodyText/code-generator.js
index 266d6ad0d..c3503a139 100644
--- a/test/render/fixtures/bodyText/tags/test-bodyText/code-generator.js
+++ b/test/render/fixtures/bodyText/tags/test-bodyText/code-generator.js
@@ -4,5 +4,7 @@ function compile(bodyText) {
 
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
-    return builder.htmlElement('script', {}, [builder.text(builder.literal(compile(elNode.bodyText)))]);
-};
\ No newline at end of file
+    return builder.htmlElement("script", {}, [
+        builder.text(builder.literal(compile(elNode.bodyText)))
+    ]);
+};
diff --git a/test/render/fixtures/bodyText/tags/test-bodyText/marko-tag.json b/test/render/fixtures/bodyText/tags/test-bodyText/marko-tag.json
index f505648ca..c0aab96e9 100644
--- a/test/render/fixtures/bodyText/tags/test-bodyText/marko-tag.json
+++ b/test/render/fixtures/bodyText/tags/test-bodyText/marko-tag.json
@@ -2,4 +2,4 @@
     "code-generator": "./code-generator",
     "body": "static-text",
     "preserve-whitespace": true
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/bodyText/test.js b/test/render/fixtures/bodyText/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/bodyText/test.js
+++ b/test/render/fixtures/bodyText/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/cdata/test.js b/test/render/fixtures/cdata/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/cdata/test.js
+++ b/test/render/fixtures/cdata/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/circular-renderer/marko.json b/test/render/fixtures/circular-renderer/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/circular-renderer/marko.json
+++ b/test/render/fixtures/circular-renderer/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/circular-renderer/tags/test-circular-renderer-a/renderer.js b/test/render/fixtures/circular-renderer/tags/test-circular-renderer-a/renderer.js
index 17df36896..f2a6d06e5 100644
--- a/test/render/fixtures/circular-renderer/tags/test-circular-renderer-a/renderer.js
+++ b/test/render/fixtures/circular-renderer/tags/test-circular-renderer-a/renderer.js
@@ -1,5 +1,5 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     template.render({}, out);
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/circular-renderer/tags/test-circular-renderer-b/renderer.js b/test/render/fixtures/circular-renderer/tags/test-circular-renderer-b/renderer.js
index 93b4a57df..a36af6fe8 100644
--- a/test/render/fixtures/circular-renderer/tags/test-circular-renderer-b/renderer.js
+++ b/test/render/fixtures/circular-renderer/tags/test-circular-renderer-b/renderer.js
@@ -1,5 +1,3 @@
-var template = require('./template.marko');
-
-exports.renderer = function (input, out) {
-    out.write('test-circular-renderer-b');
-};
\ No newline at end of file
+exports.renderer = function(input, out) {
+    out.write("test-circular-renderer-b");
+};
diff --git a/test/render/fixtures/circular-renderer/test.js b/test/render/fixtures/circular-renderer/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/circular-renderer/test.js
+++ b/test/render/fixtures/circular-renderer/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/circular-tags-no-write-to-disk/marko.json b/test/render/fixtures/circular-tags-no-write-to-disk/marko.json
index c7418f6d2..855c4ccca 100644
--- a/test/render/fixtures/circular-tags-no-write-to-disk/marko.json
+++ b/test/render/fixtures/circular-tags-no-write-to-disk/marko.json
@@ -1 +1 @@
-{ "tags-dir": "./tags/" }
\ No newline at end of file
+{ "tags-dir": "./tags/" }
diff --git a/test/render/fixtures/circular-tags-no-write-to-disk/test.js b/test/render/fixtures/circular-tags-no-write-to-disk/test.js
index 920230bf8..6527fc9cf 100644
--- a/test/render/fixtures/circular-tags-no-write-to-disk/test.js
+++ b/test/render/fixtures/circular-tags-no-write-to-disk/test.js
@@ -1,14 +1,20 @@
 exports.templateData = {
-    items: [{
-        label: 'a'
-    }, {
-        label: 'b',
-        children: [{
-            label: 'b1'
-        }, {
-            label: 'b2'
-        }]
-    }]
+    items: [
+        {
+            label: "a"
+        },
+        {
+            label: "b",
+            children: [
+                {
+                    label: "b1"
+                },
+                {
+                    label: "b2"
+                }
+            ]
+        }
+    ]
 };
 
-exports.writeToDisk = false;
\ No newline at end of file
+exports.writeToDisk = false;
diff --git a/test/render/fixtures/circular-template/marko.json b/test/render/fixtures/circular-template/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/circular-template/marko.json
+++ b/test/render/fixtures/circular-template/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/circular-template/test.js b/test/render/fixtures/circular-template/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/circular-template/test.js
+++ b/test/render/fixtures/circular-template/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/class-attr-array/test.js b/test/render/fixtures/class-attr-array/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/class-attr-array/test.js
+++ b/test/render/fixtures/class-attr-array/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/class-attr-object/test.js b/test/render/fixtures/class-attr-object/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/class-attr-object/test.js
+++ b/test/render/fixtures/class-attr-object/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/class-attr-shorthand-plus-expression/test.js b/test/render/fixtures/class-attr-shorthand-plus-expression/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/class-attr-shorthand-plus-expression/test.js
+++ b/test/render/fixtures/class-attr-shorthand-plus-expression/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/class-attr-string/test.js b/test/render/fixtures/class-attr-string/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/class-attr-string/test.js
+++ b/test/render/fixtures/class-attr-string/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/comments-preserve-ie-conditional/test.js b/test/render/fixtures/comments-preserve-ie-conditional/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/comments-preserve-ie-conditional/test.js
+++ b/test/render/fixtures/comments-preserve-ie-conditional/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/comments-remove/test.js b/test/render/fixtures/comments-remove/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/comments-remove/test.js
+++ b/test/render/fixtures/comments-remove/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/component-aria-key/test.js b/test/render/fixtures/component-aria-key/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/render/fixtures/component-aria-key/test.js
+++ b/test/render/fixtures/component-aria-key/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-elId/test.js b/test/render/fixtures/component-elId/test.js
index 6dd2a6137..a2f00fd3d 100644
--- a/test/render/fixtures/component-elId/test.js
+++ b/test/render/fixtures/component-elId/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-file-export-class/components/hello/component.js b/test/render/fixtures/component-file-export-class/components/hello/component.js
index 7f75b78a9..74f9549f1 100644
--- a/test/render/fixtures/component-file-export-class/components/hello/component.js
+++ b/test/render/fixtures/component-file-export-class/components/hello/component.js
@@ -1,9 +1,9 @@
-'use strict';
+"use strict";
 
 module.exports = class {
     onCreate() {
         this.state = {
-            name: 'Frank'
+            name: "Frank"
         };
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/component-file-export-class/test.js b/test/render/fixtures/component-file-export-class/test.js
index 5f29b8d51..5a70bfa8f 100644
--- a/test/render/fixtures/component-file-export-class/test.js
+++ b/test/render/fixtures/component-file-export-class/test.js
@@ -1 +1 @@
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-getElId/test.js b/test/render/fixtures/component-getElId/test.js
index 6dd2a6137..a2f00fd3d 100644
--- a/test/render/fixtures/component-getElId/test.js
+++ b/test/render/fixtures/component-getElId/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-inline-style-important/test.js b/test/render/fixtures/component-inline-style-important/test.js
index 6dd2a6137..a2f00fd3d 100644
--- a/test/render/fixtures/component-inline-style-important/test.js
+++ b/test/render/fixtures/component-inline-style-important/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-label-for/test.js b/test/render/fixtures/component-label-for/test.js
index e1afe5e07..340d63bd9 100644
--- a/test/render/fixtures/component-label-for/test.js
+++ b/test/render/fixtures/component-label-for/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "<label for=\"hello\">Hello</label>"
+    name: '<label for="hello">Hello</label>'
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/component-safe-json/test.js b/test/render/fixtures/component-safe-json/test.js
index 6dd2a6137..a2f00fd3d 100644
--- a/test/render/fixtures/component-safe-json/test.js
+++ b/test/render/fixtures/component-safe-json/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/components/components/split/component-browser.js b/test/render/fixtures/components/components/split/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/render/fixtures/components/components/split/component-browser.js
+++ b/test/render/fixtures/components/components/split/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/render/fixtures/components/components/split/components/split-child/component-browser.js b/test/render/fixtures/components/components/split/components/split-child/component-browser.js
index a09954537..f053ebf79 100644
--- a/test/render/fixtures/components/components/split/components/split-child/component-browser.js
+++ b/test/render/fixtures/components/components/split/components/split-child/component-browser.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};
diff --git a/test/render/fixtures/components/test.js b/test/render/fixtures/components/test.js
index 6dd2a6137..a2f00fd3d 100644
--- a/test/render/fixtures/components/test.js
+++ b/test/render/fixtures/components/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/concise-verbose/test.js b/test/render/fixtures/concise-verbose/test.js
index 464e2f790..e53da31ec 100644
--- a/test/render/fixtures/concise-verbose/test.js
+++ b/test/render/fixtures/concise-verbose/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Marko'
-};
\ No newline at end of file
+    name: "Marko"
+};
diff --git a/test/render/fixtures/concise/test.js b/test/render/fixtures/concise/test.js
index 464e2f790..e53da31ec 100644
--- a/test/render/fixtures/concise/test.js
+++ b/test/render/fixtures/concise/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Marko'
-};
\ No newline at end of file
+    name: "Marko"
+};
diff --git a/test/render/fixtures/conditional-attributes/test.js b/test/render/fixtures/conditional-attributes/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/conditional-attributes/test.js
+++ b/test/render/fixtures/conditional-attributes/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-element-assign-props/html-elements.json b/test/render/fixtures/custom-element-assign-props/html-elements.json
index 3983f63ae..c88f2f9ec 100644
--- a/test/render/fixtures/custom-element-assign-props/html-elements.json
+++ b/test/render/fixtures/custom-element-assign-props/html-elements.json
@@ -1,3 +1,3 @@
 {
-   "<ce-test>": {}
-}
\ No newline at end of file
+    "<ce-test>": {}
+}
diff --git a/test/render/fixtures/custom-tag-as-template/marko.json b/test/render/fixtures/custom-tag-as-template/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-as-template/marko.json
+++ b/test/render/fixtures/custom-tag-as-template/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-as-template/tags/test-template-as-tag/marko-tag.json b/test/render/fixtures/custom-tag-as-template/tags/test-template-as-tag/marko-tag.json
index 0c167f0e3..e6703ecbc 100644
--- a/test/render/fixtures/custom-tag-as-template/tags/test-template-as-tag/marko-tag.json
+++ b/test/render/fixtures/custom-tag-as-template/tags/test-template-as-tag/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "template": "./template.marko",
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-as-template/test.js b/test/render/fixtures/custom-tag-as-template/test.js
index c4183e5b8..d0824e2f3 100644
--- a/test/render/fixtures/custom-tag-as-template/test.js
+++ b/test/render/fixtures/custom-tag-as-template/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "title": "My Page Title"
-};
\ No newline at end of file
+    title: "My Page Title"
+};
diff --git a/test/render/fixtures/custom-tag-autodiscover/marko.json b/test/render/fixtures/custom-tag-autodiscover/marko.json
index acf15815f..a4096a267 100644
--- a/test/render/fixtures/custom-tag-autodiscover/marko.json
+++ b/test/render/fixtures/custom-tag-autodiscover/marko.json
@@ -1,3 +1,3 @@
 {
     "<test-home>": {}
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-autodiscover/test.js b/test/render/fixtures/custom-tag-autodiscover/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-autodiscover/test.js
+++ b/test/render/fixtures/custom-tag-autodiscover/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-body/marko.json b/test/render/fixtures/custom-tag-body/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-body/marko.json
+++ b/test/render/fixtures/custom-tag-body/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-body/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-body/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-body/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-body/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-body/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-body/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag-body/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-body/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-body/test.js b/test/render/fixtures/custom-tag-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-body/test.js
+++ b/test/render/fixtures/custom-tag-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-components-file/test.js b/test/render/fixtures/custom-tag-components-file/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-components-file/test.js
+++ b/test/render/fixtures/custom-tag-components-file/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-data-arg-with-attrs/marko.json b/test/render/fixtures/custom-tag-data-arg-with-attrs/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-data-arg-with-attrs/marko.json
+++ b/test/render/fixtures/custom-tag-data-arg-with-attrs/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-data-arg-with-attrs/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-data-arg-with-attrs/test.js b/test/render/fixtures/custom-tag-data-arg-with-attrs/test.js
index 53412fa4d..c87b63714 100644
--- a/test/render/fixtures/custom-tag-data-arg-with-attrs/test.js
+++ b/test/render/fixtures/custom-tag-data-arg-with-attrs/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "Frank",
-    "adult": true
-};
\ No newline at end of file
+    name: "Frank",
+    adult: true
+};
diff --git a/test/render/fixtures/custom-tag-data-arg/marko.json b/test/render/fixtures/custom-tag-data-arg/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-data-arg/marko.json
+++ b/test/render/fixtures/custom-tag-data-arg/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-data-arg/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-data-arg/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-data-arg/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-data-arg/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag-data-arg/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-data-arg/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-data-arg/test.js b/test/render/fixtures/custom-tag-data-arg/test.js
index 53412fa4d..c87b63714 100644
--- a/test/render/fixtures/custom-tag-data-arg/test.js
+++ b/test/render/fixtures/custom-tag-data-arg/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "Frank",
-    "adult": true
-};
\ No newline at end of file
+    name: "Frank",
+    adult: true
+};
diff --git a/test/render/fixtures/custom-tag-data-arg2/marko.json b/test/render/fixtures/custom-tag-data-arg2/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-data-arg2/marko.json
+++ b/test/render/fixtures/custom-tag-data-arg2/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-data-arg2/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-data-arg2/test.js b/test/render/fixtures/custom-tag-data-arg2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-data-arg2/test.js
+++ b/test/render/fixtures/custom-tag-data-arg2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-data-placeholders/marko.json b/test/render/fixtures/custom-tag-data-placeholders/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-data-placeholders/marko.json
+++ b/test/render/fixtures/custom-tag-data-placeholders/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/renderer.js
index 564f8d0da..9144e7463 100644
--- a/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-data-placeholders/tags/test-hello/renderer.js
@@ -1,24 +1,23 @@
-exports.render = function (input, out) {
+exports.render = function(input, out) {
+    var text = "Hello " + input.name + "!";
 
-	var text = 'Hello ' + input.name + '!';
+    if (input.adult === true) {
+        text += " (adult)";
+    } else if (input.adult === false) {
+        text += " (child)";
+    }
 
-	if (input.adult === true) {
-		text += ' (adult)';
-	} else if (input.adult === false) {
-		text += ' (child)';
-	}
+    if (input.renderBody) {
+        text += " BODY: ";
+    }
 
-	if (input.renderBody) {
-		text += ' BODY: ';
-	}
+    if (out.write) {
+        out.write(text);
+    } else {
+        out.text(text);
+    }
 
-	if (out.write) {
-		out.write(text);
-	} else {
-		out.text(text);
-	}
-
-	if (input.renderBody) {
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-data-placeholders/test.js b/test/render/fixtures/custom-tag-data-placeholders/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-data-placeholders/test.js
+++ b/test/render/fixtures/custom-tag-data-placeholders/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-declared-attributes/marko.json b/test/render/fixtures/custom-tag-declared-attributes/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-declared-attributes/marko.json
+++ b/test/render/fixtures/custom-tag-declared-attributes/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/marko-tag.json b/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/marko-tag.json
index 4b18cf6bc..721469f32 100644
--- a/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/marko-tag.json
+++ b/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "renderer": "./renderer.js",
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/renderer.js b/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/renderer.js
index fb402864c..e78fe8540 100644
--- a/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/renderer.js
+++ b/test/render/fixtures/custom-tag-declared-attributes/tags/test-declared-attributes/renderer.js
@@ -1,4 +1,4 @@
 module.exports = function simple(input, out) {
     var daysOld = input.age * 365;
-    out.write('Hello ' + input.name + '! You are ' + daysOld + ' days old.');
-};
\ No newline at end of file
+    out.write("Hello " + input.name + "! You are " + daysOld + " days old.");
+};
diff --git a/test/render/fixtures/custom-tag-declared-attributes/test.js b/test/render/fixtures/custom-tag-declared-attributes/test.js
index f7e1585a1..59036d9cc 100644
--- a/test/render/fixtures/custom-tag-declared-attributes/test.js
+++ b/test/render/fixtures/custom-tag-declared-attributes/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:0');
+    expect(message).to.contain("template.marko:1:0");
     expect(message).to.contain('The tag "test-declared-attributes" in taglib');
     expect(message).to.contain('does not support attribute "age"');
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/custom-tag-hyphen-attrs/custom-tag.js b/test/render/fixtures/custom-tag-hyphen-attrs/custom-tag.js
index bb5b0319c..7f0cfcae9 100644
--- a/test/render/fixtures/custom-tag-hyphen-attrs/custom-tag.js
+++ b/test/render/fixtures/custom-tag-hyphen-attrs/custom-tag.js
@@ -1,3 +1,3 @@
 module.exports = function renderer(input, out) {
-    out.write('Hello ' + input.firstName);
-};
\ No newline at end of file
+    out.write("Hello " + input.firstName);
+};
diff --git a/test/render/fixtures/custom-tag-hyphen-attrs/marko.json b/test/render/fixtures/custom-tag-hyphen-attrs/marko.json
index 98647cedc..d7d511b24 100644
--- a/test/render/fixtures/custom-tag-hyphen-attrs/marko.json
+++ b/test/render/fixtures/custom-tag-hyphen-attrs/marko.json
@@ -2,4 +2,4 @@
     "<custom-tag>": {
         "renderer": "./custom-tag.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-hyphen-attrs/test.js b/test/render/fixtures/custom-tag-hyphen-attrs/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-hyphen-attrs/test.js
+++ b/test/render/fixtures/custom-tag-hyphen-attrs/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-open-tag-only/marko.json b/test/render/fixtures/custom-tag-open-tag-only/marko.json
index 8cd75662c..913e31874 100644
--- a/test/render/fixtures/custom-tag-open-tag-only/marko.json
+++ b/test/render/fixtures/custom-tag-open-tag-only/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./open-tag-only-tag.js",
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-open-tag-only/open-tag-only-tag.js b/test/render/fixtures/custom-tag-open-tag-only/open-tag-only-tag.js
index 96b7643b0..691054576 100644
--- a/test/render/fixtures/custom-tag-open-tag-only/open-tag-only-tag.js
+++ b/test/render/fixtures/custom-tag-open-tag-only/open-tag-only-tag.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('Hello ' + input.name + '!\n');
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("Hello " + input.name + "!\n");
+};
diff --git a/test/render/fixtures/custom-tag-open-tag-only/test.js b/test/render/fixtures/custom-tag-open-tag-only/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-open-tag-only/test.js
+++ b/test/render/fixtures/custom-tag-open-tag-only/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-target-property/marko.json b/test/render/fixtures/custom-tag-target-property/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-target-property/marko.json
+++ b/test/render/fixtures/custom-tag-target-property/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-target-property/tags/test-target-property/marko-tag.json b/test/render/fixtures/custom-tag-target-property/tags/test-target-property/marko-tag.json
index b7eba5e13..d90204f61 100644
--- a/test/render/fixtures/custom-tag-target-property/tags/test-target-property/marko-tag.json
+++ b/test/render/fixtures/custom-tag-target-property/tags/test-target-property/marko-tag.json
@@ -3,4 +3,4 @@
     "@name-foo": {
         "target-property": "name"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-target-property/tags/test-target-property/renderer.js b/test/render/fixtures/custom-tag-target-property/tags/test-target-property/renderer.js
index a9707affc..15bb93e51 100644
--- a/test/render/fixtures/custom-tag-target-property/tags/test-target-property/renderer.js
+++ b/test/render/fixtures/custom-tag-target-property/tags/test-target-property/renderer.js
@@ -1,3 +1,3 @@
 module.exports = function simple(input, out) {
-    out.write('Hello ' + input.name + '!');
-};
\ No newline at end of file
+    out.write("Hello " + input.name + "!");
+};
diff --git a/test/render/fixtures/custom-tag-target-property/test.js b/test/render/fixtures/custom-tag-target-property/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-target-property/test.js
+++ b/test/render/fixtures/custom-tag-target-property/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-template-index/marko.json b/test/render/fixtures/custom-tag-template-index/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-template-index/marko.json
+++ b/test/render/fixtures/custom-tag-template-index/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-template-index/test.js b/test/render/fixtures/custom-tag-template-index/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-template-index/test.js
+++ b/test/render/fixtures/custom-tag-template-index/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag-with-directives/marko.json b/test/render/fixtures/custom-tag-with-directives/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag-with-directives/marko.json
+++ b/test/render/fixtures/custom-tag-with-directives/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-with-directives/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag-with-directives/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag-with-directives/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag-with-directives/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag-with-directives/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag-with-directives/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag-with-directives/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag-with-directives/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag-with-directives/test.js b/test/render/fixtures/custom-tag-with-directives/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag-with-directives/test.js
+++ b/test/render/fixtures/custom-tag-with-directives/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/custom-tag/marko.json b/test/render/fixtures/custom-tag/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/custom-tag/marko.json
+++ b/test/render/fixtures/custom-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag/tags/test-hello/marko-tag.json b/test/render/fixtures/custom-tag/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/render/fixtures/custom-tag/tags/test-hello/marko-tag.json
+++ b/test/render/fixtures/custom-tag/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/custom-tag/tags/test-hello/renderer.js b/test/render/fixtures/custom-tag/tags/test-hello/renderer.js
index 6e3f2c4f3..25a284c4b 100644
--- a/test/render/fixtures/custom-tag/tags/test-hello/renderer.js
+++ b/test/render/fixtures/custom-tag/tags/test-hello/renderer.js
@@ -1,13 +1,13 @@
-exports.render = function (input, out) {
-	out.write('Hello ' + input.name + '!');
-	if (input.adult === true) {
-		out.write(' (adult)');
-	} else if (input.adult === false) {
-		out.write(' (child)');
-	}
+exports.render = function(input, out) {
+    out.write("Hello " + input.name + "!");
+    if (input.adult === true) {
+        out.write(" (adult)");
+    } else if (input.adult === false) {
+        out.write(" (child)");
+    }
 
-	if (input.renderBody) {
-		out.write(' BODY: ');
-		input.renderBody(out);
-	}
-};
\ No newline at end of file
+    if (input.renderBody) {
+        out.write(" BODY: ");
+        input.renderBody(out);
+    }
+};
diff --git a/test/render/fixtures/custom-tag/test.js b/test/render/fixtures/custom-tag/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/custom-tag/test.js
+++ b/test/render/fixtures/custom-tag/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/declaration/test.js b/test/render/fixtures/declaration/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/declaration/test.js
+++ b/test/render/fixtures/declaration/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/default-attributes/marko.json b/test/render/fixtures/default-attributes/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/default-attributes/marko.json
+++ b/test/render/fixtures/default-attributes/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/default-attributes/tags/test-default-attributes/marko-tag.json b/test/render/fixtures/default-attributes/tags/test-default-attributes/marko-tag.json
index 63c2f7e34..579d37a45 100644
--- a/test/render/fixtures/default-attributes/tags/test-default-attributes/marko-tag.json
+++ b/test/render/fixtures/default-attributes/tags/test-default-attributes/marko-tag.json
@@ -10,4 +10,4 @@
         "type": "integer",
         "default-value": 100
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js b/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js
index 56ef58a08..7767c8a57 100644
--- a/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js
+++ b/test/render/fixtures/default-attributes/tags/test-default-attributes/renderer.js
@@ -1,3 +1,9 @@
-exports.render = function (input, out) {
-    out.write('[' + [input.prop1, input.prop2, input.default1, input.default2].join(',') + ']');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write(
+        "[" +
+            [input.prop1, input.prop2, input.default1, input.default2].join(
+                ","
+            ) +
+            "]"
+    );
+};
diff --git a/test/render/fixtures/default-attributes/test.js b/test/render/fixtures/default-attributes/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/default-attributes/test.js
+++ b/test/render/fixtures/default-attributes/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/div-self-closed/test.js b/test/render/fixtures/div-self-closed/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/div-self-closed/test.js
+++ b/test/render/fixtures/div-self-closed/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/doctype/test.js b/test/render/fixtures/doctype/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/doctype/test.js
+++ b/test/render/fixtures/doctype/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/dtd/test.js b/test/render/fixtures/dtd/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/dtd/test.js
+++ b/test/render/fixtures/dtd/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/dynamic-attributes-string/test.js b/test/render/fixtures/dynamic-attributes-string/test.js
index 972d5bc04..11e0bb1d3 100644
--- a/test/render/fixtures/dynamic-attributes-string/test.js
+++ b/test/render/fixtures/dynamic-attributes-string/test.js
@@ -2,4 +2,4 @@ exports.templateData = {
     attrs: ' foo="bar" baz'
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/dynamic-attributes/marko.json b/test/render/fixtures/dynamic-attributes/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/dynamic-attributes/marko.json
+++ b/test/render/fixtures/dynamic-attributes/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/marko-tag.json b/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/marko-tag.json
index f737ff821..bffe24cf5 100644
--- a/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/marko-tag.json
+++ b/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/marko-tag.json
@@ -5,4 +5,4 @@
         "type": "string",
         "target-property": "dynamicAttributes"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/renderer.js b/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/renderer.js
index a0df75caf..f25cc5608 100644
--- a/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/renderer.js
+++ b/test/render/fixtures/dynamic-attributes/tags/test-dynamic-attributes/renderer.js
@@ -1,14 +1,14 @@
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     out.write("test: " + input.test + "|");
     var dynamicAttributes = input.dynamicAttributes;
 
     if (dynamicAttributes) {
         var keys = Object.keys(dynamicAttributes).sort();
-        var entries = keys.map(function (key) {
+        var entries = keys.map(function(key) {
             return key + "=" + dynamicAttributes[key];
         });
         out.write("dynamic attributes: [" + entries.join(", ") + "]");
     } else {
         out.write("dynamic attributes: []");
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/dynamic-attributes/test.js b/test/render/fixtures/dynamic-attributes/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/dynamic-attributes/test.js
+++ b/test/render/fixtures/dynamic-attributes/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/dynamic-attributes2/marko.json b/test/render/fixtures/dynamic-attributes2/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/dynamic-attributes2/marko.json
+++ b/test/render/fixtures/dynamic-attributes2/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/marko-tag.json b/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/marko-tag.json
index 4844ae01c..c9ec0328c 100644
--- a/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/marko-tag.json
+++ b/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@test": "string",
     "@*": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/renderer.js b/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/renderer.js
index 0e031af1f..056c632bb 100644
--- a/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/renderer.js
+++ b/test/render/fixtures/dynamic-attributes2/tags/test-dynamic-attributes2/renderer.js
@@ -1,14 +1,14 @@
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     out.write("test: " + input.test + "|");
-    var dynamicAttributes = input['*'];
+    var dynamicAttributes = input["*"];
 
     if (dynamicAttributes) {
         var keys = Object.keys(dynamicAttributes).sort();
-        var entries = keys.map(function (key) {
+        var entries = keys.map(function(key) {
             return key + "=" + dynamicAttributes[key];
         });
         out.write("dynamic attributes: [" + entries.join(", ") + "]");
     } else {
         out.write("dynamic attributes: []");
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/dynamic-attributes2/test.js b/test/render/fixtures/dynamic-attributes2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/dynamic-attributes2/test.js
+++ b/test/render/fixtures/dynamic-attributes2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/dynamic-attributes3/marko.json b/test/render/fixtures/dynamic-attributes3/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/dynamic-attributes3/marko.json
+++ b/test/render/fixtures/dynamic-attributes3/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/marko-tag.json b/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/marko-tag.json
index 819712fa4..d72de8dff 100644
--- a/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/marko-tag.json
+++ b/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/marko-tag.json
@@ -5,4 +5,4 @@
         "type": "string",
         "target-property": null
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/renderer.js b/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/renderer.js
index 531d8355a..49e190bd5 100644
--- a/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/renderer.js
+++ b/test/render/fixtures/dynamic-attributes3/tags/test-dynamic-attributes3/renderer.js
@@ -1,9 +1,9 @@
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     out.write("test: " + input.test + "|");
 
     var keys = Object.keys(input).sort();
-    var entries = keys.map(function (key) {
+    var entries = keys.map(function(key) {
         return key + "=" + input[key];
     });
     out.write("all attributes: [" + entries.join(", ") + "]");
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/dynamic-attributes3/test.js b/test/render/fixtures/dynamic-attributes3/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/dynamic-attributes3/test.js
+++ b/test/render/fixtures/dynamic-attributes3/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/dynamic-tag-name-concise/test.js b/test/render/fixtures/dynamic-tag-name-concise/test.js
index ca3427af7..6207fe66a 100644
--- a/test/render/fixtures/dynamic-tag-name-concise/test.js
+++ b/test/render/fixtures/dynamic-tag-name-concise/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    myTagName: 'world',
+    myTagName: "world",
     foo: true
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/dynamic-tag-name/test.js b/test/render/fixtures/dynamic-tag-name/test.js
index ca3427af7..6207fe66a 100644
--- a/test/render/fixtures/dynamic-tag-name/test.js
+++ b/test/render/fixtures/dynamic-tag-name/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    myTagName: 'world',
+    myTagName: "world",
     foo: true
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/empty-close-tag/test.js b/test/render/fixtures/empty-close-tag/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/empty-close-tag/test.js
+++ b/test/render/fixtures/empty-close-tag/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/entities/test.js b/test/render/fixtures/entities/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/entities/test.js
+++ b/test/render/fixtures/entities/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/error-bad-expression/marko.json b/test/render/fixtures/error-bad-expression/marko.json
index 35cf25b45..bad4d3f14 100644
--- a/test/render/fixtures/error-bad-expression/marko.json
+++ b/test/render/fixtures/error-bad-expression/marko.json
@@ -2,4 +2,4 @@
     "<test-open-tag-only>": {
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/error-bad-expression/test.js b/test/render/fixtures/error-bad-expression/test.js
index c79f8b42a..419bdd93b 100644
--- a/test/render/fixtures/error-bad-expression/test.js
+++ b/test/render/fixtures/error-bad-expression/test.js
@@ -1,13 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('Error: An error occurred while trying to compile template at path');
-    expect(message).to.contain('Invalid JavaScript expression for attribute "class"');
-    expect(message).to.contain('Unexpected identifier: ((this is not valid))');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "Error: An error occurred while trying to compile template at path"
+    );
+    expect(message).to.contain(
+        'Invalid JavaScript expression for attribute "class"'
+    );
+    expect(message).to.contain("Unexpected identifier: ((this is not valid))");
+};
diff --git a/test/render/fixtures/error-class-tag-nested/test.js b/test/render/fixtures/error-class-tag-nested/test.js
index c503b510c..4836682c0 100644
--- a/test/render/fixtures/error-class-tag-nested/test.js
+++ b/test/render/fixtures/error-class-tag-nested/test.js
@@ -1,8 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('class is a static tag and can only be declared at the template root');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "class is a static tag and can only be declared at the template root"
+    );
+};
diff --git a/test/render/fixtures/error-component-class-extends/test.js b/test/render/fixtures/error-component-class-extends/test.js
index 8e5db07e5..48e3098f3 100644
--- a/test/render/fixtures/error-component-class-extends/test.js
+++ b/test/render/fixtures/error-component-class-extends/test.js
@@ -1,6 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-exports.checkError = function (e) {
-    expect(e.toString()).to.contain('A component class is not allowed to use `extends`');
-    expect(e.toString()).to.contain('https://github.com/marko-js/marko/wiki/Error:-Component-class-with-extends');
-};
\ No newline at end of file
+exports.checkError = function(e) {
+    expect(e.toString()).to.contain(
+        "A component class is not allowed to use `extends`"
+    );
+    expect(e.toString()).to.contain(
+        "https://github.com/marko-js/marko/wiki/Error:-Component-class-with-extends"
+    );
+};
diff --git a/test/render/fixtures/error-duplicate-macro/marko.json b/test/render/fixtures/error-duplicate-macro/marko.json
index 35cf25b45..bad4d3f14 100644
--- a/test/render/fixtures/error-duplicate-macro/marko.json
+++ b/test/render/fixtures/error-duplicate-macro/marko.json
@@ -2,4 +2,4 @@
     "<test-open-tag-only>": {
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/error-duplicate-macro/test.js b/test/render/fixtures/error-duplicate-macro/test.js
index 3d338d540..1143d2409 100644
--- a/test/render/fixtures/error-duplicate-macro/test.js
+++ b/test/render/fixtures/error-duplicate-macro/test.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('<macro> tag with duplicate name of "hello" found');
-    expect(message).to.contain('template.marko:7:4');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        '<macro> tag with duplicate name of "hello" found'
+    );
+    expect(message).to.contain("template.marko:7:4");
+};
diff --git a/test/render/fixtures/error-invalid-attr/test.js b/test/render/fixtures/error-invalid-attr/test.js
index 557d9d422..d4fb0bffc 100644
--- a/test/render/fixtures/error-invalid-attr/test.js
+++ b/test/render/fixtures/error-invalid-attr/test.js
@@ -1,13 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:0');
+    expect(message).to.contain("template.marko:1:0");
     expect(message).to.contain('The tag "test-invalid-attr" in taglib');
     expect(message).to.contain('does not support attribute "invalid"');
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/error-invalid-else-if-tag/test.js b/test/render/fixtures/error-invalid-else-if-tag/test.js
index b6f5d2592..cfaaa3d6a 100644
--- a/test/render/fixtures/error-invalid-else-if-tag/test.js
+++ b/test/render/fixtures/error-invalid-else-if-tag/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('else-if');
-    expect(message).to.contain('Unexpected identifier: (true invalid)');
-};
\ No newline at end of file
+    expect(message).to.contain("else-if");
+    expect(message).to.contain("Unexpected identifier: (true invalid)");
+};
diff --git a/test/render/fixtures/error-invalid-else-tag-attr-with-if/test.js b/test/render/fixtures/error-invalid-else-tag-attr-with-if/test.js
index 5467f76be..925927e44 100644
--- a/test/render/fixtures/error-invalid-else-tag-attr-with-if/test.js
+++ b/test/render/fixtures/error-invalid-else-tag-attr-with-if/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <else if> tag. Only the "if" attribute is allowed.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        'Invalid <else if> tag. Only the "if" attribute is allowed.'
+    );
+};
diff --git a/test/render/fixtures/error-invalid-else-tag-attr/test.js b/test/render/fixtures/error-invalid-else-tag-attr/test.js
index 31a476e0e..ef0b8d627 100644
--- a/test/render/fixtures/error-invalid-else-tag-attr/test.js
+++ b/test/render/fixtures/error-invalid-else-tag-attr/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <else> tag. Attributes not allowed.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "Invalid <else> tag. Attributes not allowed."
+    );
+};
diff --git a/test/render/fixtures/error-invalid-else-tag-if-attr/test.js b/test/render/fixtures/error-invalid-else-tag-if-attr/test.js
index aa5db33b5..1afea3631 100644
--- a/test/render/fixtures/error-invalid-else-tag-if-attr/test.js
+++ b/test/render/fixtures/error-invalid-else-tag-if-attr/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <else if> tag. Invalid "if" attribute.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        'Invalid <else if> tag. Invalid "if" attribute.'
+    );
+};
diff --git a/test/render/fixtures/error-invalid-for-attr-separator/test.js b/test/render/fixtures/error-invalid-for-attr-separator/test.js
index 37d240bdb..5ace7d72a 100644
--- a/test/render/fixtures/error-invalid-for-attr-separator/test.js
+++ b/test/render/fixtures/error-invalid-for-attr-separator/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "separator" expression:');
-    expect(message).to.contain('Unexpected identifier');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected identifier");
+};
diff --git a/test/render/fixtures/error-invalid-for-attr/test.js b/test/render/fixtures/error-invalid-for-attr/test.js
index 68a4b8e1c..e9d0874bf 100644
--- a/test/render/fixtures/error-invalid-for-attr/test.js
+++ b/test/render/fixtures/error-invalid-for-attr/test.js
@@ -1,10 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "in" expression:');
-    expect(message).to.contain("Unexpected identifier: (['red', 'blue', 'green'] foo)");
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "Unexpected identifier: (['red', 'blue', 'green'] foo)"
+    );
+};
diff --git a/test/render/fixtures/error-invalid-for-props/test.js b/test/render/fixtures/error-invalid-for-props/test.js
index 1d0666ce0..60699aa07 100644
--- a/test/render/fixtures/error-invalid-for-props/test.js
+++ b/test/render/fixtures/error-invalid-for-props/test.js
@@ -1,10 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "in" expression:');
-    expect(message).to.contain("Unexpected identifier: ({'foo': 'low', 'bar': 'high'} foo)");
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "Unexpected identifier: ({'foo': 'low', 'bar': 'high'} foo)"
+    );
+};
diff --git a/test/render/fixtures/error-invalid-for-range-step/test.js b/test/render/fixtures/error-invalid-for-range-step/test.js
index 44657494a..638c28e43 100644
--- a/test/render/fixtures/error-invalid-for-range-step/test.js
+++ b/test/render/fixtures/error-invalid-for-range-step/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "step" expression:');
     expect(message).to.contain("Unexpected number: (0 0)");
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/error-invalid-for-range-to-expr/test.js b/test/render/fixtures/error-invalid-for-range-to-expr/test.js
index 4e0e07cb9..a013f37f1 100644
--- a/test/render/fixtures/error-invalid-for-range-to-expr/test.js
+++ b/test/render/fixtures/error-invalid-for-range-to-expr/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "to" expression:');
     expect(message).to.contain("Unexpected number: ('abc'.length 1)");
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/error-invalid-for-range/test.js b/test/render/fixtures/error-invalid-for-range/test.js
index 508873f74..15bbef818 100644
--- a/test/render/fixtures/error-invalid-for-range/test.js
+++ b/test/render/fixtures/error-invalid-for-range/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
     expect(message).to.contain('Invalid "from" expression:');
     expect(message).to.contain("Unexpected identifier: (0 too 9)");
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/error-invalid-if-attr/test.js b/test/render/fixtures/error-invalid-if-attr/test.js
index e869d684c..29dce574b 100644
--- a/test/render/fixtures/error-invalid-if-attr/test.js
+++ b/test/render/fixtures/error-invalid-if-attr/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected identifier: (true sdsds)');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected identifier: (true sdsds)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-attr/test.js b/test/render/fixtures/error-invalid-if-else-attr/test.js
index c5a7e7aea..db59a3dad 100644
--- a/test/render/fixtures/error-invalid-if-else-attr/test.js
+++ b/test/render/fixtures/error-invalid-if-else-attr/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
     // expect(message).to.contain('Error: Unable to compile template at path');
-    expect(message).to.contain('Unexpected number: (input.foo === dasda 0)');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected number: (input.foo === dasda 0)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-attr/test.js b/test/render/fixtures/error-invalid-if-else-if-attr/test.js
index 4f436f571..f75605c02 100644
--- a/test/render/fixtures/error-invalid-if-else-if-attr/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-attr/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected identifier: (true sds)');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected identifier: (true sds)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-else-attr/test.js b/test/render/fixtures/error-invalid-if-else-if-else-attr/test.js
index 9674ce144..f29b12aac 100644
--- a/test/render/fixtures/error-invalid-if-else-if-else-attr/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-else-attr/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected token =: (input.foo ==== 1)');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected token =: (input.foo ==== 1)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-else-tag/test.js b/test/render/fixtures/error-invalid-if-else-if-else-tag/test.js
index 62dc61286..b5734617f 100644
--- a/test/render/fixtures/error-invalid-if-else-if-else-tag/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-else-tag/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
-    expect(message).to.contain('Invalid expression for if statement:');
-    expect(message).to.contain('Unexpected identifier: (false foo)');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
+    expect(message).to.contain("Invalid expression for if statement:");
+    expect(message).to.contain("Unexpected identifier: (false foo)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-tag-attrs/test.js b/test/render/fixtures/error-invalid-if-else-if-tag-attrs/test.js
index 57b469217..192f34430 100644
--- a/test/render/fixtures/error-invalid-if-else-if-tag-attrs/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-tag-attrs/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
     expect(message).to.contain('does not support attribute "invalid"');
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-tag-no-arg/test.js b/test/render/fixtures/error-invalid-if-else-if-tag-no-arg/test.js
index 4b8a17538..88fb681d5 100644
--- a/test/render/fixtures/error-invalid-if-else-if-tag-no-arg/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-tag-no-arg/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Invalid <else-if> tag. Argument is missing');
-};
\ No newline at end of file
+    expect(message).to.contain("Invalid <else-if> tag. Argument is missing");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-if-tag/test.js b/test/render/fixtures/error-invalid-if-else-if-tag/test.js
index e9a27214d..2b1589750 100644
--- a/test/render/fixtures/error-invalid-if-else-if-tag/test.js
+++ b/test/render/fixtures/error-invalid-if-else-if-tag/test.js
@@ -1,10 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
-    expect(message).to.contain('Invalid expression for else-if statement:');
-    expect(message).to.contain('Unexpected identifier: (true foo)');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
+    expect(message).to.contain("Invalid expression for else-if statement:");
+    expect(message).to.contain("Unexpected identifier: (true foo)");
+};
diff --git a/test/render/fixtures/error-invalid-if-else-tag/test.js b/test/render/fixtures/error-invalid-if-else-tag/test.js
index 4fd2f8710..e494bf927 100644
--- a/test/render/fixtures/error-invalid-if-else-tag/test.js
+++ b/test/render/fixtures/error-invalid-if-else-tag/test.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('An error occurred while trying to compile template at path');
-    expect(message).to.contain('Invalid <else> tag. Argument is not allowed');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "An error occurred while trying to compile template at path"
+    );
+    expect(message).to.contain("Invalid <else> tag. Argument is not allowed");
+};
diff --git a/test/render/fixtures/error-invalid-if-tag/test.js b/test/render/fixtures/error-invalid-if-tag/test.js
index e869d684c..29dce574b 100644
--- a/test/render/fixtures/error-invalid-if-tag/test.js
+++ b/test/render/fixtures/error-invalid-if-tag/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unexpected identifier: (true sdsds)');
-};
\ No newline at end of file
+    expect(message).to.contain("Unexpected identifier: (true sdsds)");
+};
diff --git a/test/render/fixtures/error-invalid-unless-tag/test.js b/test/render/fixtures/error-invalid-unless-tag/test.js
index 9a43cfa56..22d70d180 100644
--- a/test/render/fixtures/error-invalid-unless-tag/test.js
+++ b/test/render/fixtures/error-invalid-unless-tag/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('unless');
-    expect(message).to.contain('Unexpected identifier: (true sdsds)');
-};
\ No newline at end of file
+    expect(message).to.contain("unless");
+    expect(message).to.contain("Unexpected identifier: (true sdsds)");
+};
diff --git a/test/render/fixtures/error-macro-no-name/test.js b/test/render/fixtures/error-macro-no-name/test.js
index 254959632..56aa63ad2 100644
--- a/test/render/fixtures/error-macro-no-name/test.js
+++ b/test/render/fixtures/error-macro-no-name/test.js
@@ -1,11 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(2);
 
     var message = e.toString();
-    expect(message).to.contain('The <macro> tag must contain a name as its first attribute, example: <macro greeting()>');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        "The <macro> tag must contain a name as its first attribute, example: <macro greeting()>"
+    );
+};
diff --git a/test/render/fixtures/error-mismatched-tags/test.js b/test/render/fixtures/error-mismatched-tags/test.js
index 6f15338c4..41adadf93 100644
--- a/test/render/fixtures/error-mismatched-tags/test.js
+++ b/test/render/fixtures/error-mismatched-tags/test.js
@@ -1,12 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:16');
-    expect(message).to.contain('The closing "foo" tag does not match the corresponding opening "div" tag');
-};
\ No newline at end of file
+    expect(message).to.contain("template.marko:1:16");
+    expect(message).to.contain(
+        'The closing "foo" tag does not match the corresponding opening "div" tag'
+    );
+};
diff --git a/test/render/fixtures/error-missing-required-attr/test.js b/test/render/fixtures/error-missing-required-attr/test.js
index 19b2d12de..4388aa829 100644
--- a/test/render/fixtures/error-missing-required-attr/test.js
+++ b/test/render/fixtures/error-missing-required-attr/test.js
@@ -1,12 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:0');
-    expect(message).to.contain('The "name" attribute is required for tag "test-missing-required-attr" in taglib');
-};
\ No newline at end of file
+    expect(message).to.contain("template.marko:1:0");
+    expect(message).to.contain(
+        'The "name" attribute is required for tag "test-missing-required-attr" in taglib'
+    );
+};
diff --git a/test/render/fixtures/error-open-tag-only-concise/marko.json b/test/render/fixtures/error-open-tag-only-concise/marko.json
index 35cf25b45..bad4d3f14 100644
--- a/test/render/fixtures/error-open-tag-only-concise/marko.json
+++ b/test/render/fixtures/error-open-tag-only-concise/marko.json
@@ -2,4 +2,4 @@
     "<test-open-tag-only>": {
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/error-open-tag-only-concise/test.js b/test/render/fixtures/error-open-tag-only-concise/test.js
index 923585147..b3c253639 100644
--- a/test/render/fixtures/error-open-tag-only-concise/test.js
+++ b/test/render/fixtures/error-open-tag-only-concise/test.js
@@ -1,11 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('The "test-open-tag-only" tag does not allow nested body content');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        'The "test-open-tag-only" tag does not allow nested body content'
+    );
+};
diff --git a/test/render/fixtures/error-open-tag-only-html/marko.json b/test/render/fixtures/error-open-tag-only-html/marko.json
index 35cf25b45..bad4d3f14 100644
--- a/test/render/fixtures/error-open-tag-only-html/marko.json
+++ b/test/render/fixtures/error-open-tag-only-html/marko.json
@@ -2,4 +2,4 @@
     "<test-open-tag-only>": {
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/error-open-tag-only-html/test.js b/test/render/fixtures/error-open-tag-only-html/test.js
index 5f4339d09..235e85082 100644
--- a/test/render/fixtures/error-open-tag-only-html/test.js
+++ b/test/render/fixtures/error-open-tag-only-html/test.js
@@ -1,11 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     expect(Array.isArray(e.errors)).to.equal(true);
     expect(e.errors.length).to.equal(1);
 
     var message = e.toString();
-    expect(message).to.contain('The closing "test-open-tag-only" tag was not expected');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        'The closing "test-open-tag-only" tag was not expected'
+    );
+};
diff --git a/test/render/fixtures/error-thrown-in-generator/custom-tag.js b/test/render/fixtures/error-thrown-in-generator/custom-tag.js
index 3a3704435..3fd404652 100644
--- a/test/render/fixtures/error-thrown-in-generator/custom-tag.js
+++ b/test/render/fixtures/error-thrown-in-generator/custom-tag.js
@@ -1,3 +1,3 @@
-module.exports = function generator(elNode, generator) {
-    throw new Error('Something Happened!');
-};
\ No newline at end of file
+module.exports = function generator() {
+    throw new Error("Something Happened!");
+};
diff --git a/test/render/fixtures/error-thrown-in-generator/test.js b/test/render/fixtures/error-thrown-in-generator/test.js
index 55addd97b..1d12c880e 100644
--- a/test/render/fixtures/error-thrown-in-generator/test.js
+++ b/test/render/fixtures/error-thrown-in-generator/test.js
@@ -1,17 +1,17 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     //includes the tag it broke on
-    expect(e.message).to.contain('<custom-tag>');
+    expect(e.message).to.contain("<custom-tag>");
 
     //includes the line number of the template
-    expect(e.message).to.contain('template.marko:2');
+    expect(e.message).to.contain("template.marko:2");
 
     //retains original stack trace
-    expect(e.stack.toString()).to.contain('custom-tag.js:2:11');
+    expect(e.stack.toString()).to.contain("custom-tag.js:2:11");
 
     //retains original message
-    expect(e.message).to.contain('Something Happened!');
-};
\ No newline at end of file
+    expect(e.message).to.contain("Something Happened!");
+};
diff --git a/test/render/fixtures/error-unrecognized-tag/test.js b/test/render/fixtures/error-unrecognized-tag/test.js
index 291495847..7266e2de9 100644
--- a/test/render/fixtures/error-unrecognized-tag/test.js
+++ b/test/render/fixtures/error-unrecognized-tag/test.js
@@ -1,13 +1,15 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     //includes the tag it broke on
-    expect(e.message).to.contain('Unrecognized tag: invalid-tag');
+    expect(e.message).to.contain("Unrecognized tag: invalid-tag");
 
-    expect(e.message).to.contain('https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag');
+    expect(e.message).to.contain(
+        "https://github.com/marko-js/marko/wiki/Error:-Unrecognized-Tag"
+    );
 
     //includes the line number of the template
-    expect(e.message).to.contain('template.marko:2:4');
-};
\ No newline at end of file
+    expect(e.message).to.contain("template.marko:2:4");
+};
diff --git a/test/render/fixtures/escape-at-tag/test.js b/test/render/fixtures/escape-at-tag/test.js
index e26e7ebce..55c9526ad 100644
--- a/test/render/fixtures/escape-at-tag/test.js
+++ b/test/render/fixtures/escape-at-tag/test.js
@@ -1,5 +1,3 @@
-var expect = require('chai').expect;
-
 exports.templateData = {};
 exports.ignoreUnrecognizedTags = true;
-exports.escapeAtTags = true;
\ No newline at end of file
+exports.escapeAtTags = true;
diff --git a/test/render/fixtures/escape-script/test.js b/test/render/fixtures/escape-script/test.js
index 5409e0eea..ea87751f5 100644
--- a/test/render/fixtures/escape-script/test.js
+++ b/test/render/fixtures/escape-script/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     foo: {
-        name: 'Evil </script>'
+        name: "Evil </script>"
     }
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/escape-style/test.js b/test/render/fixtures/escape-style/test.js
index e6b5be57a..33e7f9df6 100644
--- a/test/render/fixtures/escape-style/test.js
+++ b/test/render/fixtures/escape-style/test.js
@@ -2,4 +2,4 @@ exports.templateData = {
     color: '</style><script>alert("evil");</script>'
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/escaped-dollar/test.js b/test/render/fixtures/escaped-dollar/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/escaped-dollar/test.js
+++ b/test/render/fixtures/escaped-dollar/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-array-index/test.js b/test/render/fixtures/for-array-index/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-array-index/test.js
+++ b/test/render/fixtures/for-array-index/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-attr-separator-html/test.js b/test/render/fixtures/for-attr-separator-html/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-attr-separator-html/test.js
+++ b/test/render/fixtures/for-attr-separator-html/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-attr-separator-status-var/test.js b/test/render/fixtures/for-attr-separator-status-var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-attr-separator-status-var/test.js
+++ b/test/render/fixtures/for-attr-separator-status-var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-attr-separator/test.js b/test/render/fixtures/for-attr-separator/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-attr-separator/test.js
+++ b/test/render/fixtures/for-attr-separator/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-attr-status-var-string/test.js b/test/render/fixtures/for-attr-status-var-string/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-attr-status-var-string/test.js
+++ b/test/render/fixtures/for-attr-status-var-string/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-attr/test.js b/test/render/fixtures/for-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-attr/test.js
+++ b/test/render/fixtures/for-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-if-attr/test.js b/test/render/fixtures/for-if-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-if-attr/test.js
+++ b/test/render/fixtures/for-if-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-iterator-as-target/test.js b/test/render/fixtures/for-iterator-as-target/test.js
index cd5e2a3c3..bc1e6268c 100644
--- a/test/render/fixtures/for-iterator-as-target/test.js
+++ b/test/render/fixtures/for-iterator-as-target/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    myIterator: function (callback) {
+    myIterator: function(callback) {
         for (var i = 5; i >= 0; i--) {
             callback(i);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-iterator-attr/test.js b/test/render/fixtures/for-iterator-attr/test.js
index 00ce9f2d3..fcba2094d 100644
--- a/test/render/fixtures/for-iterator-attr/test.js
+++ b/test/render/fixtures/for-iterator-attr/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    reverseIterator: function (arrayList, callback) {
+    reverseIterator: function(arrayList, callback) {
         var statusVar = { first: 0, last: arrayList.length - 1 };
         for (var i = arrayList.length - 1; i >= 0; i--) {
             statusVar.index = i;
             callback(arrayList[i], statusVar);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-iterator-status-var-attr/test.js b/test/render/fixtures/for-iterator-status-var-attr/test.js
index 00ce9f2d3..fcba2094d 100644
--- a/test/render/fixtures/for-iterator-status-var-attr/test.js
+++ b/test/render/fixtures/for-iterator-status-var-attr/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    reverseIterator: function (arrayList, callback) {
+    reverseIterator: function(arrayList, callback) {
         var statusVar = { first: 0, last: arrayList.length - 1 };
         for (var i = arrayList.length - 1; i >= 0; i--) {
             statusVar.index = i;
             callback(arrayList[i], statusVar);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-iterator-status-var/test.js b/test/render/fixtures/for-iterator-status-var/test.js
index 00ce9f2d3..fcba2094d 100644
--- a/test/render/fixtures/for-iterator-status-var/test.js
+++ b/test/render/fixtures/for-iterator-status-var/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    reverseIterator: function (arrayList, callback) {
+    reverseIterator: function(arrayList, callback) {
         var statusVar = { first: 0, last: arrayList.length - 1 };
         for (var i = arrayList.length - 1; i >= 0; i--) {
             statusVar.index = i;
             callback(arrayList[i], statusVar);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-iterator/test.js b/test/render/fixtures/for-iterator/test.js
index 00ce9f2d3..fcba2094d 100644
--- a/test/render/fixtures/for-iterator/test.js
+++ b/test/render/fixtures/for-iterator/test.js
@@ -1,9 +1,9 @@
 exports.templateData = {
-    reverseIterator: function (arrayList, callback) {
+    reverseIterator: function(arrayList, callback) {
         var statusVar = { first: 0, last: arrayList.length - 1 };
         for (var i = arrayList.length - 1; i >= 0; i--) {
             statusVar.index = i;
             callback(arrayList[i], statusVar);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-native/test.js b/test/render/fixtures/for-native/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-native/test.js
+++ b/test/render/fixtures/for-native/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-props-attr/test.js b/test/render/fixtures/for-props-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-props-attr/test.js
+++ b/test/render/fixtures/for-props-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-props-map/test.js b/test/render/fixtures/for-props-map/test.js
index d60cd6272..d19992164 100644
--- a/test/render/fixtures/for-props-map/test.js
+++ b/test/render/fixtures/for-props-map/test.js
@@ -1,10 +1,10 @@
-'use strict';
+"use strict";
 
 const myMap = new Map();
 
-myMap.set('foo', 'low');
-myMap.set('bar', 'high');
+myMap.set("foo", "low");
+myMap.set("bar", "high");
 
 exports.templateData = {
     myMap: myMap
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/for-props-separator/test.js b/test/render/fixtures/for-props-separator/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-props-separator/test.js
+++ b/test/render/fixtures/for-props-separator/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-props-status-var-separator/test.js b/test/render/fixtures/for-props-status-var-separator/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-props-status-var-separator/test.js
+++ b/test/render/fixtures/for-props-status-var-separator/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-props-status-var/test.js b/test/render/fixtures/for-props-status-var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-props-status-var/test.js
+++ b/test/render/fixtures/for-props-status-var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-props/test.js b/test/render/fixtures/for-props/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-props/test.js
+++ b/test/render/fixtures/for-props/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-descending-step/test.js b/test/render/fixtures/for-range-descending-step/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-descending-step/test.js
+++ b/test/render/fixtures/for-range-descending-step/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-descending/test.js b/test/render/fixtures/for-range-descending/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-descending/test.js
+++ b/test/render/fixtures/for-range-descending/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-from-to-expr/test.js b/test/render/fixtures/for-range-from-to-expr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-from-to-expr/test.js
+++ b/test/render/fixtures/for-range-from-to-expr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-step-2/test.js b/test/render/fixtures/for-range-step-2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-step-2/test.js
+++ b/test/render/fixtures/for-range-step-2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-step-neg2/test.js b/test/render/fixtures/for-range-step-neg2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-step-neg2/test.js
+++ b/test/render/fixtures/for-range-step-neg2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range-to-expr/test.js b/test/render/fixtures/for-range-to-expr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range-to-expr/test.js
+++ b/test/render/fixtures/for-range-to-expr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-range/test.js b/test/render/fixtures/for-range/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-range/test.js
+++ b/test/render/fixtures/for-range/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-tag-array-expression/test.js b/test/render/fixtures/for-tag-array-expression/test.js
index b00094c8b..925a90aa5 100644
--- a/test/render/fixtures/for-tag-array-expression/test.js
+++ b/test/render/fixtures/for-tag-array-expression/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    colors: ['red', 'green', 'blue']
-};
\ No newline at end of file
+    colors: ["red", "green", "blue"]
+};
diff --git a/test/render/fixtures/for-tag-invalid-option/test.js b/test/render/fixtures/for-tag-invalid-option/test.js
index 66b5cc37f..0edf92184 100644
--- a/test/render/fixtures/for-tag-invalid-option/test.js
+++ b/test/render/fixtures/for-tag-invalid-option/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('template.marko:1:0] Unexpected input: foo');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "template.marko:1:0] Unexpected input: foo"
+    );
+};
diff --git a/test/render/fixtures/for-tag-native/test.js b/test/render/fixtures/for-tag-native/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-tag-native/test.js
+++ b/test/render/fixtures/for-tag-native/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-tag-no-arg/test.js b/test/render/fixtures/for-tag-no-arg/test.js
index 9a2462b6b..4b2136087 100644
--- a/test/render/fixtures/for-tag-no-arg/test.js
+++ b/test/render/fixtures/for-tag-no-arg/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <for> tag. Argument is missing.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "Invalid <for> tag. Argument is missing."
+    );
+};
diff --git a/test/render/fixtures/for-tag-separator-status-var/test.js b/test/render/fixtures/for-tag-separator-status-var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-tag-separator-status-var/test.js
+++ b/test/render/fixtures/for-tag-separator-status-var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-tag-separator/test.js b/test/render/fixtures/for-tag-separator/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-tag-separator/test.js
+++ b/test/render/fixtures/for-tag-separator/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-tag-status-var/test.js b/test/render/fixtures/for-tag-status-var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-tag-status-var/test.js
+++ b/test/render/fixtures/for-tag-status-var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/for-tag/test.js b/test/render/fixtures/for-tag/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/for-tag/test.js
+++ b/test/render/fixtures/for-tag/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/global-data/test.js b/test/render/fixtures/global-data/test.js
index 77eeb4f3c..d57823adb 100644
--- a/test/render/fixtures/global-data/test.js
+++ b/test/render/fixtures/global-data/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
     $global: {
-        foo: 'bar'
+        foo: "bar"
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/hello-dynamic/test.js b/test/render/fixtures/hello-dynamic/test.js
index dcd06d3ce..761736115 100644
--- a/test/render/fixtures/hello-dynamic/test.js
+++ b/test/render/fixtures/hello-dynamic/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "John"
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/hello-static/test.js b/test/render/fixtures/hello-static/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/hello-static/test.js
+++ b/test/render/fixtures/hello-static/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/helpers-empty-notEmpty-import/test.js b/test/render/fixtures/helpers-empty-notEmpty-import/test.js
index dcd06d3ce..761736115 100644
--- a/test/render/fixtures/helpers-empty-notEmpty-import/test.js
+++ b/test/render/fixtures/helpers-empty-notEmpty-import/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "John"
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/html-comment-tag/test.js b/test/render/fixtures/html-comment-tag/test.js
index 1908aabb0..0e1da5404 100644
--- a/test/render/fixtures/html-comment-tag/test.js
+++ b/test/render/fixtures/html-comment-tag/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/html-elements-register-nested-multiple/components/hello/html-elements.json b/test/render/fixtures/html-elements-register-nested-multiple/components/hello/html-elements.json
index cede48e1e..64e1d5316 100644
--- a/test/render/fixtures/html-elements-register-nested-multiple/components/hello/html-elements.json
+++ b/test/render/fixtures/html-elements-register-nested-multiple/components/hello/html-elements.json
@@ -1,3 +1,3 @@
 {
     "<another-custom-element>": {}
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/html-elements-register-nested-multiple/html-elements.json b/test/render/fixtures/html-elements-register-nested-multiple/html-elements.json
index a4964fd72..c7225cb74 100644
--- a/test/render/fixtures/html-elements-register-nested-multiple/html-elements.json
+++ b/test/render/fixtures/html-elements-register-nested-multiple/html-elements.json
@@ -1,3 +1,3 @@
 {
     "<my-custom-element>": {}
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/html-elements-register-nested-multiple/test.js b/test/render/fixtures/html-elements-register-nested-multiple/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/html-elements-register-nested-multiple/test.js
+++ b/test/render/fixtures/html-elements-register-nested-multiple/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/html-elements-register-nested/html-elements.json b/test/render/fixtures/html-elements-register-nested/html-elements.json
index a4964fd72..c7225cb74 100644
--- a/test/render/fixtures/html-elements-register-nested/html-elements.json
+++ b/test/render/fixtures/html-elements-register-nested/html-elements.json
@@ -1,3 +1,3 @@
 {
     "<my-custom-element>": {}
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/html-elements-register-nested/test.js b/test/render/fixtures/html-elements-register-nested/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/html-elements-register-nested/test.js
+++ b/test/render/fixtures/html-elements-register-nested/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/html-elements-register/html-elements.json b/test/render/fixtures/html-elements-register/html-elements.json
index a4964fd72..c7225cb74 100644
--- a/test/render/fixtures/html-elements-register/html-elements.json
+++ b/test/render/fixtures/html-elements-register/html-elements.json
@@ -1,3 +1,3 @@
 {
     "<my-custom-element>": {}
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/html-elements-register/test.js b/test/render/fixtures/html-elements-register/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/html-elements-register/test.js
+++ b/test/render/fixtures/html-elements-register/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/html-entities-body/test.js b/test/render/fixtures/html-entities-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/html-entities-body/test.js
+++ b/test/render/fixtures/html-entities-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/html/test.js b/test/render/fixtures/html/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/html/test.js
+++ b/test/render/fixtures/html/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-attr/test.js b/test/render/fixtures/if-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-attr/test.js
+++ b/test/render/fixtures/if-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-concise/test.js b/test/render/fixtures/if-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-concise/test.js
+++ b/test/render/fixtures/if-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else-attr/test.js b/test/render/fixtures/if-else-attr/test.js
index b3c51e957..7e583087e 100644
--- a/test/render/fixtures/if-else-attr/test.js
+++ b/test/render/fixtures/if-else-attr/test.js
@@ -1,19 +1,24 @@
 exports.templateData = {
-    "accounts": [{
-        "balance": 0,
-        "balanceFormatted": "$0.00",
-        "status": "open"
-    }, {
-        "balance": 10,
-        "balanceFormatted": "$10.00",
-        "status": "closed"
-    }, {
-        "balance": -100,
-        "balanceFormatted": "$-100.00",
-        "status": "suspended"
-    }, {
-        "balance": 999,
-        "balanceFormatted": "$999.00",
-        "status": "open"
-    }]
-};
\ No newline at end of file
+    accounts: [
+        {
+            balance: 0,
+            balanceFormatted: "$0.00",
+            status: "open"
+        },
+        {
+            balance: 10,
+            balanceFormatted: "$10.00",
+            status: "closed"
+        },
+        {
+            balance: -100,
+            balanceFormatted: "$-100.00",
+            status: "suspended"
+        },
+        {
+            balance: 999,
+            balanceFormatted: "$999.00",
+            status: "open"
+        }
+    ]
+};
diff --git a/test/render/fixtures/if-else-concise/test.js b/test/render/fixtures/if-else-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else-concise/test.js
+++ b/test/render/fixtures/if-else-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else-if-attr/test.js b/test/render/fixtures/if-else-if-attr/test.js
index b3c51e957..7e583087e 100644
--- a/test/render/fixtures/if-else-if-attr/test.js
+++ b/test/render/fixtures/if-else-if-attr/test.js
@@ -1,19 +1,24 @@
 exports.templateData = {
-    "accounts": [{
-        "balance": 0,
-        "balanceFormatted": "$0.00",
-        "status": "open"
-    }, {
-        "balance": 10,
-        "balanceFormatted": "$10.00",
-        "status": "closed"
-    }, {
-        "balance": -100,
-        "balanceFormatted": "$-100.00",
-        "status": "suspended"
-    }, {
-        "balance": 999,
-        "balanceFormatted": "$999.00",
-        "status": "open"
-    }]
-};
\ No newline at end of file
+    accounts: [
+        {
+            balance: 0,
+            balanceFormatted: "$0.00",
+            status: "open"
+        },
+        {
+            balance: 10,
+            balanceFormatted: "$10.00",
+            status: "closed"
+        },
+        {
+            balance: -100,
+            balanceFormatted: "$-100.00",
+            status: "suspended"
+        },
+        {
+            balance: 999,
+            balanceFormatted: "$999.00",
+            status: "open"
+        }
+    ]
+};
diff --git a/test/render/fixtures/if-else-if-concise/test.js b/test/render/fixtures/if-else-if-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else-if-concise/test.js
+++ b/test/render/fixtures/if-else-if-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else-if-else-attr/test.js b/test/render/fixtures/if-else-if-else-attr/test.js
index b3c51e957..7e583087e 100644
--- a/test/render/fixtures/if-else-if-else-attr/test.js
+++ b/test/render/fixtures/if-else-if-else-attr/test.js
@@ -1,19 +1,24 @@
 exports.templateData = {
-    "accounts": [{
-        "balance": 0,
-        "balanceFormatted": "$0.00",
-        "status": "open"
-    }, {
-        "balance": 10,
-        "balanceFormatted": "$10.00",
-        "status": "closed"
-    }, {
-        "balance": -100,
-        "balanceFormatted": "$-100.00",
-        "status": "suspended"
-    }, {
-        "balance": 999,
-        "balanceFormatted": "$999.00",
-        "status": "open"
-    }]
-};
\ No newline at end of file
+    accounts: [
+        {
+            balance: 0,
+            balanceFormatted: "$0.00",
+            status: "open"
+        },
+        {
+            balance: 10,
+            balanceFormatted: "$10.00",
+            status: "closed"
+        },
+        {
+            balance: -100,
+            balanceFormatted: "$-100.00",
+            status: "suspended"
+        },
+        {
+            balance: 999,
+            balanceFormatted: "$999.00",
+            status: "open"
+        }
+    ]
+};
diff --git a/test/render/fixtures/if-else-if-else-concise/test.js b/test/render/fixtures/if-else-if-else-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else-if-else-concise/test.js
+++ b/test/render/fixtures/if-else-if-else-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else-if-else/test.js b/test/render/fixtures/if-else-if-else/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else-if-else/test.js
+++ b/test/render/fixtures/if-else-if-else/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else-if/test.js b/test/render/fixtures/if-else-if/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else-if/test.js
+++ b/test/render/fixtures/if-else-if/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-else/test.js b/test/render/fixtures/if-else/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if-else/test.js
+++ b/test/render/fixtures/if-else/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/if-no-arg/test.js b/test/render/fixtures/if-no-arg/test.js
index a29b7d94a..135a12f9a 100644
--- a/test/render/fixtures/if-no-arg/test.js
+++ b/test/render/fixtures/if-no-arg/test.js
@@ -1,7 +1,7 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <if> tag. Argument is missing.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain("Invalid <if> tag. Argument is missing.");
+};
diff --git a/test/render/fixtures/if/test.js b/test/render/fixtures/if/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/if/test.js
+++ b/test/render/fixtures/if/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/ignore-unrecognized-tag/test.js b/test/render/fixtures/ignore-unrecognized-tag/test.js
index 9d6a6b75a..0b895d3cc 100644
--- a/test/render/fixtures/ignore-unrecognized-tag/test.js
+++ b/test/render/fixtures/ignore-unrecognized-tag/test.js
@@ -1,4 +1,2 @@
-var expect = require('chai').expect;
-
 exports.templateData = {};
-exports.ignoreUnrecognizedTags = true;
\ No newline at end of file
+exports.ignoreUnrecognizedTags = true;
diff --git a/test/render/fixtures/img/test.js b/test/render/fixtures/img/test.js
index a98bcb7fe..135bfb311 100644
--- a/test/render/fixtures/img/test.js
+++ b/test/render/fixtures/img/test.js
@@ -1,14 +1,18 @@
 exports.templateData = {
-    "options": [{
-        "value": "red",
-        "selected": false
-    }, {
-        "value": "green",
-        "selected": true
-    }, {
-        "value": "blue",
-        "selected": false
-    }],
-    "disabled": false,
-    "checked": true
-};
\ No newline at end of file
+    options: [
+        {
+            value: "red",
+            selected: false
+        },
+        {
+            value: "green",
+            selected: true
+        },
+        {
+            value: "blue",
+            selected: false
+        }
+    ],
+    disabled: false,
+    checked: true
+};
diff --git a/test/render/fixtures/import/bar.js b/test/render/fixtures/import/bar.js
index f86512989..2327d1785 100644
--- a/test/render/fixtures/import/bar.js
+++ b/test/render/fixtures/import/bar.js
@@ -1,4 +1,4 @@
 module.exports = {
     foo: "Foo",
     b: "Bar"
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-attr-error-missing-argument/test.js b/test/render/fixtures/include-attr-error-missing-argument/test.js
index 62976b452..f08b0a677 100644
--- a/test/render/fixtures/include-attr-error-missing-argument/test.js
+++ b/test/render/fixtures/include-attr-error-missing-argument/test.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('template.marko:1:0');
-    expect(message).to.contain('The include attribute must have an argument');
-};
\ No newline at end of file
+    expect(message).to.contain("template.marko:1:0");
+    expect(message).to.contain("The include attribute must have an argument");
+};
diff --git a/test/render/fixtures/include-attr-no-arg/test.js b/test/render/fixtures/include-attr-no-arg/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-attr-no-arg/test.js
+++ b/test/render/fixtures/include-attr-no-arg/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-attr/test.js b/test/render/fixtures/include-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-attr/test.js
+++ b/test/render/fixtures/include-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-body-empty/test.js b/test/render/fixtures/include-body-empty/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-body-empty/test.js
+++ b/test/render/fixtures/include-body-empty/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-body/test.js b/test/render/fixtures/include-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-body/test.js
+++ b/test/render/fixtures/include-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-component/components/my-component/index.js b/test/render/fixtures/include-component/components/my-component/index.js
index db791a380..8f4007928 100644
--- a/test/render/fixtures/include-component/components/my-component/index.js
+++ b/test/render/fixtures/include-component/components/my-component/index.js
@@ -1,7 +1,7 @@
 module.exports = {
-    renderer: function (input, out) {
-        out.beginElement('div');
+    renderer: function(input, out) {
+        out.beginElement("div");
         out.text(input.name.toUpperCase());
         out.endElement();
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-component/test.js b/test/render/fixtures/include-component/test.js
index 7feb612aa..41eba273b 100644
--- a/test/render/fixtures/include-component/test.js
+++ b/test/render/fixtures/include-component/test.js
@@ -1,5 +1,5 @@
-var myComponent = require('./components/my-component');
+var myComponent = require("./components/my-component");
 
 exports.templateData = {
     component: myComponent
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-data-body/test.js b/test/render/fixtures/include-data-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-data-body/test.js
+++ b/test/render/fixtures/include-data-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-data/test.js b/test/render/fixtures/include-data/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-data/test.js
+++ b/test/render/fixtures/include-data/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-dynamic/test.js b/test/render/fixtures/include-dynamic/test.js
index 56d8c403f..7cbc23e5c 100644
--- a/test/render/fixtures/include-dynamic/test.js
+++ b/test/render/fixtures/include-dynamic/test.js
@@ -1,4 +1,4 @@
-var includeTarget = require('./include-target.marko');
+var includeTarget = require("./include-target.marko");
 exports.templateData = {
     includeTarget: includeTarget
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-html/test.js b/test/render/fixtures/include-html/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-html/test.js
+++ b/test/render/fixtures/include-html/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-hyphen-attrs-multiple/test.js b/test/render/fixtures/include-hyphen-attrs-multiple/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-hyphen-attrs-multiple/test.js
+++ b/test/render/fixtures/include-hyphen-attrs-multiple/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-hyphen-attrs/test.js b/test/render/fixtures/include-hyphen-attrs/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-hyphen-attrs/test.js
+++ b/test/render/fixtures/include-hyphen-attrs/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-layout-data-attrs/test.js b/test/render/fixtures/include-layout-data-attrs/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures/include-layout-data-attrs/test.js
+++ b/test/render/fixtures/include-layout-data-attrs/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures/include-layout-data/test.js b/test/render/fixtures/include-layout-data/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures/include-layout-data/test.js
+++ b/test/render/fixtures/include-layout-data/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures/include-layout-v3-compat/test.js b/test/render/fixtures/include-layout-v3-compat/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures/include-layout-v3-compat/test.js
+++ b/test/render/fixtures/include-layout-v3-compat/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures/include-layout/test.js b/test/render/fixtures/include-layout/test.js
index 65e779f09..319770571 100644
--- a/test/render/fixtures/include-layout/test.js
+++ b/test/render/fixtures/include-layout/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    layoutDynamic: require('./layout-default.marko')
-};
\ No newline at end of file
+    layoutDynamic: require("./layout-default.marko")
+};
diff --git a/test/render/fixtures/include-renderBody-data-and-attrs/test.js b/test/render/fixtures/include-renderBody-data-and-attrs/test.js
index e08ba8dfe..44cfd8490 100644
--- a/test/render/fixtures/include-renderBody-data-and-attrs/test.js
+++ b/test/render/fixtures/include-renderBody-data-and-attrs/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     renderBody(out, data) {
-        out.beginElement('div');
-        out.text(data.name + ':' + data.age);
+        out.beginElement("div");
+        out.text(data.name + ":" + data.age);
         out.endElement();
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-renderBody-no-data/test.js b/test/render/fixtures/include-renderBody-no-data/test.js
index dce6264ff..8160ca9a1 100644
--- a/test/render/fixtures/include-renderBody-no-data/test.js
+++ b/test/render/fixtures/include-renderBody-no-data/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     renderBody(out) {
-        out.beginElement('div');
-        out.text('foo');
+        out.beginElement("div");
+        out.text("foo");
         out.endElement();
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-renderBody-string-arg/test.js b/test/render/fixtures/include-renderBody-string-arg/test.js
index 10f58ec71..3870fb0d1 100644
--- a/test/render/fixtures/include-renderBody-string-arg/test.js
+++ b/test/render/fixtures/include-renderBody-string-arg/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     renderBody(out, name) {
-        out.beginElement('div');
+        out.beginElement("div");
         out.text(name);
         out.endElement();
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-renderBody/test.js b/test/render/fixtures/include-renderBody/test.js
index 6ee5ec298..fe5c5c6f1 100644
--- a/test/render/fixtures/include-renderBody/test.js
+++ b/test/render/fixtures/include-renderBody/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     renderBody(out, data) {
-        out.beginElement('div');
+        out.beginElement("div");
         out.text(data.name);
         out.endElement();
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/include-safeHTML/test.js b/test/render/fixtures/include-safeHTML/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-safeHTML/test.js
+++ b/test/render/fixtures/include-safeHTML/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-string/test.js b/test/render/fixtures/include-string/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-string/test.js
+++ b/test/render/fixtures/include-string/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-tag-error-missing-argument/test.js b/test/render/fixtures/include-tag-error-missing-argument/test.js
index 17bc9cfbb..8dcf2055a 100644
--- a/test/render/fixtures/include-tag-error-missing-argument/test.js
+++ b/test/render/fixtures/include-tag-error-missing-argument/test.js
@@ -1,8 +1,8 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('The <include(...)> tag must have an argument');
-};
\ No newline at end of file
+    expect(message).to.contain("The <include(...)> tag must have an argument");
+};
diff --git a/test/render/fixtures/include-text/test.js b/test/render/fixtures/include-text/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-text/test.js
+++ b/test/render/fixtures/include-text/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include-whitespace/test.js b/test/render/fixtures/include-whitespace/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include-whitespace/test.js
+++ b/test/render/fixtures/include-whitespace/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/include/test.js b/test/render/fixtures/include/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/include/test.js
+++ b/test/render/fixtures/include/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/inline-script/test.js b/test/render/fixtures/inline-script/test.js
index 1908aabb0..0e1da5404 100644
--- a/test/render/fixtures/inline-script/test.js
+++ b/test/render/fixtures/inline-script/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    "name": "World"
+    name: "World"
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/invoke/test.js b/test/render/fixtures/invoke/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/invoke/test.js
+++ b/test/render/fixtures/invoke/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/label-for/test.js b/test/render/fixtures/label-for/test.js
index c7310eea8..bd8475e2e 100644
--- a/test/render/fixtures/label-for/test.js
+++ b/test/render/fixtures/label-for/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "<label for=\"hello\">Hello</label>"
-};
\ No newline at end of file
+    name: '<label for="hello">Hello</label>'
+};
diff --git a/test/render/fixtures/macro-body/test.js b/test/render/fixtures/macro-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macro-body/test.js
+++ b/test/render/fixtures/macro-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/macro-boolean/test.js b/test/render/fixtures/macro-boolean/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macro-boolean/test.js
+++ b/test/render/fixtures/macro-boolean/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/macro-no-args/test.js b/test/render/fixtures/macro-no-args/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macro-no-args/test.js
+++ b/test/render/fixtures/macro-no-args/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/macro-positional-args/test.js b/test/render/fixtures/macro-positional-args/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macro-positional-args/test.js
+++ b/test/render/fixtures/macro-positional-args/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/macro/test.js b/test/render/fixtures/macro/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macro/test.js
+++ b/test/render/fixtures/macro/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/macros-ordering/test.js b/test/render/fixtures/macros-ordering/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/macros-ordering/test.js
+++ b/test/render/fixtures/macros-ordering/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/marko-body-attr-parsed-text/test.js b/test/render/fixtures/marko-body-attr-parsed-text/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/marko-body-attr-parsed-text/test.js
+++ b/test/render/fixtures/marko-body-attr-parsed-text/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/marko-body-attr-static-text/test.js b/test/render/fixtures/marko-body-attr-static-text/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/marko-body-attr-static-text/test.js
+++ b/test/render/fixtures/marko-body-attr-static-text/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/marko-compiler-options-preserve-comments/test.js b/test/render/fixtures/marko-compiler-options-preserve-comments/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/marko-compiler-options-preserve-comments/test.js
+++ b/test/render/fixtures/marko-compiler-options-preserve-comments/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/marko-compiler-options-preserve-whitespace-nested/test.js b/test/render/fixtures/marko-compiler-options-preserve-whitespace-nested/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/marko-compiler-options-preserve-whitespace-nested/test.js
+++ b/test/render/fixtures/marko-compiler-options-preserve-whitespace-nested/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/marko-compiler-options-preserve-whitespace-trim/test.js b/test/render/fixtures/marko-compiler-options-preserve-whitespace-trim/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/marko-compiler-options-preserve-whitespace-trim/test.js
+++ b/test/render/fixtures/marko-compiler-options-preserve-whitespace-trim/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/marko-compiler-options-preserve-whitespace/test.js b/test/render/fixtures/marko-compiler-options-preserve-whitespace/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/marko-compiler-options-preserve-whitespace/test.js
+++ b/test/render/fixtures/marko-compiler-options-preserve-whitespace/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/marko-preserve-whitespace-attr/test.js b/test/render/fixtures/marko-preserve-whitespace-attr/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/marko-preserve-whitespace-attr/test.js
+++ b/test/render/fixtures/marko-preserve-whitespace-attr/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/marko-preserve-whitespace-tag/test.js b/test/render/fixtures/marko-preserve-whitespace-tag/test.js
index c128acd4a..7889b1c32 100644
--- a/test/render/fixtures/marko-preserve-whitespace-tag/test.js
+++ b/test/render/fixtures/marko-preserve-whitespace-tag/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
-    "myAttrs": {
-        "style": "background-color: #FF0000; <test>",
-        "class": "my-div",
-        "checked": true
+    myAttrs: {
+        style: "background-color: #FF0000; <test>",
+        class: "my-div",
+        checked: true
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-bad/test.js b/test/render/fixtures/nested-tag-bad/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-bad/test.js
+++ b/test/render/fixtures/nested-tag-bad/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/components/test-message/marko-tag.json b/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/components/test-message/marko-tag.json
index 4c287eeda..725698989 100644
--- a/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/components/test-message/marko-tag.json
+++ b/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/components/test-message/marko-tag.json
@@ -2,4 +2,4 @@
     "@items <item>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/test.js b/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-complex-logic-repeated/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-complex-logic/test.js b/test/render/fixtures/nested-tag-shorthand-complex-logic/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-complex-logic/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-complex-logic/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-hyphens-repeated/test.js b/test/render/fixtures/nested-tag-shorthand-hyphens-repeated/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-hyphens-repeated/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-hyphens-repeated/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-hyphens/test.js b/test/render/fixtures/nested-tag-shorthand-hyphens/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-hyphens/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-hyphens/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-conditional/test.js b/test/render/fixtures/nested-tag-shorthand-simple-conditional/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-conditional/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple-conditional/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/marko-tag.json b/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/marko-tag.json
index 0966afc2f..a39a36e21 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/marko-tag.json
+++ b/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/components/test-message/marko-tag.json
@@ -5,4 +5,4 @@
     "<body>": {
         "@label": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/test.js b/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/test.js
index 14e8623a7..15591fd95 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple-declared-invalid-attribute/test.js
@@ -1,8 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     var message = e.toString();
-    expect(message).to.contain('Unsupported attribute of "invalid" found on the <@header> custom tag. Allowed attributes: label');
-};
\ No newline at end of file
+    expect(message).to.contain(
+        'Unsupported attribute of "invalid" found on the <@header> custom tag. Allowed attributes: label'
+    );
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-declared/components/test-message/marko-tag.json b/test/render/fixtures/nested-tag-shorthand-simple-declared/components/test-message/marko-tag.json
index 0966afc2f..a39a36e21 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-declared/components/test-message/marko-tag.json
+++ b/test/render/fixtures/nested-tag-shorthand-simple-declared/components/test-message/marko-tag.json
@@ -5,4 +5,4 @@
     "<body>": {
         "@label": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-declared/test.js b/test/render/fixtures/nested-tag-shorthand-simple-declared/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-declared/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple-declared/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/components/test-message/marko-tag.json b/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/components/test-message/marko-tag.json
index 4c287eeda..725698989 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/components/test-message/marko-tag.json
+++ b/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/components/test-message/marko-tag.json
@@ -2,4 +2,4 @@
     "@items <item>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/test.js b/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple-repeated-conditional/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-repeated/components/test-message/marko-tag.json b/test/render/fixtures/nested-tag-shorthand-simple-repeated/components/test-message/marko-tag.json
index 4c287eeda..725698989 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-repeated/components/test-message/marko-tag.json
+++ b/test/render/fixtures/nested-tag-shorthand-simple-repeated/components/test-message/marko-tag.json
@@ -2,4 +2,4 @@
     "@items <item>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tag-shorthand-simple-repeated/test.js b/test/render/fixtures/nested-tag-shorthand-simple-repeated/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple-repeated/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple-repeated/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tag-shorthand-simple/test.js b/test/render/fixtures/nested-tag-shorthand-simple/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tag-shorthand-simple/test.js
+++ b/test/render/fixtures/nested-tag-shorthand-simple/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tags-concise/marko.json b/test/render/fixtures/nested-tags-concise/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-concise/marko.json
+++ b/test/render/fixtures/nested-tags-concise/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/marko-tag.json b/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/marko-tag.json
+++ b/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js b/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js
+++ b/test/render/fixtures/nested-tags-concise/tags/test-nested-tags-tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags-concise/test.js b/test/render/fixtures/nested-tags-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/nested-tags-concise/test.js
+++ b/test/render/fixtures/nested-tags-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/nested-tags-deep/marko.json b/test/render/fixtures/nested-tags-deep/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-deep/marko.json
+++ b/test/render/fixtures/nested-tags-deep/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/marko-tag.json b/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/marko-tag.json
index e78045946..0951772bc 100644
--- a/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/marko-tag.json
+++ b/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/marko-tag.json
@@ -3,8 +3,6 @@
     "@class": "string",
     "@items <item>[]": {
         "@foo": "string",
-        "@body <body>": {
-
-        }
+        "@body <body>": {}
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/renderer.js b/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/renderer.js
index c68c46aa0..bf57e0ec3 100644
--- a/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/renderer.js
+++ b/test/render/fixtures/nested-tags-deep/tags/test-nested-tags-deep/renderer.js
@@ -1,5 +1,5 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-module.exports = function (input, out) {
+module.exports = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tags-deep/test.js b/test/render/fixtures/nested-tags-deep/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/nested-tags-deep/test.js
+++ b/test/render/fixtures/nested-tags-deep/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/nested-tags-empty-body/marko.json b/test/render/fixtures/nested-tags-empty-body/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-empty-body/marko.json
+++ b/test/render/fixtures/nested-tags-empty-body/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/marko-tag.json b/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/marko-tag.json
+++ b/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js b/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js
+++ b/test/render/fixtures/nested-tags-empty-body/tags/test-nested-tags-tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags-empty-body/test.js b/test/render/fixtures/nested-tags-empty-body/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/nested-tags-empty-body/test.js
+++ b/test/render/fixtures/nested-tags-empty-body/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/nested-tags-repeated-parent/marko.json b/test/render/fixtures/nested-tags-repeated-parent/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-repeated-parent/marko.json
+++ b/test/render/fixtures/nested-tags-repeated-parent/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/marko-tag.json b/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/marko-tag.json
index 9686a762c..4624c93c9 100644
--- a/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/marko-tag.json
+++ b/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/marko-tag.json
@@ -20,4 +20,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js b/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js
index 364254e5c..89137e3b2 100644
--- a/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js
+++ b/test/render/fixtures/nested-tags-repeated-parent/tags/test-nested-tags-overlay/renderer.js
@@ -1,13 +1,16 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var header = input.header;
     var body = input.body;
     var footer = input.footer;
 
-    template.render({
-        header: header,
-        body: body,
-        footer: footer
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            header: header,
+            body: body,
+            footer: footer
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags-repeated-parent/test.js b/test/render/fixtures/nested-tags-repeated-parent/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tags-repeated-parent/test.js
+++ b/test/render/fixtures/nested-tags-repeated-parent/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/nested-tags-repeated/marko.json b/test/render/fixtures/nested-tags-repeated/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-repeated/marko.json
+++ b/test/render/fixtures/nested-tags-repeated/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/marko-tag.json b/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/marko-tag.json
+++ b/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js b/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js
+++ b/test/render/fixtures/nested-tags-repeated/tags/test-nested-tags-tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags-repeated/test.js b/test/render/fixtures/nested-tags-repeated/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/nested-tags-repeated/test.js
+++ b/test/render/fixtures/nested-tags-repeated/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/nested-tags-self-closing/marko.json b/test/render/fixtures/nested-tags-self-closing/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags-self-closing/marko.json
+++ b/test/render/fixtures/nested-tags-self-closing/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/marko-tag.json b/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/marko-tag.json
+++ b/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js b/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js
+++ b/test/render/fixtures/nested-tags-self-closing/tags/test-nested-tags-tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags-self-closing/test.js b/test/render/fixtures/nested-tags-self-closing/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/nested-tags-self-closing/test.js
+++ b/test/render/fixtures/nested-tags-self-closing/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/nested-tags/marko.json b/test/render/fixtures/nested-tags/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/nested-tags/marko.json
+++ b/test/render/fixtures/nested-tags/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/marko-tag.json b/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
index 9686a762c..4624c93c9 100644
--- a/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
+++ b/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/marko-tag.json
@@ -20,4 +20,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js b/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js
index 364254e5c..89137e3b2 100644
--- a/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js
+++ b/test/render/fixtures/nested-tags/tags/test-nested-tags-overlay/renderer.js
@@ -1,13 +1,16 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var header = input.header;
     var body = input.body;
     var footer = input.footer;
 
-    template.render({
-        header: header,
-        body: body,
-        footer: footer
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            header: header,
+            body: body,
+            footer: footer
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/nested-tags/test.js b/test/render/fixtures/nested-tags/test.js
index 5e7059361..28cca3fa6 100644
--- a/test/render/fixtures/nested-tags/test.js
+++ b/test/render/fixtures/nested-tags/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     header: {
-        renderBody: function (out) {
-            out.write('Header content!');
+        renderBody: function(out) {
+            out.write("Header content!");
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/open-tag-only-renderer/marko.json b/test/render/fixtures/open-tag-only-renderer/marko.json
index 6c15ba24f..96d8184f2 100644
--- a/test/render/fixtures/open-tag-only-renderer/marko.json
+++ b/test/render/fixtures/open-tag-only-renderer/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./renderer.js",
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/open-tag-only-renderer/renderer.js b/test/render/fixtures/open-tag-only-renderer/renderer.js
index c20993594..5c02b5a36 100644
--- a/test/render/fixtures/open-tag-only-renderer/renderer.js
+++ b/test/render/fixtures/open-tag-only-renderer/renderer.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('<span>Hello World</span>');
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("<span>Hello World</span>");
+};
diff --git a/test/render/fixtures/open-tag-only-renderer/test.js b/test/render/fixtures/open-tag-only-renderer/test.js
index 31b92d2a3..44b8f285a 100644
--- a/test/render/fixtures/open-tag-only-renderer/test.js
+++ b/test/render/fixtures/open-tag-only-renderer/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {};
 exports.loadOptions = {
     preserveWhitespace: true
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/open-tag-only/marko.json b/test/render/fixtures/open-tag-only/marko.json
index 35cf25b45..bad4d3f14 100644
--- a/test/render/fixtures/open-tag-only/marko.json
+++ b/test/render/fixtures/open-tag-only/marko.json
@@ -2,4 +2,4 @@
     "<test-open-tag-only>": {
         "open-tag-only": true
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/open-tag-only/test.js b/test/render/fixtures/open-tag-only/test.js
index 31b92d2a3..44b8f285a 100644
--- a/test/render/fixtures/open-tag-only/test.js
+++ b/test/render/fixtures/open-tag-only/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {};
 exports.loadOptions = {
     preserveWhitespace: true
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/paren-grouping/test.js b/test/render/fixtures/paren-grouping/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/paren-grouping/test.js
+++ b/test/render/fixtures/paren-grouping/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/parsed-text-tag/components/parsed-text/code-generator.js b/test/render/fixtures/parsed-text-tag/components/parsed-text/code-generator.js
index 1567a8c00..7403c8833 100644
--- a/test/render/fixtures/parsed-text-tag/components/parsed-text/code-generator.js
+++ b/test/render/fixtures/parsed-text-tag/components/parsed-text/code-generator.js
@@ -1,3 +1,3 @@
-module.exports = function codeGenerator(el, codegen) {
+module.exports = function codeGenerator(el) {
     return el.body;
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/parsed-text-tag/components/parsed-text/marko-tag.json b/test/render/fixtures/parsed-text-tag/components/parsed-text/marko-tag.json
index b72188ee8..a67ddd624 100644
--- a/test/render/fixtures/parsed-text-tag/components/parsed-text/marko-tag.json
+++ b/test/render/fixtures/parsed-text-tag/components/parsed-text/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "body": "parsed-text",
     "preserve-whitespace": true
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/pattern-attr/test.js b/test/render/fixtures/pattern-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/pattern-attr/test.js
+++ b/test/render/fixtures/pattern-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/placeholders-body-expressions/test.js b/test/render/fixtures/placeholders-body-expressions/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/placeholders-body-expressions/test.js
+++ b/test/render/fixtures/placeholders-body-expressions/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/preserveWhitespace-global/test.js b/test/render/fixtures/preserveWhitespace-global/test.js
index 8b450ded0..e6446437a 100644
--- a/test/render/fixtures/preserveWhitespace-global/test.js
+++ b/test/render/fixtures/preserveWhitespace-global/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {};
 exports.preserveWhitespaceGlobal = true;
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/preserveWhitespace-load-option/test.js b/test/render/fixtures/preserveWhitespace-load-option/test.js
index 82d7b4da2..d552c4c00 100644
--- a/test/render/fixtures/preserveWhitespace-load-option/test.js
+++ b/test/render/fixtures/preserveWhitespace-load-option/test.js
@@ -2,4 +2,4 @@ exports.templateData = {};
 exports.loadOptions = {
     preserveWhitespace: true
 };
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/previousSibling-nextSibling/marko.json b/test/render/fixtures/previousSibling-nextSibling/marko.json
index 02ef4c8de..ff3a84a39 100644
--- a/test/render/fixtures/previousSibling-nextSibling/marko.json
+++ b/test/render/fixtures/previousSibling-nextSibling/marko.json
@@ -2,4 +2,4 @@
     "<span>": {
         "transformer": "./span-transformer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/previousSibling-nextSibling/span-transformer.js b/test/render/fixtures/previousSibling-nextSibling/span-transformer.js
index 04324a9ab..ac47e4257 100644
--- a/test/render/fixtures/previousSibling-nextSibling/span-transformer.js
+++ b/test/render/fixtures/previousSibling-nextSibling/span-transformer.js
@@ -1,14 +1,16 @@
-var expect = require('chai').expect;
-module.exports = function (node, context) {
+var expect = require("chai").expect;
+module.exports = function(node, context) {
     var previousSibling = node.previousSibling;
     var nextSibling = node.nextSibling;
 
-    expect(previousSibling).to.be.an('object');
-    expect(nextSibling).to.be.an('object');
+    expect(previousSibling).to.be.an("object");
+    expect(nextSibling).to.be.an("object");
 
-    expect(previousSibling.tagName).to.equal('a');
-    expect(nextSibling.tagName).to.equal('b');
+    expect(previousSibling.tagName).to.equal("a");
+    expect(nextSibling.tagName).to.equal("b");
 
-    previousSibling.appendChild(context.builder.text(context.builder.literal('A')));
-    nextSibling.appendChild(context.builder.text(context.builder.literal('B')));
-};
\ No newline at end of file
+    previousSibling.appendChild(
+        context.builder.text(context.builder.literal("A"))
+    );
+    nextSibling.appendChild(context.builder.text(context.builder.literal("B")));
+};
diff --git a/test/render/fixtures/regexp-attr/test.js b/test/render/fixtures/regexp-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/regexp-attr/test.js
+++ b/test/render/fixtures/regexp-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/renderer-dir-main.js/index.js b/test/render/fixtures/renderer-dir-main.js/index.js
index 11ced9c35..0799a167b 100644
--- a/test/render/fixtures/renderer-dir-main.js/index.js
+++ b/test/render/fixtures/renderer-dir-main.js/index.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('Hello ' + input.name + '!');
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("Hello " + input.name + "!");
+};
diff --git a/test/render/fixtures/renderer-dir-main.js/marko.json b/test/render/fixtures/renderer-dir-main.js/marko.json
index e9357266d..bad47691b 100644
--- a/test/render/fixtures/renderer-dir-main.js/marko.json
+++ b/test/render/fixtures/renderer-dir-main.js/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./",
         "@name": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/renderer-dir-main.js/test.js b/test/render/fixtures/renderer-dir-main.js/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/renderer-dir-main.js/test.js
+++ b/test/render/fixtures/renderer-dir-main.js/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/renderer-index.js/marko.json b/test/render/fixtures/renderer-index.js/marko.json
index fea83262d..98cbf73e8 100644
--- a/test/render/fixtures/renderer-index.js/marko.json
+++ b/test/render/fixtures/renderer-index.js/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./renderer",
         "@name": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/renderer-index.js/renderer/index.js b/test/render/fixtures/renderer-index.js/renderer/index.js
index 11ced9c35..0799a167b 100644
--- a/test/render/fixtures/renderer-index.js/renderer/index.js
+++ b/test/render/fixtures/renderer-index.js/renderer/index.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('Hello ' + input.name + '!');
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("Hello " + input.name + "!");
+};
diff --git a/test/render/fixtures/renderer-index.js/test.js b/test/render/fixtures/renderer-index.js/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/renderer-index.js/test.js
+++ b/test/render/fixtures/renderer-index.js/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/require/test-helpers.js b/test/render/fixtures/require/test-helpers.js
index e9a4d6252..207b9c49d 100644
--- a/test/render/fixtures/require/test-helpers.js
+++ b/test/render/fixtures/require/test-helpers.js
@@ -1,8 +1,8 @@
 module.exports = {
-    trim: function (str, info) {
+    trim: function(str) {
         return str ? str.trim() : str;
     },
-    upperCase: function (str, info) {
+    upperCase: function(str) {
         return str ? str.toUpperCase(str) : str;
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/require/test.js b/test/render/fixtures/require/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/require/test.js
+++ b/test/render/fixtures/require/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/reserved-words/marko.json b/test/render/fixtures/reserved-words/marko.json
index e8d84d80a..100feeffc 100644
--- a/test/render/fixtures/reserved-words/marko.json
+++ b/test/render/fixtures/reserved-words/marko.json
@@ -3,4 +3,4 @@
         "renderer": "./my-custom-tag.js",
         "@short": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/reserved-words/my-custom-tag.js b/test/render/fixtures/reserved-words/my-custom-tag.js
index d3b076460..8c2aa9941 100644
--- a/test/render/fixtures/reserved-words/my-custom-tag.js
+++ b/test/render/fixtures/reserved-words/my-custom-tag.js
@@ -1,3 +1,3 @@
-module.exports = function (input, out) {
-    out.write('[my-custom-tag] ' + input.short);
-};
\ No newline at end of file
+module.exports = function(input, out) {
+    out.write("[my-custom-tag] " + input.short);
+};
diff --git a/test/render/fixtures/reserved-words/test.js b/test/render/fixtures/reserved-words/test.js
index 1eef3a37c..ba8230733 100644
--- a/test/render/fixtures/reserved-words/test.js
+++ b/test/render/fixtures/reserved-words/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    short: 'short'
-};
\ No newline at end of file
+    short: "short"
+};
diff --git a/test/render/fixtures/scanned-tags/marko.json b/test/render/fixtures/scanned-tags/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/scanned-tags/marko.json
+++ b/test/render/fixtures/scanned-tags/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-a/renderer.js b/test/render/fixtures/scanned-tags/tags/scanned-a/renderer.js
index cc562697a..c2f6fe508 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-a/renderer.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-a/renderer.js
@@ -1,3 +1,3 @@
 module.exports = function render(input, out) {
-    out.write('scanned-a: Hello ' + input.name);
-};
\ No newline at end of file
+    out.write("scanned-a: Hello " + input.name);
+};
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-c/marko-tag.json b/test/render/fixtures/scanned-tags/tags/scanned-c/marko-tag.json
index c3d3b15c3..6ca1f9c97 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-c/marko-tag.json
+++ b/test/render/fixtures/scanned-tags/tags/scanned-c/marko-tag.json
@@ -5,4 +5,4 @@
             "target-property": "NAME"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-c/renderer.js b/test/render/fixtures/scanned-tags/tags/scanned-c/renderer.js
index b8b5eef35..29d928355 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-c/renderer.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-c/renderer.js
@@ -1,3 +1,3 @@
 module.exports = function render(input, out) {
-    out.write('scanned-c: Hello ' + input.NAME);
-};
\ No newline at end of file
+    out.write("scanned-c: Hello " + input.NAME);
+};
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-e/renderer.js b/test/render/fixtures/scanned-tags/tags/scanned-e/renderer.js
index e3e9c6c1e..4d87da547 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-e/renderer.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-e/renderer.js
@@ -1,12 +1,12 @@
 exports.TAG = {
-    "attributes": {
-        "name": {
-            "type": "string",
+    attributes: {
+        name: {
+            type: "string",
             "target-property": "NAME"
         }
     }
 };
 
 module.exports = function render(input, out) {
-    out.write('scanned-e: Hello ' + input.NAME);
-};
\ No newline at end of file
+    out.write("scanned-e: Hello " + input.NAME);
+};
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-f/renderer.js b/test/render/fixtures/scanned-tags/tags/scanned-f/renderer.js
index daedb7d24..304f15a7f 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-f/renderer.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-f/renderer.js
@@ -10,5 +10,5 @@ TAG = {
 */
 
 module.exports = function render(input, out) {
-    out.write('scanned-f: Hello ' + input.NAME);
-};
\ No newline at end of file
+    out.write("scanned-f: Hello " + input.NAME);
+};
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-g/index.js b/test/render/fixtures/scanned-tags/tags/scanned-g/index.js
index cefad1c92..069aa0c8f 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-g/index.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-g/index.js
@@ -1,3 +1,3 @@
-exports.renderer = function (input, out) {
-    out.write('scanned-g: Hello ' + input.name);
-};
\ No newline at end of file
+exports.renderer = function(input, out) {
+    out.write("scanned-g: Hello " + input.name);
+};
diff --git a/test/render/fixtures/scanned-tags/tags/scanned-h/index.js b/test/render/fixtures/scanned-tags/tags/scanned-h/index.js
index 68a5fd64a..47f3e4f7c 100644
--- a/test/render/fixtures/scanned-tags/tags/scanned-h/index.js
+++ b/test/render/fixtures/scanned-tags/tags/scanned-h/index.js
@@ -1,3 +1,3 @@
-exports.renderer = function (input, out) {
-    out.write('scanned-h: Hello ' + input.firstName);
-};
\ No newline at end of file
+exports.renderer = function(input, out) {
+    out.write("scanned-h: Hello " + input.firstName);
+};
diff --git a/test/render/fixtures/scanned-tags/test.js b/test/render/fixtures/scanned-tags/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/scanned-tags/test.js
+++ b/test/render/fixtures/scanned-tags/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/script-nonce/script-nonce-transformer.js b/test/render/fixtures/script-nonce/script-nonce-transformer.js
index 4d3a0758d..21286c789 100644
--- a/test/render/fixtures/script-nonce/script-nonce-transformer.js
+++ b/test/render/fixtures/script-nonce/script-nonce-transformer.js
@@ -1,8 +1,7 @@
 module.exports = function transform(el, context) {
-    if (el.hasAttribute('csp-nonce')) {
+    if (el.hasAttribute("csp-nonce")) {
+        el.removeAttribute("csp-nonce");
 
-        el.removeAttribute('csp-nonce');
-
-        el.setAttributeValue('nonce', context.builder.literal('foo'));
+        el.setAttributeValue("nonce", context.builder.literal("foo"));
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/script-nonce/test.js b/test/render/fixtures/script-nonce/test.js
index 33340c3e8..b28b438e2 100644
--- a/test/render/fixtures/script-nonce/test.js
+++ b/test/render/fixtures/script-nonce/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    "myAttrs": {
-        "hello": "world"
+    myAttrs: {
+        hello: "world"
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/script-string-literal-placeholder/test.js b/test/render/fixtures/script-string-literal-placeholder/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/script-string-literal-placeholder/test.js
+++ b/test/render/fixtures/script-string-literal-placeholder/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/script-tag-entities-static/marko.json b/test/render/fixtures/script-tag-entities-static/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/script-tag-entities-static/marko.json
+++ b/test/render/fixtures/script-tag-entities-static/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/script-tag-entities-static/tags/test-script/code-generator.js b/test/render/fixtures/script-tag-entities-static/tags/test-script/code-generator.js
index 505365823..012feaab6 100644
--- a/test/render/fixtures/script-tag-entities-static/tags/test-script/code-generator.js
+++ b/test/render/fixtures/script-tag-entities-static/tags/test-script/code-generator.js
@@ -1,5 +1,6 @@
-
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
-    return builder.htmlElement('script', {}, [builder.text(builder.literal('<test>'))]);
-};
\ No newline at end of file
+    return builder.htmlElement("script", {}, [
+        builder.text(builder.literal("<test>"))
+    ]);
+};
diff --git a/test/render/fixtures/script-tag-entities-static/tags/test-script/marko-tag.json b/test/render/fixtures/script-tag-entities-static/tags/test-script/marko-tag.json
index 8d0664211..d9d3f1084 100644
--- a/test/render/fixtures/script-tag-entities-static/tags/test-script/marko-tag.json
+++ b/test/render/fixtures/script-tag-entities-static/tags/test-script/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "code-generator": "./code-generator"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/script-tag-entities-static/test.js b/test/render/fixtures/script-tag-entities-static/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/script-tag-entities-static/test.js
+++ b/test/render/fixtures/script-tag-entities-static/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/script-tag-entities/test.js b/test/render/fixtures/script-tag-entities/test.js
index b25447bea..a61ca395a 100644
--- a/test/render/fixtures/script-tag-entities/test.js
+++ b/test/render/fixtures/script-tag-entities/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    "name": "<script>evil</script>"
+    name: "<script>evil</script>"
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/script/test.js b/test/render/fixtures/script/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/script/test.js
+++ b/test/render/fixtures/script/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/scriptlet/test.js b/test/render/fixtures/scriptlet/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/scriptlet/test.js
+++ b/test/render/fixtures/scriptlet/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/shorthand-class-merge/test.js b/test/render/fixtures/shorthand-class-merge/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-class-merge/test.js
+++ b/test/render/fixtures/shorthand-class-merge/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-class-merge2/test.js b/test/render/fixtures/shorthand-class-merge2/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-class-merge2/test.js
+++ b/test/render/fixtures/shorthand-class-merge2/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-class-plus-class-obj/test.js b/test/render/fixtures/shorthand-class-plus-class-obj/test.js
index 464e2f790..e53da31ec 100644
--- a/test/render/fixtures/shorthand-class-plus-class-obj/test.js
+++ b/test/render/fixtures/shorthand-class-plus-class-obj/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Marko'
-};
\ No newline at end of file
+    name: "Marko"
+};
diff --git a/test/render/fixtures/shorthand-classes-many-classes/test.js b/test/render/fixtures/shorthand-classes-many-classes/test.js
index 740d6c4dd..8740c6152 100644
--- a/test/render/fixtures/shorthand-classes-many-classes/test.js
+++ b/test/render/fixtures/shorthand-classes-many-classes/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    cls: 'test123'
-};
\ No newline at end of file
+    cls: "test123"
+};
diff --git a/test/render/fixtures/shorthand-div-id-dynamic/test.js b/test/render/fixtures/shorthand-div-id-dynamic/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-div-id-dynamic/test.js
+++ b/test/render/fixtures/shorthand-div-id-dynamic/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-div-id/test.js b/test/render/fixtures/shorthand-div-id/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-div-id/test.js
+++ b/test/render/fixtures/shorthand-div-id/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-div.foo/test.js b/test/render/fixtures/shorthand-div.foo/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-div.foo/test.js
+++ b/test/render/fixtures/shorthand-div.foo/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-id-and-classes/test.js b/test/render/fixtures/shorthand-id-and-classes/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-id-and-classes/test.js
+++ b/test/render/fixtures/shorthand-id-and-classes/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/shorthand-verbose/test.js b/test/render/fixtures/shorthand-verbose/test.js
index fe50c57c5..049888cb8 100644
--- a/test/render/fixtures/shorthand-verbose/test.js
+++ b/test/render/fixtures/shorthand-verbose/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'Frank'
-};
\ No newline at end of file
+    name: "Frank"
+};
diff --git a/test/render/fixtures/simple-conditionals/test.js b/test/render/fixtures/simple-conditionals/test.js
index 157624bc2..65225fac2 100644
--- a/test/render/fixtures/simple-conditionals/test.js
+++ b/test/render/fixtures/simple-conditionals/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "John",
-    "count": 51
-};
\ No newline at end of file
+    name: "John",
+    count: 51
+};
diff --git a/test/render/fixtures/simple/test.js b/test/render/fixtures/simple/test.js
index 06b2de778..8d8d6773f 100644
--- a/test/render/fixtures/simple/test.js
+++ b/test/render/fixtures/simple/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    "message": "Hello World!",
-    "rootClass": "title",
-    "colors": ["red", "green", "blue"]
-};
\ No newline at end of file
+    message: "Hello World!",
+    rootClass: "title",
+    colors: ["red", "green", "blue"]
+};
diff --git a/test/render/fixtures/space-around-equal-sign-for-attr/test.js b/test/render/fixtures/space-around-equal-sign-for-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/space-around-equal-sign-for-attr/test.js
+++ b/test/render/fixtures/space-around-equal-sign-for-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/space-in-complex-attr-value/test.js b/test/render/fixtures/space-in-complex-attr-value/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/space-in-complex-attr-value/test.js
+++ b/test/render/fixtures/space-in-complex-attr-value/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/static-text-tag/components/static-text/code-generator.js b/test/render/fixtures/static-text-tag/components/static-text/code-generator.js
index 1567a8c00..7403c8833 100644
--- a/test/render/fixtures/static-text-tag/components/static-text/code-generator.js
+++ b/test/render/fixtures/static-text-tag/components/static-text/code-generator.js
@@ -1,3 +1,3 @@
-module.exports = function codeGenerator(el, codegen) {
+module.exports = function codeGenerator(el) {
     return el.body;
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/static-text-tag/components/static-text/marko-tag.json b/test/render/fixtures/static-text-tag/components/static-text/marko-tag.json
index 61d7f7d3f..966a51b08 100644
--- a/test/render/fixtures/static-text-tag/components/static-text/marko-tag.json
+++ b/test/render/fixtures/static-text-tag/components/static-text/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "body": "static-text",
     "preserve-whitespace": true
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/string-expressions/test.js b/test/render/fixtures/string-expressions/test.js
index e62259d13..68563f236 100644
--- a/test/render/fixtures/string-expressions/test.js
+++ b/test/render/fixtures/string-expressions/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "John",
-    "count": 10
-};
\ No newline at end of file
+    name: "John",
+    count: 10
+};
diff --git a/test/render/fixtures/style-attr-object-units/test.js b/test/render/fixtures/style-attr-object-units/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/style-attr-object-units/test.js
+++ b/test/render/fixtures/style-attr-object-units/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/style-attr-object/test.js b/test/render/fixtures/style-attr-object/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/style-attr-object/test.js
+++ b/test/render/fixtures/style-attr-object/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/style-attr-string-dynamic/test.js b/test/render/fixtures/style-attr-string-dynamic/test.js
index 05e1bb330..54e167159 100644
--- a/test/render/fixtures/style-attr-string-dynamic/test.js
+++ b/test/render/fixtures/style-attr-string-dynamic/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    style: 'color: red'
-};
\ No newline at end of file
+    style: "color: red"
+};
diff --git a/test/render/fixtures/style-attr-string/test.js b/test/render/fixtures/style-attr-string/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/style-attr-string/test.js
+++ b/test/render/fixtures/style-attr-string/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/svg/test.js b/test/render/fixtures/svg/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/svg/test.js
+++ b/test/render/fixtures/svg/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-concise/marko.json b/test/render/fixtures/syntax-concise/marko.json
index 7ecc75f05..24e297e79 100644
--- a/test/render/fixtures/syntax-concise/marko.json
+++ b/test/render/fixtures/syntax-concise/marko.json
@@ -1,3 +1,3 @@
 {
     "<tabs>": "./tabs/marko-tag.json"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-concise/tabs/marko-tag.json b/test/render/fixtures/syntax-concise/tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/syntax-concise/tabs/marko-tag.json
+++ b/test/render/fixtures/syntax-concise/tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-concise/tabs/renderer.js b/test/render/fixtures/syntax-concise/tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/syntax-concise/tabs/renderer.js
+++ b/test/render/fixtures/syntax-concise/tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/syntax-concise/test.js b/test/render/fixtures/syntax-concise/test.js
index 40282cbb0..ffdf5af75 100644
--- a/test/render/fixtures/syntax-concise/test.js
+++ b/test/render/fixtures/syntax-concise/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {};
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-mixed/marko.json b/test/render/fixtures/syntax-mixed/marko.json
index 7ecc75f05..24e297e79 100644
--- a/test/render/fixtures/syntax-mixed/marko.json
+++ b/test/render/fixtures/syntax-mixed/marko.json
@@ -1,3 +1,3 @@
 {
     "<tabs>": "./tabs/marko-tag.json"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-mixed/tabs/marko-tag.json b/test/render/fixtures/syntax-mixed/tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/syntax-mixed/tabs/marko-tag.json
+++ b/test/render/fixtures/syntax-mixed/tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-mixed/tabs/renderer.js b/test/render/fixtures/syntax-mixed/tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/syntax-mixed/tabs/renderer.js
+++ b/test/render/fixtures/syntax-mixed/tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/syntax-mixed/test.js b/test/render/fixtures/syntax-mixed/test.js
index 40282cbb0..ffdf5af75 100644
--- a/test/render/fixtures/syntax-mixed/test.js
+++ b/test/render/fixtures/syntax-mixed/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {};
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-simple-concise/test.js b/test/render/fixtures/syntax-simple-concise/test.js
index bb66f142f..812be0b50 100644
--- a/test/render/fixtures/syntax-simple-concise/test.js
+++ b/test/render/fixtures/syntax-simple-concise/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    colors: ['red', 'green', 'blue']
+    colors: ["red", "green", "blue"]
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-simple-mixed/test.js b/test/render/fixtures/syntax-simple-mixed/test.js
index bb66f142f..812be0b50 100644
--- a/test/render/fixtures/syntax-simple-mixed/test.js
+++ b/test/render/fixtures/syntax-simple-mixed/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    colors: ['red', 'green', 'blue']
+    colors: ["red", "green", "blue"]
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-simple-verbose/test.js b/test/render/fixtures/syntax-simple-verbose/test.js
index bb66f142f..812be0b50 100644
--- a/test/render/fixtures/syntax-simple-verbose/test.js
+++ b/test/render/fixtures/syntax-simple-verbose/test.js
@@ -1,5 +1,5 @@
 exports.templateData = {
-    colors: ['red', 'green', 'blue']
+    colors: ["red", "green", "blue"]
 };
 
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/syntax-verbose/marko.json b/test/render/fixtures/syntax-verbose/marko.json
index 7ecc75f05..24e297e79 100644
--- a/test/render/fixtures/syntax-verbose/marko.json
+++ b/test/render/fixtures/syntax-verbose/marko.json
@@ -1,3 +1,3 @@
 {
     "<tabs>": "./tabs/marko-tag.json"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-verbose/tabs/marko-tag.json b/test/render/fixtures/syntax-verbose/tabs/marko-tag.json
index 39d0e5fd9..89e98f6c9 100644
--- a/test/render/fixtures/syntax-verbose/tabs/marko-tag.json
+++ b/test/render/fixtures/syntax-verbose/tabs/marko-tag.json
@@ -4,4 +4,4 @@
     "@tabs <tab>[]": {
         "@title": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/syntax-verbose/tabs/renderer.js b/test/render/fixtures/syntax-verbose/tabs/renderer.js
index 266c0eae0..fe0d89eab 100644
--- a/test/render/fixtures/syntax-verbose/tabs/renderer.js
+++ b/test/render/fixtures/syntax-verbose/tabs/renderer.js
@@ -1,9 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     var tabs = input.tabs;
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/syntax-verbose/test.js b/test/render/fixtures/syntax-verbose/test.js
index 651f5cf87..e1e58ae90 100644
--- a/test/render/fixtures/syntax-verbose/test.js
+++ b/test/render/fixtures/syntax-verbose/test.js
@@ -1,2 +1,2 @@
 exports.templateData = {};
-exports.vdomSkip = true;
\ No newline at end of file
+exports.vdomSkip = true;
diff --git a/test/render/fixtures/tabs-tab-new/marko.json b/test/render/fixtures/tabs-tab-new/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tabs-tab-new/marko.json
+++ b/test/render/fixtures/tabs-tab-new/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab-new/tags/test-tab-new/marko-tag.json b/test/render/fixtures/tabs-tab-new/tags/test-tab-new/marko-tag.json
index fdfb634a9..8b4f2cef3 100644
--- a/test/render/fixtures/tabs-tab-new/tags/test-tab-new/marko-tag.json
+++ b/test/render/fixtures/tabs-tab-new/tags/test-tab-new/marko-tag.json
@@ -3,4 +3,4 @@
         "tabs": "__tabsHelper"
     },
     "@title": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab-new/tags/test-tab-new/renderer.js b/test/render/fixtures/tabs-tab-new/tags/test-tab-new/renderer.js
index e84451ceb..c23cab712 100644
--- a/test/render/fixtures/tabs-tab-new/tags/test-tab-new/renderer.js
+++ b/test/render/fixtures/tabs-tab-new/tags/test-tab-new/renderer.js
@@ -1,4 +1,4 @@
-exports.render = function (input, out) {
-     var tabs = input.tabs;
-     tabs.addTab(input);
-};
\ No newline at end of file
+exports.render = function(input) {
+    var tabs = input.tabs;
+    tabs.addTab(input);
+};
diff --git a/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/marko-tag.json b/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/marko-tag.json
index 869179d98..727e90cbd 100644
--- a/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/marko-tag.json
+++ b/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "body-function": "buildTabs(__tabsHelper)"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/renderer.js b/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/renderer.js
index 58fc22e08..f84a1ed52 100644
--- a/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/renderer.js
+++ b/test/render/fixtures/tabs-tab-new/tags/test-tabs-new/renderer.js
@@ -1,12 +1,12 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var tabs = [],
         activeFound = false;
 
     if (input.buildTabs) {
         input.buildTabs({
-            addTab: function (tab) {
+            addTab: function(tab) {
                 if (tab.active) {
                     tab.activeFound = true;
                 }
@@ -21,12 +21,15 @@ exports.render = function (input, out) {
         tabs[0].active = true;
     }
 
-    tabs.forEach(function (tab) {
+    tabs.forEach(function(tab) {
         tab.liClass = tab.active ? "active" : "";
         tab.divClass = tab.active ? "tab-pane active" : "tab-pane";
     });
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/tabs-tab-new/test.js b/test/render/fixtures/tabs-tab-new/test.js
index 9775e3938..01a1e9e6b 100644
--- a/test/render/fixtures/tabs-tab-new/test.js
+++ b/test/render/fixtures/tabs-tab-new/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "showConditionalTab": false
-};
\ No newline at end of file
+    showConditionalTab: false
+};
diff --git a/test/render/fixtures/tabs-tab/marko.json b/test/render/fixtures/tabs-tab/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tabs-tab/marko.json
+++ b/test/render/fixtures/tabs-tab/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab/tags/test-tab/marko-tag.json b/test/render/fixtures/tabs-tab/tags/test-tab/marko-tag.json
index 8d152661a..037d87aef 100644
--- a/test/render/fixtures/tabs-tab/tags/test-tab/marko-tag.json
+++ b/test/render/fixtures/tabs-tab/tags/test-tab/marko-tag.json
@@ -3,4 +3,4 @@
         "tabs": "tabs"
     },
     "@title": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab/tags/test-tab/renderer.js b/test/render/fixtures/tabs-tab/tags/test-tab/renderer.js
index e84451ceb..c23cab712 100644
--- a/test/render/fixtures/tabs-tab/tags/test-tab/renderer.js
+++ b/test/render/fixtures/tabs-tab/tags/test-tab/renderer.js
@@ -1,4 +1,4 @@
-exports.render = function (input, out) {
-     var tabs = input.tabs;
-     tabs.addTab(input);
-};
\ No newline at end of file
+exports.render = function(input) {
+    var tabs = input.tabs;
+    tabs.addTab(input);
+};
diff --git a/test/render/fixtures/tabs-tab/tags/test-tabs/marko-tag.json b/test/render/fixtures/tabs-tab/tags/test-tabs/marko-tag.json
index 720984466..f3a53d1bf 100644
--- a/test/render/fixtures/tabs-tab/tags/test-tabs/marko-tag.json
+++ b/test/render/fixtures/tabs-tab/tags/test-tabs/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "var": "tabs"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tabs-tab/tags/test-tabs/renderer.js b/test/render/fixtures/tabs-tab/tags/test-tabs/renderer.js
index 573bc6023..f070d06e4 100644
--- a/test/render/fixtures/tabs-tab/tags/test-tabs/renderer.js
+++ b/test/render/fixtures/tabs-tab/tags/test-tabs/renderer.js
@@ -1,11 +1,11 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.render = function (input, out) {
+exports.render = function(input, out) {
     var tabs = [],
         activeFound = false;
 
     input.renderBody(out, {
-        addTab: function (tab) {
+        addTab: function(tab) {
             if (tab.active) {
                 tab.activeFound = true;
             }
@@ -19,12 +19,15 @@ exports.render = function (input, out) {
         tabs[0].active = true;
     }
 
-    tabs.forEach(function (tab) {
+    tabs.forEach(function(tab) {
         tab.liClass = tab.active ? "active" : "";
         tab.divClass = tab.active ? "tab-pane active" : "tab-pane";
     });
 
-    template.render({
-        tabs: tabs
-    }, out);
-};
\ No newline at end of file
+    template.render(
+        {
+            tabs: tabs
+        },
+        out
+    );
+};
diff --git a/test/render/fixtures/tabs-tab/test.js b/test/render/fixtures/tabs-tab/test.js
index 9775e3938..01a1e9e6b 100644
--- a/test/render/fixtures/tabs-tab/test.js
+++ b/test/render/fixtures/tabs-tab/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "showConditionalTab": false
-};
\ No newline at end of file
+    showConditionalTab: false
+};
diff --git a/test/render/fixtures/tag-code-generator-return-array/marko.json b/test/render/fixtures/tag-code-generator-return-array/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tag-code-generator-return-array/marko.json
+++ b/test/render/fixtures/tag-code-generator-return-array/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/code-generator.js b/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/code-generator.js
index 013ff591b..e58072db9 100644
--- a/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/code-generator.js
+++ b/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/code-generator.js
@@ -1,4 +1,7 @@
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
-    return [builder.text(builder.literal('Hello ')), builder.text(elNode.getAttributeValue('name'))];
-};
\ No newline at end of file
+    return [
+        builder.text(builder.literal("Hello ")),
+        builder.text(elNode.getAttributeValue("name"))
+    ];
+};
diff --git a/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/marko-tag.json b/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/marko-tag.json
index 0ec7547f9..b9633ce37 100644
--- a/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/marko-tag.json
+++ b/test/render/fixtures/tag-code-generator-return-array/tags/test-tag-code-generator-return-array/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-array/test.js b/test/render/fixtures/tag-code-generator-return-array/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/tag-code-generator-return-array/test.js
+++ b/test/render/fixtures/tag-code-generator-return-array/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/tag-code-generator-return-node/marko.json b/test/render/fixtures/tag-code-generator-return-node/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tag-code-generator-return-node/marko.json
+++ b/test/render/fixtures/tag-code-generator-return-node/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/code-generator.js b/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/code-generator.js
index d57abad18..d121dff59 100644
--- a/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/code-generator.js
+++ b/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/code-generator.js
@@ -1,4 +1,10 @@
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
-    return builder.functionCall('out.write', [builder.binaryExpression('"Hello "', '+', elNode.getAttributeValue('name'))]);
-};
\ No newline at end of file
+    return builder.functionCall("out.write", [
+        builder.binaryExpression(
+            '"Hello "',
+            "+",
+            elNode.getAttributeValue("name")
+        )
+    ]);
+};
diff --git a/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/marko-tag.json b/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/marko-tag.json
index 0ec7547f9..b9633ce37 100644
--- a/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/marko-tag.json
+++ b/test/render/fixtures/tag-code-generator-return-node/tags/test-tag-code-generator-return-node/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-node/test.js b/test/render/fixtures/tag-code-generator-return-node/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/tag-code-generator-return-node/test.js
+++ b/test/render/fixtures/tag-code-generator-return-node/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/tag-code-generator-return-self/marko.json b/test/render/fixtures/tag-code-generator-return-self/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tag-code-generator-return-self/marko.json
+++ b/test/render/fixtures/tag-code-generator-return-self/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/code-generator.js b/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/code-generator.js
index f57aaa8c4..ec21841c9 100644
--- a/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/code-generator.js
+++ b/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/code-generator.js
@@ -1,5 +1,5 @@
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
-    elNode.setAttributeValue('foo', builder.literal('bar'));
+    elNode.setAttributeValue("foo", builder.literal("bar"));
     return elNode;
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/marko-tag.json b/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/marko-tag.json
index 0ec7547f9..b9633ce37 100644
--- a/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/marko-tag.json
+++ b/test/render/fixtures/tag-code-generator-return-self/tags/test-tag-code-generator-return-self/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-self/test.js b/test/render/fixtures/tag-code-generator-return-self/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/tag-code-generator-return-self/test.js
+++ b/test/render/fixtures/tag-code-generator-return-self/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/tag-code-generator-return-tree/marko.json b/test/render/fixtures/tag-code-generator-return-tree/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/tag-code-generator-return-tree/marko.json
+++ b/test/render/fixtures/tag-code-generator-return-tree/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/code-generator.js b/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/code-generator.js
index 8e6398242..c04cfa3be 100644
--- a/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/code-generator.js
+++ b/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/code-generator.js
@@ -1,7 +1,14 @@
 module.exports = function generateCode(elNode, codegen) {
     var builder = codegen.builder;
 
-    return builder.htmlElement('div', {
-        'class': builder.literal('greeting')
-    }, [builder.text(builder.literal('Hello ')), builder.text(elNode.getAttributeValue('name'))]);
-};
\ No newline at end of file
+    return builder.htmlElement(
+        "div",
+        {
+            class: builder.literal("greeting")
+        },
+        [
+            builder.text(builder.literal("Hello ")),
+            builder.text(elNode.getAttributeValue("name"))
+        ]
+    );
+};
diff --git a/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/marko-tag.json b/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/marko-tag.json
index 0ec7547f9..b9633ce37 100644
--- a/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/marko-tag.json
+++ b/test/render/fixtures/tag-code-generator-return-tree/tags/test-tag-code-generator-return-tree/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "@name": "string"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tag-code-generator-return-tree/test.js b/test/render/fixtures/tag-code-generator-return-tree/test.js
index 010a2ae52..761736115 100644
--- a/test/render/fixtures/tag-code-generator-return-tree/test.js
+++ b/test/render/fixtures/tag-code-generator-return-tree/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    name: 'John'
-};
\ No newline at end of file
+    name: "John"
+};
diff --git a/test/render/fixtures/taglib-imports-nested/marko.json b/test/render/fixtures/taglib-imports-nested/marko.json
index 0879e323a..717c0738c 100644
--- a/test/render/fixtures/taglib-imports-nested/marko.json
+++ b/test/render/fixtures/taglib-imports-nested/marko.json
@@ -1,3 +1,3 @@
 {
     "taglib-imports": ["./nested-import/marko.json"]
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/taglib-imports-nested/nested-import/components/list/icon-list/renderer.js b/test/render/fixtures/taglib-imports-nested/nested-import/components/list/icon-list/renderer.js
index 61d97f1f9..adca2ea94 100644
--- a/test/render/fixtures/taglib-imports-nested/nested-import/components/list/icon-list/renderer.js
+++ b/test/render/fixtures/taglib-imports-nested/nested-import/components/list/icon-list/renderer.js
@@ -1,5 +1,5 @@
-var template = require('./template.marko');
+var template = require("./template.marko");
 
-exports.renderer = function (input, out) {
+exports.renderer = function(input, out) {
     template.render(input, out);
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/taglib-imports-nested/nested-import/components/list/marko.json b/test/render/fixtures/taglib-imports-nested/nested-import/components/list/marko.json
index 22f864b56..0004e405b 100644
--- a/test/render/fixtures/taglib-imports-nested/nested-import/components/list/marko.json
+++ b/test/render/fixtures/taglib-imports-nested/nested-import/components/list/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "."
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/taglib-imports-nested/nested-import/components/marko.json b/test/render/fixtures/taglib-imports-nested/nested-import/components/marko.json
index 46ac26c7d..5363c7daa 100644
--- a/test/render/fixtures/taglib-imports-nested/nested-import/components/marko.json
+++ b/test/render/fixtures/taglib-imports-nested/nested-import/components/marko.json
@@ -1,6 +1,3 @@
 {
-  "taglib-imports": [
-    "./list/marko.json",
-    "../marko.json"
-  ]
+    "taglib-imports": ["./list/marko.json", "../marko.json"]
 }
diff --git a/test/render/fixtures/taglib-imports-nested/nested-import/marko.json b/test/render/fixtures/taglib-imports-nested/nested-import/marko.json
index 271c44fce..004ca7b65 100644
--- a/test/render/fixtures/taglib-imports-nested/nested-import/marko.json
+++ b/test/render/fixtures/taglib-imports-nested/nested-import/marko.json
@@ -1,5 +1,3 @@
 {
-  "taglib-imports": [
-    "./components/marko.json"
-  ]
+    "taglib-imports": ["./components/marko.json"]
 }
diff --git a/test/render/fixtures/taglib-imports-nested/test.js b/test/render/fixtures/taglib-imports-nested/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/taglib-imports-nested/test.js
+++ b/test/render/fixtures/taglib-imports-nested/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/taglib-imports-package-json/marko.json b/test/render/fixtures/taglib-imports-package-json/marko.json
index d2c629afd..0085a96fa 100644
--- a/test/render/fixtures/taglib-imports-package-json/marko.json
+++ b/test/render/fixtures/taglib-imports-package-json/marko.json
@@ -1,3 +1,3 @@
 {
     "taglib-imports": ["./package.json"]
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/taglib-imports-package-json/package.json b/test/render/fixtures/taglib-imports-package-json/package.json
index 5742f6160..2c2338538 100644
--- a/test/render/fixtures/taglib-imports-package-json/package.json
+++ b/test/render/fixtures/taglib-imports-package-json/package.json
@@ -3,4 +3,4 @@
         "imported-foo": "^1.0.0",
         "imported-bar": "^1.0.0"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/taglib-imports-package-json/test.js b/test/render/fixtures/taglib-imports-package-json/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/taglib-imports-package-json/test.js
+++ b/test/render/fixtures/taglib-imports-package-json/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/tags-dir-null/marko.json b/test/render/fixtures/tags-dir-null/marko.json
index a0b2f0553..23a5fa196 100644
--- a/test/render/fixtures/tags-dir-null/marko.json
+++ b/test/render/fixtures/tags-dir-null/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": null
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/tags-dir-null/test.js b/test/render/fixtures/tags-dir-null/test.js
index 0330eb11b..eb9c3ed5b 100644
--- a/test/render/fixtures/tags-dir-null/test.js
+++ b/test/render/fixtures/tags-dir-null/test.js
@@ -1,11 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (e) {
+exports.checkError = function(e) {
     //includes the tag it broke on
-    expect(e.message).to.contain('Unrecognized tag: test-hello');
+    expect(e.message).to.contain("Unrecognized tag: test-hello");
 
     //includes the line number of the template
-    expect(e.message).to.contain('template.marko:1:0');
-};
\ No newline at end of file
+    expect(e.message).to.contain("template.marko:1:0");
+};
diff --git a/test/render/fixtures/template-tag-dynamic-attributes/marko.json b/test/render/fixtures/template-tag-dynamic-attributes/marko.json
index e85a78200..7720f87ea 100644
--- a/test/render/fixtures/template-tag-dynamic-attributes/marko.json
+++ b/test/render/fixtures/template-tag-dynamic-attributes/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/template-tag-dynamic-attributes/test.js b/test/render/fixtures/template-tag-dynamic-attributes/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/template-tag-dynamic-attributes/test.js
+++ b/test/render/fixtures/template-tag-dynamic-attributes/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/template-transformer/marko.json b/test/render/fixtures/template-transformer/marko.json
index 31935b486..4a3e32f05 100644
--- a/test/render/fixtures/template-transformer/marko.json
+++ b/test/render/fixtures/template-transformer/marko.json
@@ -1,3 +1,3 @@
 {
     "transformer": "./transformer"
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/template-transformer/transformer.js b/test/render/fixtures/template-transformer/transformer.js
index 935b1cbed..6c3103d44 100644
--- a/test/render/fixtures/template-transformer/transformer.js
+++ b/test/render/fixtures/template-transformer/transformer.js
@@ -1,10 +1,14 @@
-var path = require('path');
+var path = require("path");
 
-module.exports = function (rootNode, context) {
+module.exports = function(rootNode, context) {
     var builder = context.builder;
 
     var templateName = path.basename(context.filename);
 
-    rootNode.prependChild(builder.htmlComment(builder.literal('BEGIN: ' + templateName)));
-    rootNode.appendChild(builder.htmlComment(builder.literal('END: ' + templateName)));
-};
\ No newline at end of file
+    rootNode.prependChild(
+        builder.htmlComment(builder.literal("BEGIN: " + templateName))
+    );
+    rootNode.appendChild(
+        builder.htmlComment(builder.literal("END: " + templateName))
+    );
+};
diff --git a/test/render/fixtures/text-replacement/test.js b/test/render/fixtures/text-replacement/test.js
index c9e089d50..64fe138be 100644
--- a/test/render/fixtures/text-replacement/test.js
+++ b/test/render/fixtures/text-replacement/test.js
@@ -1,12 +1,12 @@
 exports.templateData = {
-    "zero": 0,
-    "person": {
-        "name": "John",
-        "address": {
-            "city": "San Jose",
-            "state": "CA",
-            "line1": "2065 E. Hamilton Ave.",
-            "zip": "95125"
+    zero: 0,
+    person: {
+        name: "John",
+        address: {
+            city: "San Jose",
+            state: "CA",
+            line1: "2065 E. Hamilton Ave.",
+            zip: "95125"
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/toHTML/test.js b/test/render/fixtures/toHTML/test.js
index 37962e7e7..d18ffc997 100644
--- a/test/render/fixtures/toHTML/test.js
+++ b/test/render/fixtures/toHTML/test.js
@@ -1,7 +1,7 @@
 exports.templateData = {
     message: {
-        toHTML: function () {
-            return '<span>Hello World</span>';
+        toHTML: function() {
+            return "<span>Hello World</span>";
         }
     }
-};
\ No newline at end of file
+};
diff --git a/test/render/fixtures/toString-object/test.js b/test/render/fixtures/toString-object/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/toString-object/test.js
+++ b/test/render/fixtures/toString-object/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/transformer-dynamic-tag-name/marko.json b/test/render/fixtures/transformer-dynamic-tag-name/marko.json
index b05e3ca0a..ee9def4c4 100644
--- a/test/render/fixtures/transformer-dynamic-tag-name/marko.json
+++ b/test/render/fixtures/transformer-dynamic-tag-name/marko.json
@@ -3,4 +3,4 @@
         "@foo": "string",
         "transformer": "./transformer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/render/fixtures/transformer-dynamic-tag-name/test.js b/test/render/fixtures/transformer-dynamic-tag-name/test.js
index ee622f902..5e8f873fe 100644
--- a/test/render/fixtures/transformer-dynamic-tag-name/test.js
+++ b/test/render/fixtures/transformer-dynamic-tag-name/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    tagName: 'p'
-};
\ No newline at end of file
+    tagName: "p"
+};
diff --git a/test/render/fixtures/transformer-dynamic-tag-name/transformer.js b/test/render/fixtures/transformer-dynamic-tag-name/transformer.js
index 52ea163d7..234163d32 100644
--- a/test/render/fixtures/transformer-dynamic-tag-name/transformer.js
+++ b/test/render/fixtures/transformer-dynamic-tag-name/transformer.js
@@ -1,4 +1,4 @@
 module.exports = function transform(el, context) {
-    el.removeAttribute('foo');
-    el.setAttributeValue('bar', context.builder.literal('hello'));
-};
\ No newline at end of file
+    el.removeAttribute("foo");
+    el.setAttributeValue("bar", context.builder.literal("hello"));
+};
diff --git a/test/render/fixtures/unless-else/test.js b/test/render/fixtures/unless-else/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/unless-else/test.js
+++ b/test/render/fixtures/unless-else/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/unless-no-arg/test.js b/test/render/fixtures/unless-no-arg/test.js
index 250e8bcd6..a476115f9 100644
--- a/test/render/fixtures/unless-no-arg/test.js
+++ b/test/render/fixtures/unless-no-arg/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <unless> tag. Argument is missing.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "Invalid <unless> tag. Argument is missing."
+    );
+};
diff --git a/test/render/fixtures/var-assign/test.js b/test/render/fixtures/var-assign/test.js
index 35f9fefee..9c854c695 100644
--- a/test/render/fixtures/var-assign/test.js
+++ b/test/render/fixtures/var-assign/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "active": true
-};
\ No newline at end of file
+    active: true
+};
diff --git a/test/render/fixtures/var-new-Date/test.js b/test/render/fixtures/var-new-Date/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/var-new-Date/test.js
+++ b/test/render/fixtures/var-new-Date/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/var-tag-commas/test.js b/test/render/fixtures/var-tag-commas/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/var-tag-commas/test.js
+++ b/test/render/fixtures/var-tag-commas/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/var/test.js b/test/render/fixtures/var/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/var/test.js
+++ b/test/render/fixtures/var/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/variable-id-root-node/test.js b/test/render/fixtures/variable-id-root-node/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/variable-id-root-node/test.js
+++ b/test/render/fixtures/variable-id-root-node/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/while-attr/test.js b/test/render/fixtures/while-attr/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/while-attr/test.js
+++ b/test/render/fixtures/while-attr/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/while-tag-no-arg/test.js b/test/render/fixtures/while-tag-no-arg/test.js
index 55c5602a2..b90a38dc2 100644
--- a/test/render/fixtures/while-tag-no-arg/test.js
+++ b/test/render/fixtures/while-tag-no-arg/test.js
@@ -1,7 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 exports.templateData = {};
 
-exports.checkError = function (err) {
-    expect(err.toString()).to.contain('Invalid <while> tag. Argument is missing.');
-};
\ No newline at end of file
+exports.checkError = function(err) {
+    expect(err.toString()).to.contain(
+        "Invalid <while> tag. Argument is missing."
+    );
+};
diff --git a/test/render/fixtures/while-tag/test.js b/test/render/fixtures/while-tag/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/while-tag/test.js
+++ b/test/render/fixtures/while-tag/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-contentplaceholder-literal-string/test.js b/test/render/fixtures/whitespace-contentplaceholder-literal-string/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-contentplaceholder-literal-string/test.js
+++ b/test/render/fixtures/whitespace-contentplaceholder-literal-string/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-div/test.js b/test/render/fixtures/whitespace-div/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-div/test.js
+++ b/test/render/fixtures/whitespace-div/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-inline-elements/test.js b/test/render/fixtures/whitespace-inline-elements/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-inline-elements/test.js
+++ b/test/render/fixtures/whitespace-inline-elements/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-marko-preserve-whitespace-attr/test.js b/test/render/fixtures/whitespace-marko-preserve-whitespace-attr/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/whitespace-marko-preserve-whitespace-attr/test.js
+++ b/test/render/fixtures/whitespace-marko-preserve-whitespace-attr/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/whitespace-normalize-inner-whitespace-concise/test.js b/test/render/fixtures/whitespace-normalize-inner-whitespace-concise/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-normalize-inner-whitespace-concise/test.js
+++ b/test/render/fixtures/whitespace-normalize-inner-whitespace-concise/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-normalize-inner-whitespace/test.js b/test/render/fixtures/whitespace-normalize-inner-whitespace/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-normalize-inner-whitespace/test.js
+++ b/test/render/fixtures/whitespace-normalize-inner-whitespace/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-normalize-inner-whitespace2/test.js b/test/render/fixtures/whitespace-normalize-inner-whitespace2/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace-normalize-inner-whitespace2/test.js
+++ b/test/render/fixtures/whitespace-normalize-inner-whitespace2/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/whitespace-pre-code/test.js b/test/render/fixtures/whitespace-pre-code/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/whitespace-pre-code/test.js
+++ b/test/render/fixtures/whitespace-pre-code/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/whitespace-pre/test.js b/test/render/fixtures/whitespace-pre/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/whitespace-pre/test.js
+++ b/test/render/fixtures/whitespace-pre/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/whitespace-script/test.js b/test/render/fixtures/whitespace-script/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/whitespace-script/test.js
+++ b/test/render/fixtures/whitespace-script/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/whitespace-textarea/test.js b/test/render/fixtures/whitespace-textarea/test.js
index 6eabbc215..522c6101c 100644
--- a/test/render/fixtures/whitespace-textarea/test.js
+++ b/test/render/fixtures/whitespace-textarea/test.js
@@ -1,3 +1,3 @@
 exports.templateData = {
-    "name": "World"
-};
\ No newline at end of file
+    name: "World"
+};
diff --git a/test/render/fixtures/whitespace/test.js b/test/render/fixtures/whitespace/test.js
index 5ca2ed02c..c4013b344 100644
--- a/test/render/fixtures/whitespace/test.js
+++ b/test/render/fixtures/whitespace/test.js
@@ -1 +1 @@
-exports.templateData = {};
\ No newline at end of file
+exports.templateData = {};
diff --git a/test/render/fixtures/xml-escaping/test.js b/test/render/fixtures/xml-escaping/test.js
index a6bb4cb51..4b819cd62 100644
--- a/test/render/fixtures/xml-escaping/test.js
+++ b/test/render/fixtures/xml-escaping/test.js
@@ -1,4 +1,4 @@
 exports.templateData = {
-    "name": "<Patrick>",
-    "welcome": "<span>Welcome</span>"
-};
\ No newline at end of file
+    name: "<Patrick>",
+    welcome: "<span>Welcome</span>"
+};
diff --git a/test/render/html.test.js b/test/render/html.test.js
index 62ba3af50..5c9637f04 100644
--- a/test/render/html.test.js
+++ b/test/render/html.test.js
@@ -1,24 +1,23 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var autotest = require('../autotest');
-var runRenderTest = require('../__util__/runRenderTest');
-
-describe('render-html', function () {
-    autotest.scanDir(path.join(__dirname, './fixtures'), run);
+var path = require("path");
+var autotest = require("../autotest");
+var runRenderTest = require("../__util__/runRenderTest");
 
+describe("render-html", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures"), run);
 });
 
-describe('render-html (deprecated)', function () {
-    autotest.scanDir(path.join(__dirname, './fixtures-deprecated'), run);
-})
+describe("render-html (deprecated)", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures-deprecated"), run);
+});
 
 function run(dir, helpers, done) {
     runRenderTest(dir, helpers, done, {
-        output: 'html'
+        output: "html"
     });
 }
diff --git a/test/render/vdom.test.js b/test/render/vdom.test.js
index 62ba4d174..ef019bbf7 100644
--- a/test/render/vdom.test.js
+++ b/test/render/vdom.test.js
@@ -1,24 +1,23 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var autotest = require('../autotest');
-var runRenderTest = require('../__util__/runRenderTest');
-
-describe('render-vdom', function () {
-    autotest.scanDir(path.join(__dirname, './fixtures'), run);
+var path = require("path");
+var autotest = require("../autotest");
+var runRenderTest = require("../__util__/runRenderTest");
 
+describe("render-vdom", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures"), run);
 });
 
-describe('render-vdom (deprecated)', function () {
-    autotest.scanDir(path.join(__dirname, './fixtures-deprecated'), run);
+describe("render-vdom (deprecated)", function() {
+    autotest.scanDir(path.join(__dirname, "./fixtures-deprecated"), run);
 });
 
 function run(dir, helpers, done) {
     runRenderTest(dir, helpers, done, {
-        output: 'vdom'
+        output: "vdom"
     });
 }
diff --git a/test/taglib-finder/fixtures/deeply-nested-gaps/a/b/c/marko.json b/test/taglib-finder/fixtures/deeply-nested-gaps/a/b/c/marko.json
index 544b7b4dd..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested-gaps/a/b/c/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested-gaps/a/b/c/marko.json
@@ -1,3 +1 @@
-{
-    
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested-gaps/a/marko.json b/test/taglib-finder/fixtures/deeply-nested-gaps/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested-gaps/a/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested-gaps/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested-gaps/package.json b/test/taglib-finder/fixtures/deeply-nested-gaps/package.json
index 78708c533..6a1e6b11c 100644
--- a/test/taglib-finder/fixtures/deeply-nested-gaps/package.json
+++ b/test/taglib-finder/fixtures/deeply-nested-gaps/package.json
@@ -1,4 +1,4 @@
 {
     "name": "taglib-finder-test",
     "version": "0.0.0"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-finder/fixtures/deeply-nested-gaps/test.js b/test/taglib-finder/fixtures/deeply-nested-gaps/test.js
index 5f8b06142..a73da99ab 100644
--- a/test/taglib-finder/fixtures/deeply-nested-gaps/test.js
+++ b/test/taglib-finder/fixtures/deeply-nested-gaps/test.js
@@ -1 +1 @@
-exports.dir = 'a/b/c';
\ No newline at end of file
+exports.dir = "a/b/c";
diff --git a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/c/marko.json b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/c/marko.json
index 544b7b4dd..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/c/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/c/marko.json
@@ -1,3 +1 @@
-{
-    
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/marko.json b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/b/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/marko.json b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested-plus-installed/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested-plus-installed/package.json b/test/taglib-finder/fixtures/deeply-nested-plus-installed/package.json
index 91d554dbe..89464154c 100644
--- a/test/taglib-finder/fixtures/deeply-nested-plus-installed/package.json
+++ b/test/taglib-finder/fixtures/deeply-nested-plus-installed/package.json
@@ -13,5 +13,4 @@
         "peer-dependency-with-taglib": "0.0.1",
         "peer-dependency-without-taglib": "0.0.1"
     }
-
-}
\ No newline at end of file
+}
diff --git a/test/taglib-finder/fixtures/deeply-nested-plus-installed/test.js b/test/taglib-finder/fixtures/deeply-nested-plus-installed/test.js
index 5f8b06142..a73da99ab 100644
--- a/test/taglib-finder/fixtures/deeply-nested-plus-installed/test.js
+++ b/test/taglib-finder/fixtures/deeply-nested-plus-installed/test.js
@@ -1 +1 @@
-exports.dir = 'a/b/c';
\ No newline at end of file
+exports.dir = "a/b/c";
diff --git a/test/taglib-finder/fixtures/deeply-nested/a/b/c/marko.json b/test/taglib-finder/fixtures/deeply-nested/a/b/c/marko.json
index 544b7b4dd..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested/a/b/c/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested/a/b/c/marko.json
@@ -1,3 +1 @@
-{
-    
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested/a/b/marko.json b/test/taglib-finder/fixtures/deeply-nested/a/b/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested/a/b/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested/a/b/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested/a/marko.json b/test/taglib-finder/fixtures/deeply-nested/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/deeply-nested/a/marko.json
+++ b/test/taglib-finder/fixtures/deeply-nested/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/deeply-nested/package.json b/test/taglib-finder/fixtures/deeply-nested/package.json
index 78708c533..6a1e6b11c 100644
--- a/test/taglib-finder/fixtures/deeply-nested/package.json
+++ b/test/taglib-finder/fixtures/deeply-nested/package.json
@@ -1,4 +1,4 @@
 {
     "name": "taglib-finder-test",
     "version": "0.0.0"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-finder/fixtures/deeply-nested/test.js b/test/taglib-finder/fixtures/deeply-nested/test.js
index 5f8b06142..a73da99ab 100644
--- a/test/taglib-finder/fixtures/deeply-nested/test.js
+++ b/test/taglib-finder/fixtures/deeply-nested/test.js
@@ -1 +1 @@
-exports.dir = 'a/b/c';
\ No newline at end of file
+exports.dir = "a/b/c";
diff --git a/test/taglib-finder/fixtures/excluded-dir-autodiscover/a/b/marko.json b/test/taglib-finder/fixtures/excluded-dir-autodiscover/a/b/marko.json
index 2e70b49ed..60fd6ab09 100644
--- a/test/taglib-finder/fixtures/excluded-dir-autodiscover/a/b/marko.json
+++ b/test/taglib-finder/fixtures/excluded-dir-autodiscover/a/b/marko.json
@@ -1,3 +1,3 @@
 {
-    "tags-dir":"./components"
-}
\ No newline at end of file
+    "tags-dir": "./components"
+}
diff --git a/test/taglib-finder/fixtures/excluded-dir-autodiscover/package.json b/test/taglib-finder/fixtures/excluded-dir-autodiscover/package.json
index 78708c533..6a1e6b11c 100644
--- a/test/taglib-finder/fixtures/excluded-dir-autodiscover/package.json
+++ b/test/taglib-finder/fixtures/excluded-dir-autodiscover/package.json
@@ -1,4 +1,4 @@
 {
     "name": "taglib-finder-test",
     "version": "0.0.0"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-finder/fixtures/excluded-dir-autodiscover/test.js b/test/taglib-finder/fixtures/excluded-dir-autodiscover/test.js
index 4edf86df1..0cddf13bd 100644
--- a/test/taglib-finder/fixtures/excluded-dir-autodiscover/test.js
+++ b/test/taglib-finder/fixtures/excluded-dir-autodiscover/test.js
@@ -1,12 +1,12 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.dir = 'a/b';
+exports.dir = "a/b";
 
-exports.before = function (taglibFinder) {
-    taglibFinder.excludeDir(nodePath.join(__dirname, 'a/b'));
-    taglibFinder.excludeDir(nodePath.join(__dirname, 'a/components'));
+exports.before = function(taglibFinder) {
+    taglibFinder.excludeDir(nodePath.join(__dirname, "a/b"));
+    taglibFinder.excludeDir(nodePath.join(__dirname, "a/components"));
 };
 
-exports.after = function (taglibFinder) {
+exports.after = function(taglibFinder) {
     taglibFinder.reset();
-};
\ No newline at end of file
+};
diff --git a/test/taglib-finder/fixtures/excluded-dir/a/b-excluded/marko.json b/test/taglib-finder/fixtures/excluded-dir/a/b-excluded/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/excluded-dir/a/b-excluded/marko.json
+++ b/test/taglib-finder/fixtures/excluded-dir/a/b-excluded/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/excluded-dir/a/marko.json b/test/taglib-finder/fixtures/excluded-dir/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/excluded-dir/a/marko.json
+++ b/test/taglib-finder/fixtures/excluded-dir/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/excluded-dir/package.json b/test/taglib-finder/fixtures/excluded-dir/package.json
index 78708c533..6a1e6b11c 100644
--- a/test/taglib-finder/fixtures/excluded-dir/package.json
+++ b/test/taglib-finder/fixtures/excluded-dir/package.json
@@ -1,4 +1,4 @@
 {
     "name": "taglib-finder-test",
     "version": "0.0.0"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-finder/fixtures/excluded-dir/test.js b/test/taglib-finder/fixtures/excluded-dir/test.js
index 5cbebdfd3..26689608b 100644
--- a/test/taglib-finder/fixtures/excluded-dir/test.js
+++ b/test/taglib-finder/fixtures/excluded-dir/test.js
@@ -1,11 +1,11 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.dir = 'a/b-excluded';
+exports.dir = "a/b-excluded";
 
-exports.before = function (taglibFinder) {
-    taglibFinder.excludeDir(nodePath.join(__dirname, 'a/b-excluded'));
+exports.before = function(taglibFinder) {
+    taglibFinder.excludeDir(nodePath.join(__dirname, "a/b-excluded"));
 };
 
-exports.after = function (taglibFinder) {
+exports.after = function(taglibFinder) {
     taglibFinder.reset();
-};
\ No newline at end of file
+};
diff --git a/test/taglib-finder/fixtures/excluded-package/a/b/c/marko.json b/test/taglib-finder/fixtures/excluded-package/a/b/c/marko.json
index 544b7b4dd..0967ef424 100644
--- a/test/taglib-finder/fixtures/excluded-package/a/b/c/marko.json
+++ b/test/taglib-finder/fixtures/excluded-package/a/b/c/marko.json
@@ -1,3 +1 @@
-{
-    
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/excluded-package/a/b/marko.json b/test/taglib-finder/fixtures/excluded-package/a/b/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/excluded-package/a/b/marko.json
+++ b/test/taglib-finder/fixtures/excluded-package/a/b/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/excluded-package/a/marko.json b/test/taglib-finder/fixtures/excluded-package/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/excluded-package/a/marko.json
+++ b/test/taglib-finder/fixtures/excluded-package/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/excluded-package/test.js b/test/taglib-finder/fixtures/excluded-package/test.js
index eeac589f0..ca8847d72 100644
--- a/test/taglib-finder/fixtures/excluded-package/test.js
+++ b/test/taglib-finder/fixtures/excluded-package/test.js
@@ -1,9 +1,9 @@
-exports.dir = 'a/b/c';
+exports.dir = "a/b/c";
 
-exports.before = function (taglibFinder) {
-    taglibFinder.excludePackage('excluded-dependency');
+exports.before = function(taglibFinder) {
+    taglibFinder.excludePackage("excluded-dependency");
 };
 
-exports.after = function (taglibFinder) {
+exports.after = function(taglibFinder) {
     taglibFinder.reset();
-};
\ No newline at end of file
+};
diff --git a/test/taglib-finder/fixtures/reset/a/b/c/marko.json b/test/taglib-finder/fixtures/reset/a/b/c/marko.json
index 544b7b4dd..0967ef424 100644
--- a/test/taglib-finder/fixtures/reset/a/b/c/marko.json
+++ b/test/taglib-finder/fixtures/reset/a/b/c/marko.json
@@ -1,3 +1 @@
-{
-    
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/reset/a/b/marko.json b/test/taglib-finder/fixtures/reset/a/b/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/reset/a/b/marko.json
+++ b/test/taglib-finder/fixtures/reset/a/b/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/reset/a/marko.json b/test/taglib-finder/fixtures/reset/a/marko.json
index 0e0dcd235..0967ef424 100644
--- a/test/taglib-finder/fixtures/reset/a/marko.json
+++ b/test/taglib-finder/fixtures/reset/a/marko.json
@@ -1,3 +1 @@
-{
-
-}
\ No newline at end of file
+{}
diff --git a/test/taglib-finder/fixtures/reset/test.js b/test/taglib-finder/fixtures/reset/test.js
index c4df85cd2..5b39de1c9 100644
--- a/test/taglib-finder/fixtures/reset/test.js
+++ b/test/taglib-finder/fixtures/reset/test.js
@@ -1,8 +1,8 @@
-var nodePath = require('path');
-var expect = require('chai').expect;
+var nodePath = require("path");
+var expect = require("chai").expect;
 
-exports.check = function (taglibFinder) {
-    var finderDir = nodePath.join(__dirname, 'a/b/c');
+exports.check = function(taglibFinder) {
+    var finderDir = nodePath.join(__dirname, "a/b/c");
 
     function getPaths() {
         return taglibFinder.find(finderDir, []).map(taglib => {
@@ -12,7 +12,7 @@ exports.check = function (taglibFinder) {
 
     var pathsBeforeExclude = getPaths();
 
-    taglibFinder.excludePackage('excluded-dependency');
+    taglibFinder.excludePackage("excluded-dependency");
 
     taglibFinder.clearCache();
 
@@ -24,4 +24,4 @@ exports.check = function (taglibFinder) {
 
     expect(pathsBeforeExclude).to.not.deep.equal(pathsAfterExclude);
     expect(pathsBeforeExclude).to.deep.equal(pathsAfterReset);
-};
\ No newline at end of file
+};
diff --git a/test/taglib-finder/index.test.js b/test/taglib-finder/index.test.js
index a77777b89..18e51b467 100644
--- a/test/taglib-finder/index.test.js
+++ b/test/taglib-finder/index.test.js
@@ -1,22 +1,22 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-require('chai').should();
+require("chai").should();
 
-var nodePath = require('path');
-require('marko/compiler');
-var autotest = require('../autotest');
+var nodePath = require("path");
+require("marko/compiler");
+var autotest = require("../autotest");
 
-var taglibFinder = require('marko/compiler/taglib-finder');
+var taglibFinder = require("marko/compiler/taglib-finder");
 
-describe('taglib-finder', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("taglib-finder", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
+        var test = require(nodePath.join(dir, "test.js"));
 
         if (test.check) {
             test.check(taglibFinder, helpers);
@@ -28,13 +28,15 @@ describe('taglib-finder', function () {
             var finderDir = nodePath.join(dir, test.dir);
             var found = taglibFinder.find(finderDir, []).map(taglib => {
                 if (taglib.path.startsWith(dir)) {
-                    return taglib.path.substring(dir.length).replace(/[\\]/g, '/');
+                    return taglib.path
+                        .substring(dir.length)
+                        .replace(/[\\]/g, "/");
                 } else {
-                    return 'BAD:' + taglib.path;
+                    return "BAD:" + taglib.path;
                 }
             });
 
-            helpers.compare(found, '.json');
+            helpers.compare(found, ".json");
 
             if (test.after) {
                 test.after(taglibFinder);
@@ -43,4 +45,4 @@ describe('taglib-finder', function () {
 
         return done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/taglib-loader/fixtures/custom-extensions/marko.json b/test/taglib-loader/fixtures/custom-extensions/marko.json
index e85a78200..7720f87ea 100644
--- a/test/taglib-loader/fixtures/custom-extensions/marko.json
+++ b/test/taglib-loader/fixtures/custom-extensions/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/custom-extensions/tags/test-declared-attributes/renderer.js b/test/taglib-loader/fixtures/custom-extensions/tags/test-declared-attributes/renderer.js
index fb402864c..e78fe8540 100644
--- a/test/taglib-loader/fixtures/custom-extensions/tags/test-declared-attributes/renderer.js
+++ b/test/taglib-loader/fixtures/custom-extensions/tags/test-declared-attributes/renderer.js
@@ -1,4 +1,4 @@
 module.exports = function simple(input, out) {
     var daysOld = input.age * 365;
-    out.write('Hello ' + input.name + '! You are ' + daysOld + ' days old.');
-};
\ No newline at end of file
+    out.write("Hello " + input.name + "! You are " + daysOld + " days old.");
+};
diff --git a/test/taglib-loader/fixtures/custom-extensions/test.js b/test/taglib-loader/fixtures/custom-extensions/test.js
index a7a248efb..97f0c9f53 100644
--- a/test/taglib-loader/fixtures/custom-extensions/test.js
+++ b/test/taglib-loader/fixtures/custom-extensions/test.js
@@ -1,8 +1,12 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    var taglib = taglibLoader.loadTaglibFromFile(nodePath.join(__dirname, 'marko.json'));
+exports.check = function(taglibLoader, expect) {
+    var taglib = taglibLoader.loadTaglibFromFile(
+        nodePath.join(__dirname, "marko.json")
+    );
 
     expect(taglib != null).to.equal(true);
-    expect(taglib).to.have.deep.property("tags.test-declared-attributes.renderer").to.have.string('renderer.js');
-};
\ No newline at end of file
+    expect(taglib)
+        .to.have.deep.property("tags.test-declared-attributes.renderer")
+        .to.have.string("renderer.js");
+};
diff --git a/test/taglib-loader/fixtures/invalid-marko-tag-file/marko.json b/test/taglib-loader/fixtures/invalid-marko-tag-file/marko.json
index 78dfe1821..5e5174b31 100644
--- a/test/taglib-loader/fixtures/invalid-marko-tag-file/marko.json
+++ b/test/taglib-loader/fixtures/invalid-marko-tag-file/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./missing"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/invalid-marko-tag-file/test.js b/test/taglib-loader/fixtures/invalid-marko-tag-file/test.js
index a399270e6..a8ba4ffd2 100644
--- a/test/taglib-loader/fixtures/invalid-marko-tag-file/test.js
+++ b/test/taglib-loader/fixtures/invalid-marko-tag-file/test.js
@@ -1,7 +1,7 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    expect(function () {
-        taglibLoader.loadTaglibFromFile(nodePath.join(__dirname, 'marko.json'));
+exports.check = function(taglibLoader, expect) {
+    expect(function() {
+        taglibLoader.loadTaglibFromFile(nodePath.join(__dirname, "marko.json"));
     }).to.throw('Error while applying option of "tags-dir"');
-};
\ No newline at end of file
+};
diff --git a/test/taglib-loader/fixtures/invalid-taglib-tag/marko.json b/test/taglib-loader/fixtures/invalid-taglib-tag/marko.json
index 11a76c5e2..3024e8a6b 100644
--- a/test/taglib-loader/fixtures/invalid-taglib-tag/marko.json
+++ b/test/taglib-loader/fixtures/invalid-taglib-tag/marko.json
@@ -2,4 +2,4 @@
     "<test-hello>": {
         "INVALID": "PROPERTY"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/invalid-taglib-tag/test.js b/test/taglib-loader/fixtures/invalid-taglib-tag/test.js
index 403504a61..4e82448ab 100644
--- a/test/taglib-loader/fixtures/invalid-taglib-tag/test.js
+++ b/test/taglib-loader/fixtures/invalid-taglib-tag/test.js
@@ -1,9 +1,9 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    var taglibPath = nodePath.join(__dirname, 'marko.json');
+exports.check = function(taglibLoader, expect) {
+    var taglibPath = nodePath.join(__dirname, "marko.json");
 
-    expect(function () {
+    expect(function() {
         taglibLoader.loadTaglibFromFile(taglibPath);
     }).to.throw(`Invalid option: INVALID ([${taglibPath} → <test-hello>])`);
-};
\ No newline at end of file
+};
diff --git a/test/taglib-loader/fixtures/invalid-tags-dir/marko.json b/test/taglib-loader/fixtures/invalid-tags-dir/marko.json
index 80988a1b9..d0a47a334 100644
--- a/test/taglib-loader/fixtures/invalid-tags-dir/marko.json
+++ b/test/taglib-loader/fixtures/invalid-tags-dir/marko.json
@@ -1,3 +1,3 @@
 {
     "<foo>": "./tags/foo/marko-tag.json"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/invalid-tags-dir/tags/foo/marko-tag.json b/test/taglib-loader/fixtures/invalid-tags-dir/tags/foo/marko-tag.json
index 04554cf88..f81115c5a 100644
--- a/test/taglib-loader/fixtures/invalid-tags-dir/tags/foo/marko-tag.json
+++ b/test/taglib-loader/fixtures/invalid-tags-dir/tags/foo/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "INVALID": "BAD"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/invalid-tags-dir/test.js b/test/taglib-loader/fixtures/invalid-tags-dir/test.js
index 7f0261d11..b8f4dee13 100644
--- a/test/taglib-loader/fixtures/invalid-tags-dir/test.js
+++ b/test/taglib-loader/fixtures/invalid-tags-dir/test.js
@@ -1,10 +1,12 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    var taglibPath = nodePath.join(__dirname, 'marko.json');
-    var tagPath = nodePath.join(__dirname, 'tags/foo/marko-tag.json');
+exports.check = function(taglibLoader, expect) {
+    var taglibPath = nodePath.join(__dirname, "marko.json");
+    var tagPath = nodePath.join(__dirname, "tags/foo/marko-tag.json");
 
-    expect(function () {
+    expect(function() {
         taglibLoader.loadTaglibFromFile(taglibPath);
-    }).to.throw(`Invalid option: INVALID ([${taglibPath} → <foo> → ${tagPath}]`);
-};
\ No newline at end of file
+    }).to.throw(
+        `Invalid option: INVALID ([${taglibPath} → <foo> → ${tagPath}]`
+    );
+};
diff --git a/test/taglib-loader/fixtures/paths/marko.json b/test/taglib-loader/fixtures/paths/marko.json
index ee82ed6a2..24555e96d 100644
--- a/test/taglib-loader/fixtures/paths/marko.json
+++ b/test/taglib-loader/fixtures/paths/marko.json
@@ -4,4 +4,4 @@
         "@name": "string",
         "@age": "integer"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/marko-tag.json b/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/marko-tag.json
index 2e84817de..60f3d275b 100644
--- a/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/marko-tag.json
+++ b/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/marko-tag.json
@@ -1,4 +1,4 @@
 {
     "@name": "string",
     "@age": "integer"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/renderer.js b/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/renderer.js
index fb402864c..e78fe8540 100644
--- a/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/renderer.js
+++ b/test/taglib-loader/fixtures/paths/tags/test-hello-scanned/renderer.js
@@ -1,4 +1,4 @@
 module.exports = function simple(input, out) {
     var daysOld = input.age * 365;
-    out.write('Hello ' + input.name + '! You are ' + daysOld + ' days old.');
-};
\ No newline at end of file
+    out.write("Hello " + input.name + "! You are " + daysOld + " days old.");
+};
diff --git a/test/taglib-loader/fixtures/paths/test.js b/test/taglib-loader/fixtures/paths/test.js
index 50fa3f173..0c82e5e42 100644
--- a/test/taglib-loader/fixtures/paths/test.js
+++ b/test/taglib-loader/fixtures/paths/test.js
@@ -1,19 +1,29 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    var taglib = taglibLoader.loadTaglibFromFile(nodePath.join(__dirname, 'marko.json'));
+exports.check = function(taglibLoader, expect) {
+    var taglib = taglibLoader.loadTaglibFromFile(
+        nodePath.join(__dirname, "marko.json")
+    );
 
     expect(taglib != null).to.equal(true);
 
-    expect(taglib.filePath).to.equal(nodePath.join(__dirname, 'marko.json'));
+    expect(taglib.filePath).to.equal(nodePath.join(__dirname, "marko.json"));
 
-    var helloTagScanned = taglib.tags['test-hello-scanned'];
-    expect(helloTagScanned.filePath).to.equal(nodePath.join(__dirname, 'tags/test-hello-scanned/marko-tag.json'));
-    expect(helloTagScanned.dir).to.equal(nodePath.join(__dirname, 'tags/test-hello-scanned'));
-    expect(helloTagScanned.attributes.name.filePath).to.equal(nodePath.join(__dirname, 'tags/test-hello-scanned/marko-tag.json'));
+    var helloTagScanned = taglib.tags["test-hello-scanned"];
+    expect(helloTagScanned.filePath).to.equal(
+        nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json")
+    );
+    expect(helloTagScanned.dir).to.equal(
+        nodePath.join(__dirname, "tags/test-hello-scanned")
+    );
+    expect(helloTagScanned.attributes.name.filePath).to.equal(
+        nodePath.join(__dirname, "tags/test-hello-scanned/marko-tag.json")
+    );
 
-    var helloTag = taglib.tags['test-hello'];
-    expect(helloTag.filePath).to.equal(nodePath.join(__dirname, 'marko.json'));
+    var helloTag = taglib.tags["test-hello"];
+    expect(helloTag.filePath).to.equal(nodePath.join(__dirname, "marko.json"));
     expect(helloTag.dir).to.equal(__dirname);
-    expect(helloTag.attributes.name.filePath).to.equal(nodePath.join(__dirname, 'marko.json'));
-};
\ No newline at end of file
+    expect(helloTag.attributes.name.filePath).to.equal(
+        nodePath.join(__dirname, "marko.json")
+    );
+};
diff --git a/test/taglib-loader/fixtures/shorthand-attrs-and-tags/marko.json b/test/taglib-loader/fixtures/shorthand-attrs-and-tags/marko.json
index d32dbbc14..099d70d65 100644
--- a/test/taglib-loader/fixtures/shorthand-attrs-and-tags/marko.json
+++ b/test/taglib-loader/fixtures/shorthand-attrs-and-tags/marko.json
@@ -24,4 +24,4 @@
             "@orientation": "string"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js b/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js
index ef7a43ea2..146a34154 100644
--- a/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js
+++ b/test/taglib-loader/fixtures/shorthand-attrs-and-tags/test.js
@@ -1,22 +1,26 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (taglibLoader, expect) {
-    var taglib = taglibLoader.loadTaglibFromFile(nodePath.join(__dirname, 'marko.json'));
+exports.check = function(taglibLoader, expect) {
+    var taglib = taglibLoader.loadTaglibFromFile(
+        nodePath.join(__dirname, "marko.json")
+    );
     expect(taglib != null).to.equal(true);
 
-    var shorthandCheckbox = taglib.tags['shorthand-checkbox'];
-    expect(shorthandCheckbox.attributes.checked.type).to.equal('boolean');
-    expect(shorthandCheckbox.attributes.label.type).to.equal('object');
-    expect(shorthandCheckbox.nestedTags.label.type).to.equal('object');
-    expect(shorthandCheckbox.nestedTags.foo.attributes.bar.type).to.equal('string');
+    var shorthandCheckbox = taglib.tags["shorthand-checkbox"];
+    expect(shorthandCheckbox.attributes.checked.type).to.equal("boolean");
+    expect(shorthandCheckbox.attributes.label.type).to.equal("object");
+    expect(shorthandCheckbox.nestedTags.label.type).to.equal("object");
+    expect(shorthandCheckbox.nestedTags.foo.attributes.bar.type).to.equal(
+        "string"
+    );
 
-    var shorthandTabsTag = taglib.tags['shorthand-tabs'];
+    var shorthandTabsTag = taglib.tags["shorthand-tabs"];
     expect(shorthandTabsTag.attributes.orientation != null).to.equal(true);
-    expect(shorthandTabsTag.attributes.orientation.type).to.equal('string');
-    expect(shorthandTabsTag.attributes.tabs.type).to.equal('expression');
+    expect(shorthandTabsTag.attributes.orientation.type).to.equal("string");
+    expect(shorthandTabsTag.attributes.tabs.type).to.equal("expression");
 
     var nestedTabTag = shorthandTabsTag.nestedTags.tab;
     expect(nestedTabTag.attributes.label != null).to.equal(true);
     expect(nestedTabTag.isRepeated).to.equal(true);
-    expect(nestedTabTag.targetProperty).to.equal('tabs');
-};
\ No newline at end of file
+    expect(nestedTabTag.targetProperty).to.equal("tabs");
+};
diff --git a/test/taglib-loader/index.test.js b/test/taglib-loader/index.test.js
index c57968f9d..9d2017a5e 100644
--- a/test/taglib-loader/index.test.js
+++ b/test/taglib-loader/index.test.js
@@ -1,22 +1,22 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
-require('../../compiler');
-var autotest = require('../autotest');
-var taglibLoader = require('../../compiler').taglibLoader;
+var expect = require("chai").expect;
+var nodePath = require("path");
+require("../../compiler");
+var autotest = require("../autotest");
+var taglibLoader = require("../../compiler").taglibLoader;
 
-describe('taglib-loader', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("taglib-loader", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
+        var test = require(nodePath.join(dir, "test.js"));
         test.check(taglibLoader, expect);
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/taglib-lookup/fixtures/attribute-groups/marko.json b/test/taglib-lookup/fixtures/attribute-groups/marko.json
index af0fc6938..2ca7cf2f8 100644
--- a/test/taglib-lookup/fixtures/attribute-groups/marko.json
+++ b/test/taglib-lookup/fixtures/attribute-groups/marko.json
@@ -1,15 +1,11 @@
 {
     "<foo>": {
         "@cat": "boolean",
-        "attribute-groups": [
-            "my-attribute-group"
-        ]
+        "attribute-groups": ["my-attribute-group"]
     },
     "<bar>": {
         "@dog": "boolean",
-        "attribute-groups": [
-            "my-attribute-group"
-        ]
+        "attribute-groups": ["my-attribute-group"]
     },
 
     "attribute-groups": {
@@ -17,4 +13,4 @@
             "age": "integer"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/attribute-groups/test.js b/test/taglib-lookup/fixtures/attribute-groups/test.js
index 8b3572932..fdea903f1 100644
--- a/test/taglib-lookup/fixtures/attribute-groups/test.js
+++ b/test/taglib-lookup/fixtures/attribute-groups/test.js
@@ -1,9 +1,9 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    expect(lookup.getAttribute('foo', 'cat').type).to.equal('boolean');
-    expect(lookup.getAttribute('foo', 'age').type).to.equal('integer');
-    expect(lookup.getAttribute('bar', 'dog').type).to.equal('boolean');
-    expect(lookup.getAttribute('bar', 'age').type).to.equal('integer');
-};
\ No newline at end of file
+    expect(lookup.getAttribute("foo", "cat").type).to.equal("boolean");
+    expect(lookup.getAttribute("foo", "age").type).to.equal("integer");
+    expect(lookup.getAttribute("bar", "dog").type).to.equal("boolean");
+    expect(lookup.getAttribute("bar", "age").type).to.equal("integer");
+};
diff --git a/test/taglib-lookup/fixtures/attribute-ref/marko.json b/test/taglib-lookup/fixtures/attribute-ref/marko.json
index 92f832ae6..90569af82 100644
--- a/test/taglib-lookup/fixtures/attribute-ref/marko.json
+++ b/test/taglib-lookup/fixtures/attribute-ref/marko.json
@@ -8,4 +8,4 @@
     "@shared-hello": {
         "type": "shared"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/attribute-ref/test.js b/test/taglib-lookup/fixtures/attribute-ref/test.js
index dc0b85071..05daeaf73 100644
--- a/test/taglib-lookup/fixtures/attribute-ref/test.js
+++ b/test/taglib-lookup/fixtures/attribute-ref/test.js
@@ -1,10 +1,10 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    var sharedAttrDef = lookup.getAttribute('foo', 'hello');
-    expect(sharedAttrDef.type).equal('shared');
+    var sharedAttrDef = lookup.getAttribute("foo", "hello");
+    expect(sharedAttrDef.type).equal("shared");
 
-    sharedAttrDef = lookup.getAttribute('bar', 'hello');
-    expect(sharedAttrDef.type).equal('shared');
-};
\ No newline at end of file
+    sharedAttrDef = lookup.getAttribute("bar", "hello");
+    expect(sharedAttrDef.type).equal("shared");
+};
diff --git a/test/taglib-lookup/fixtures/cache-lookup/baz/marko.json b/test/taglib-lookup/fixtures/cache-lookup/baz/marko.json
index 8f6c0129d..49bc96969 100644
--- a/test/taglib-lookup/fixtures/cache-lookup/baz/marko.json
+++ b/test/taglib-lookup/fixtures/cache-lookup/baz/marko.json
@@ -2,4 +2,4 @@
     "<baz>": {
         "renderer": "./baz-tag.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/cache-lookup/foo/marko.json b/test/taglib-lookup/fixtures/cache-lookup/foo/marko.json
index 4b268a5d7..1966ebd01 100644
--- a/test/taglib-lookup/fixtures/cache-lookup/foo/marko.json
+++ b/test/taglib-lookup/fixtures/cache-lookup/foo/marko.json
@@ -2,4 +2,4 @@
     "<foo>": {
         "renderer": "./foo-tag.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/cache-lookup/test.js b/test/taglib-lookup/fixtures/cache-lookup/test.js
index 41b143dd7..0d3a75d57 100644
--- a/test/taglib-lookup/fixtures/cache-lookup/test.js
+++ b/test/taglib-lookup/fixtures/cache-lookup/test.js
@@ -1,12 +1,14 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
-    var lookup1 = taglibLookup.buildLookup(nodePath.join(__dirname, 'foo'));
-    var lookup2 = taglibLookup.buildLookup(nodePath.join(__dirname, 'foo'));
-    var lookup3 = taglibLookup.buildLookup(nodePath.join(__dirname, 'foo/empty'));
-    var lookup4 = taglibLookup.buildLookup(nodePath.join(__dirname, 'baz'));
+    var lookup1 = taglibLookup.buildLookup(nodePath.join(__dirname, "foo"));
+    var lookup2 = taglibLookup.buildLookup(nodePath.join(__dirname, "foo"));
+    var lookup3 = taglibLookup.buildLookup(
+        nodePath.join(__dirname, "foo/empty")
+    );
+    var lookup4 = taglibLookup.buildLookup(nodePath.join(__dirname, "baz"));
     expect(lookup1).to.equal(lookup2);
     expect(lookup2).to.equal(lookup3);
     expect(lookup1).to.not.equal(lookup4);
-};
\ No newline at end of file
+};
diff --git a/test/taglib-lookup/fixtures/core-attributes/test.js b/test/taglib-lookup/fixtures/core-attributes/test.js
index 0b6e7d0e4..c3c342f3e 100644
--- a/test/taglib-lookup/fixtures/core-attributes/test.js
+++ b/test/taglib-lookup/fixtures/core-attributes/test.js
@@ -1,8 +1,8 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
     // console.log('LOOKUP: ', Object.keys(lookup.attributes));
-    var ifAttr = lookup.getAttribute('div', 'if');
+    var ifAttr = lookup.getAttribute("div", "if");
     expect(ifAttr != null).to.equal(true);
-    expect(ifAttr.type).to.equal('statement');
-};
\ No newline at end of file
+    expect(ifAttr.type).to.equal("statement");
+};
diff --git a/test/taglib-lookup/fixtures/core-tag/test.js b/test/taglib-lookup/fixtures/core-tag/test.js
index 3bdb0e7e5..0618926b3 100644
--- a/test/taglib-lookup/fixtures/core-tag/test.js
+++ b/test/taglib-lookup/fixtures/core-tag/test.js
@@ -1,7 +1,7 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
-    var ifTag = lookup.getTag('if');
+    var ifTag = lookup.getTag("if");
     expect(ifTag != null).to.equal(true);
-    expect(ifTag.name).to.equal('if');
-};
\ No newline at end of file
+    expect(ifTag.name).to.equal("if");
+};
diff --git a/test/taglib-lookup/fixtures/custom-tag/marko.json b/test/taglib-lookup/fixtures/custom-tag/marko.json
index 0433c6aa8..699ffe259 100644
--- a/test/taglib-lookup/fixtures/custom-tag/marko.json
+++ b/test/taglib-lookup/fixtures/custom-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "<test-hello>": "taglib/test-hello/marko-tag.json"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/custom-tag/taglib/test-hello/marko-tag.json b/test/taglib-lookup/fixtures/custom-tag/taglib/test-hello/marko-tag.json
index 4b5607da1..14a0c4f51 100644
--- a/test/taglib-lookup/fixtures/custom-tag/taglib/test-hello/marko-tag.json
+++ b/test/taglib-lookup/fixtures/custom-tag/taglib/test-hello/marko-tag.json
@@ -1,3 +1,3 @@
 {
     "renderer": "./renderer.js"
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/custom-tag/test.js b/test/taglib-lookup/fixtures/custom-tag/test.js
index 5e32847ab..f02263b1c 100644
--- a/test/taglib-lookup/fixtures/custom-tag/test.js
+++ b/test/taglib-lookup/fixtures/custom-tag/test.js
@@ -1,8 +1,8 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
-    var tag = lookup.getTag('test-hello');
+    var tag = lookup.getTag("test-hello");
     // console.log(Object.keys(lookup.tags));
     expect(tag != null).to.equal(true);
-    expect(tag.name).to.equal('test-hello');
-};
\ No newline at end of file
+    expect(tag.name).to.equal("test-hello");
+};
diff --git a/test/taglib-lookup/fixtures/de-dupe/foo-renderer.js b/test/taglib-lookup/fixtures/de-dupe/foo-renderer.js
index a38fad98d..150fe73fc 100644
--- a/test/taglib-lookup/fixtures/de-dupe/foo-renderer.js
+++ b/test/taglib-lookup/fixtures/de-dupe/foo-renderer.js
@@ -1 +1 @@
-exports.render = function (input, out) {};
\ No newline at end of file
+exports.render = function() {};
diff --git a/test/taglib-lookup/fixtures/de-dupe/marko.json b/test/taglib-lookup/fixtures/de-dupe/marko.json
index abe89e11c..3d601e4d7 100644
--- a/test/taglib-lookup/fixtures/de-dupe/marko.json
+++ b/test/taglib-lookup/fixtures/de-dupe/marko.json
@@ -3,4 +3,4 @@
     "<duplicate-foo>": {
         "renderer": "./foo-renderer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/bar-renderer.js b/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/bar-renderer.js
index a38fad98d..150fe73fc 100644
--- a/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/bar-renderer.js
+++ b/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/bar-renderer.js
@@ -1 +1 @@
-exports.render = function (input, out) {};
\ No newline at end of file
+exports.render = function() {};
diff --git a/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/marko.json b/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/marko.json
index b9bd03fdf..ec9561d57 100644
--- a/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/marko.json
+++ b/test/taglib-lookup/fixtures/de-dupe/taglib-duplicate/marko.json
@@ -3,4 +3,4 @@
     "<duplicate-bar>": {
         "renderer": "./bar-renderer.js"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/de-dupe/test.js b/test/taglib-lookup/fixtures/de-dupe/test.js
index 862b7e676..60b820b3f 100644
--- a/test/taglib-lookup/fixtures/de-dupe/test.js
+++ b/test/taglib-lookup/fixtures/de-dupe/test.js
@@ -1,17 +1,19 @@
-var nodePath = require('path');
+var nodePath = require("path");
 
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
-    var lookup = taglibLookup.buildLookup(nodePath.join(__dirname, 'taglib-duplicate'));
+    var lookup = taglibLookup.buildLookup(
+        nodePath.join(__dirname, "taglib-duplicate")
+    );
 
     // The "duplicate-bar" tag was declared in the lower
     // taglib so it should have been found since the taglib
     // should not have been de-duped.
-    var barTag = lookup.getTag('duplicate-bar');
+    var barTag = lookup.getTag("duplicate-bar");
     expect(barTag != null).to.equal(true);
 
     // The "duplicate-foo" tag was declared in the higher
     // up taglib so it should have been discarded
-    var fooTag = lookup.getTag('duplicate-foo');
+    var fooTag = lookup.getTag("duplicate-foo");
     expect(fooTag == null).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/marko.json b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/marko.json
index 5a1c3270f..412a4db71 100644
--- a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/marko.json
+++ b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/marko.json
@@ -4,4 +4,4 @@
         "@foo": "string",
         "@*": "boolean"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/renderer.js b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/renderer.js
index 9eca6812d..0a55f349a 100644
--- a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/renderer.js
+++ b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/renderer.js
@@ -1 +1 @@
-module.exports = function () {};
\ No newline at end of file
+module.exports = function() {};
diff --git a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/test.js b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/test.js
index 821dfed0c..359c63eb5 100644
--- a/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/test.js
+++ b/test/taglib-lookup/fixtures/declared-and-dynamic-attrs/test.js
@@ -1,13 +1,13 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
     // console.log(Object.keys(lookup.attributes));
-    var attr = lookup.getAttribute('test-dynamic-attribute', 'DYNAMIC');
+    var attr = lookup.getAttribute("test-dynamic-attribute", "DYNAMIC");
     expect(attr != null).to.equal(true);
-    expect(attr.type).to.equal('boolean');
-    expect(attr.name).to.equal('*');
+    expect(attr.type).to.equal("boolean");
+    expect(attr.name).to.equal("*");
 
-    attr = lookup.getAttribute('test-dynamic-attribute', 'foo');
+    attr = lookup.getAttribute("test-dynamic-attribute", "foo");
     expect(attr != null).to.equal(true);
-    expect(attr.type).to.equal('string');
-};
\ No newline at end of file
+    expect(attr.type).to.equal("string");
+};
diff --git a/test/taglib-lookup/fixtures/forEachAttribute-html-tag/test.js b/test/taglib-lookup/fixtures/forEachAttribute-html-tag/test.js
index e359c0ee9..fd7dff3d6 100644
--- a/test/taglib-lookup/fixtures/forEachAttribute-html-tag/test.js
+++ b/test/taglib-lookup/fixtures/forEachAttribute-html-tag/test.js
@@ -1,14 +1,14 @@
-exports.check = function (markoCompiler, expect, helpers) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
     var hasHrefAttr = false;
 
-    lookup.forEachAttribute('a', attr => {
-        if (attr.name === 'href') {
+    lookup.forEachAttribute("a", attr => {
+        if (attr.name === "href") {
             hasHrefAttr = true;
         }
     });
 
     expect(hasHrefAttr).to.equal(true);
-};
\ No newline at end of file
+};
diff --git a/test/taglib-lookup/fixtures/forEachAttribute/marko.json b/test/taglib-lookup/fixtures/forEachAttribute/marko.json
index eb44efed5..d2ff69c9a 100644
--- a/test/taglib-lookup/fixtures/forEachAttribute/marko.json
+++ b/test/taglib-lookup/fixtures/forEachAttribute/marko.json
@@ -9,4 +9,4 @@
     "<bar>": {
         "@baz": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/forEachAttribute/test.js b/test/taglib-lookup/fixtures/forEachAttribute/test.js
index ff4d0b30d..8dba04894 100644
--- a/test/taglib-lookup/fixtures/forEachAttribute/test.js
+++ b/test/taglib-lookup/fixtures/forEachAttribute/test.js
@@ -1,12 +1,12 @@
-exports.check = function (markoCompiler, expect, helpers) {
+exports.check = function(markoCompiler, expect, helpers) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
     var attrNames = [];
 
-    lookup.forEachAttribute('foo', attr => {
+    lookup.forEachAttribute("foo", attr => {
         attrNames.push(attr.name);
     });
 
-    helpers.compare(attrNames, '.json');
-};
\ No newline at end of file
+    helpers.compare(attrNames, ".json");
+};
diff --git a/test/taglib-lookup/fixtures/forEachTag/marko.json b/test/taglib-lookup/fixtures/forEachTag/marko.json
index be36c43b2..19623cfbe 100644
--- a/test/taglib-lookup/fixtures/forEachTag/marko.json
+++ b/test/taglib-lookup/fixtures/forEachTag/marko.json
@@ -8,4 +8,4 @@
     "<bar>": {
         "@name": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/forEachTag/test.js b/test/taglib-lookup/fixtures/forEachTag/test.js
index 4e3276713..331efda93 100644
--- a/test/taglib-lookup/fixtures/forEachTag/test.js
+++ b/test/taglib-lookup/fixtures/forEachTag/test.js
@@ -1,4 +1,4 @@
-exports.check = function (markoCompiler, expect, helpers) {
+exports.check = function(markoCompiler, expect, helpers) {
     var lookup = markoCompiler.buildTaglibLookup(__dirname);
 
     var tagNames = [];
@@ -7,5 +7,5 @@ exports.check = function (markoCompiler, expect, helpers) {
         tagNames.push(tag.name);
     });
 
-    helpers.compare(tagNames, '.json');
-};
\ No newline at end of file
+    helpers.compare(tagNames, ".json");
+};
diff --git a/test/taglib-lookup/fixtures/getTagsSorted/marko.json b/test/taglib-lookup/fixtures/getTagsSorted/marko.json
index f60437c54..033fd78f4 100644
--- a/test/taglib-lookup/fixtures/getTagsSorted/marko.json
+++ b/test/taglib-lookup/fixtures/getTagsSorted/marko.json
@@ -8,4 +8,4 @@
     "<a>": {
         "@name": "string"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/getTagsSorted/test.js b/test/taglib-lookup/fixtures/getTagsSorted/test.js
index 58285f99b..105585880 100644
--- a/test/taglib-lookup/fixtures/getTagsSorted/test.js
+++ b/test/taglib-lookup/fixtures/getTagsSorted/test.js
@@ -1,4 +1,4 @@
-exports.check = function (markoCompiler, expect, helpers) {
+exports.check = function(markoCompiler, expect, helpers) {
     var lookup = markoCompiler.buildTaglibLookup(__dirname);
 
     var tagNames = [];
@@ -8,5 +8,5 @@ exports.check = function (markoCompiler, expect, helpers) {
         tagNames.push(tag.name);
     });
 
-    helpers.compare(tagNames, '.json');
-};
\ No newline at end of file
+    helpers.compare(tagNames, ".json");
+};
diff --git a/test/taglib-lookup/fixtures/global-attrs/marko.json b/test/taglib-lookup/fixtures/global-attrs/marko.json
index 9acdd3ce6..f15a02fce 100644
--- a/test/taglib-lookup/fixtures/global-attrs/marko.json
+++ b/test/taglib-lookup/fixtures/global-attrs/marko.json
@@ -2,4 +2,4 @@
     "<*>": {
         "@global-attribute": "boolean"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/global-attrs/test.js b/test/taglib-lookup/fixtures/global-attrs/test.js
index 97d569074..82ba332c9 100644
--- a/test/taglib-lookup/fixtures/global-attrs/test.js
+++ b/test/taglib-lookup/fixtures/global-attrs/test.js
@@ -1,8 +1,11 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
     // console.log('LOOKUP: ', Object.keys(lookup.attributes));
-    var attrDef = lookup.getAttribute('test-dynamic-attributes', 'global-attribute');
+    var attrDef = lookup.getAttribute(
+        "test-dynamic-attributes",
+        "global-attribute"
+    );
     expect(attrDef != null).to.equal(true);
-    expect(attrDef.type).to.equal('boolean');
-};
\ No newline at end of file
+    expect(attrDef.type).to.equal("boolean");
+};
diff --git a/test/taglib-lookup/fixtures/html-any-attr/marko.json b/test/taglib-lookup/fixtures/html-any-attr/marko.json
index 92f832ae6..90569af82 100644
--- a/test/taglib-lookup/fixtures/html-any-attr/marko.json
+++ b/test/taglib-lookup/fixtures/html-any-attr/marko.json
@@ -8,4 +8,4 @@
     "@shared-hello": {
         "type": "shared"
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/html-any-attr/test.js b/test/taglib-lookup/fixtures/html-any-attr/test.js
index 5246920a7..51fc56763 100644
--- a/test/taglib-lookup/fixtures/html-any-attr/test.js
+++ b/test/taglib-lookup/fixtures/html-any-attr/test.js
@@ -1,7 +1,7 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    var attrDef = lookup.getAttribute('div', 'blah');
-    expect(attrDef).to.be.an('object');
-};
\ No newline at end of file
+    var attrDef = lookup.getAttribute("div", "blah");
+    expect(attrDef).to.be.an("object");
+};
diff --git a/test/taglib-lookup/fixtures/html-tag/marko.json b/test/taglib-lookup/fixtures/html-tag/marko.json
index af0fc6938..2ca7cf2f8 100644
--- a/test/taglib-lookup/fixtures/html-tag/marko.json
+++ b/test/taglib-lookup/fixtures/html-tag/marko.json
@@ -1,15 +1,11 @@
 {
     "<foo>": {
         "@cat": "boolean",
-        "attribute-groups": [
-            "my-attribute-group"
-        ]
+        "attribute-groups": ["my-attribute-group"]
     },
     "<bar>": {
         "@dog": "boolean",
-        "attribute-groups": [
-            "my-attribute-group"
-        ]
+        "attribute-groups": ["my-attribute-group"]
     },
 
     "attribute-groups": {
@@ -17,4 +13,4 @@
             "age": "integer"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/html-tag/test.js b/test/taglib-lookup/fixtures/html-tag/test.js
index a8ad9d87b..17300b187 100644
--- a/test/taglib-lookup/fixtures/html-tag/test.js
+++ b/test/taglib-lookup/fixtures/html-tag/test.js
@@ -1,7 +1,7 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    expect(lookup.getTag('div').html).to.equal(true);
-    expect(lookup.getAttribute('div', 'id').html).to.equal(true);
-};
\ No newline at end of file
+    expect(lookup.getTag("div").html).to.equal(true);
+    expect(lookup.getAttribute("div", "id").html).to.equal(true);
+};
diff --git a/test/taglib-lookup/fixtures/nested-tags-attrs/foo-renderer.js b/test/taglib-lookup/fixtures/nested-tags-attrs/foo-renderer.js
index c6bd5fc82..67636a92a 100644
--- a/test/taglib-lookup/fixtures/nested-tags-attrs/foo-renderer.js
+++ b/test/taglib-lookup/fixtures/nested-tags-attrs/foo-renderer.js
@@ -1,3 +1,3 @@
-exports.render = function (input, out) {
-	out.write('nested/a');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write("nested/a");
+};
diff --git a/test/taglib-lookup/fixtures/nested-tags-attrs/marko.json b/test/taglib-lookup/fixtures/nested-tags-attrs/marko.json
index db511eda3..02fb7f039 100644
--- a/test/taglib-lookup/fixtures/nested-tags-attrs/marko.json
+++ b/test/taglib-lookup/fixtures/nested-tags-attrs/marko.json
@@ -7,4 +7,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/nested-tags-attrs/test.js b/test/taglib-lookup/fixtures/nested-tags-attrs/test.js
index 7a1e47c63..6184635a4 100644
--- a/test/taglib-lookup/fixtures/nested-tags-attrs/test.js
+++ b/test/taglib-lookup/fixtures/nested-tags-attrs/test.js
@@ -1,8 +1,8 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
     // console.log(Object.keys(lookup.attributes));
-    var attr = lookup.getAttribute('nested-foo', 'attr1');
+    var attr = lookup.getAttribute("nested-foo", "attr1");
     expect(attr != null).to.equal(true);
-    expect(attr.type).to.equal('string');
-};
\ No newline at end of file
+    expect(attr.type).to.equal("string");
+};
diff --git a/test/taglib-lookup/fixtures/nested-tags/foo-renderer.js b/test/taglib-lookup/fixtures/nested-tags/foo-renderer.js
index c6bd5fc82..67636a92a 100644
--- a/test/taglib-lookup/fixtures/nested-tags/foo-renderer.js
+++ b/test/taglib-lookup/fixtures/nested-tags/foo-renderer.js
@@ -1,3 +1,3 @@
-exports.render = function (input, out) {
-	out.write('nested/a');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write("nested/a");
+};
diff --git a/test/taglib-lookup/fixtures/nested-tags/marko.json b/test/taglib-lookup/fixtures/nested-tags/marko.json
index db511eda3..02fb7f039 100644
--- a/test/taglib-lookup/fixtures/nested-tags/marko.json
+++ b/test/taglib-lookup/fixtures/nested-tags/marko.json
@@ -7,4 +7,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/nested-tags/test.js b/test/taglib-lookup/fixtures/nested-tags/test.js
index 0c859e7aa..5a7f85a16 100644
--- a/test/taglib-lookup/fixtures/nested-tags/test.js
+++ b/test/taglib-lookup/fixtures/nested-tags/test.js
@@ -1,8 +1,8 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var lookup = taglibLookup.buildLookup(__dirname);
-    var tag = lookup.getTag('nested-foo');
+    var tag = lookup.getTag("nested-foo");
 
     expect(tag != null).to.equal(true);
-    expect(tag.name).to.equal('nested-foo');
-};
\ No newline at end of file
+    expect(tag.name).to.equal("nested-foo");
+};
diff --git a/test/taglib-lookup/fixtures/transformers-core-only/foo-renderer.js b/test/taglib-lookup/fixtures/transformers-core-only/foo-renderer.js
index c6bd5fc82..67636a92a 100644
--- a/test/taglib-lookup/fixtures/transformers-core-only/foo-renderer.js
+++ b/test/taglib-lookup/fixtures/transformers-core-only/foo-renderer.js
@@ -1,3 +1,3 @@
-exports.render = function (input, out) {
-	out.write('nested/a');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write("nested/a");
+};
diff --git a/test/taglib-lookup/fixtures/transformers-core-only/marko.json b/test/taglib-lookup/fixtures/transformers-core-only/marko.json
index db511eda3..02fb7f039 100644
--- a/test/taglib-lookup/fixtures/transformers-core-only/marko.json
+++ b/test/taglib-lookup/fixtures/transformers-core-only/marko.json
@@ -7,4 +7,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/transformers-core-only/test.js b/test/taglib-lookup/fixtures/transformers-core-only/test.js
index 29ec2c294..7ffb118d6 100644
--- a/test/taglib-lookup/fixtures/transformers-core-only/test.js
+++ b/test/taglib-lookup/fixtures/transformers-core-only/test.js
@@ -1,9 +1,9 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var transformers = [];
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    lookup.forEachTagTransformer('div', function (transformer) {
+    lookup.forEachTagTransformer("div", function(transformer) {
         transformers.push(transformer);
     });
 
diff --git a/test/taglib-lookup/fixtures/transformers-custom-node/foo-renderer.js b/test/taglib-lookup/fixtures/transformers-custom-node/foo-renderer.js
index c6bd5fc82..67636a92a 100644
--- a/test/taglib-lookup/fixtures/transformers-custom-node/foo-renderer.js
+++ b/test/taglib-lookup/fixtures/transformers-custom-node/foo-renderer.js
@@ -1,3 +1,3 @@
-exports.render = function (input, out) {
-	out.write('nested/a');
-};
\ No newline at end of file
+exports.render = function(input, out) {
+    out.write("nested/a");
+};
diff --git a/test/taglib-lookup/fixtures/transformers-custom-node/marko.json b/test/taglib-lookup/fixtures/transformers-custom-node/marko.json
index db511eda3..02fb7f039 100644
--- a/test/taglib-lookup/fixtures/transformers-custom-node/marko.json
+++ b/test/taglib-lookup/fixtures/transformers-custom-node/marko.json
@@ -7,4 +7,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/transformers-custom-node/test.js b/test/taglib-lookup/fixtures/transformers-custom-node/test.js
index 73882c685..3200f3be2 100644
--- a/test/taglib-lookup/fixtures/transformers-custom-node/test.js
+++ b/test/taglib-lookup/fixtures/transformers-custom-node/test.js
@@ -1,14 +1,16 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var transformers = [];
 
     var lookup = taglibLookup.buildLookup(__dirname);
 
-    lookup.forEachTagTransformer('else', function (transformer) {
+    lookup.forEachTagTransformer("else", function(transformer) {
         transformers.push(transformer);
     });
 
     expect(transformers.length).to.equal(2);
-    expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1);
-    expect(transformers[1].path.indexOf('components-transformer')).to.not.equal(-1);
+    expect(transformers[0].path.indexOf("core-transformer")).to.not.equal(-1);
+    expect(transformers[1].path.indexOf("components-transformer")).to.not.equal(
+        -1
+    );
 };
diff --git a/test/taglib-lookup/fixtures/transformers/bar-transformer.js b/test/taglib-lookup/fixtures/transformers/bar-transformer.js
index dab1ffdc7..b680892d4 100644
--- a/test/taglib-lookup/fixtures/transformers/bar-transformer.js
+++ b/test/taglib-lookup/fixtures/transformers/bar-transformer.js
@@ -1 +1 @@
-exports.transform = function (node, compiler, template) {};
\ No newline at end of file
+exports.transform = function() {};
diff --git a/test/taglib-lookup/fixtures/transformers/foo-transformer.js b/test/taglib-lookup/fixtures/transformers/foo-transformer.js
index dab1ffdc7..b680892d4 100644
--- a/test/taglib-lookup/fixtures/transformers/foo-transformer.js
+++ b/test/taglib-lookup/fixtures/transformers/foo-transformer.js
@@ -1 +1 @@
-exports.transform = function (node, compiler, template) {};
\ No newline at end of file
+exports.transform = function() {};
diff --git a/test/taglib-lookup/fixtures/transformers/marko.json b/test/taglib-lookup/fixtures/transformers/marko.json
index ef22aeb20..10e2677f1 100644
--- a/test/taglib-lookup/fixtures/transformers/marko.json
+++ b/test/taglib-lookup/fixtures/transformers/marko.json
@@ -15,4 +15,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/taglib-lookup/fixtures/transformers/test.js b/test/taglib-lookup/fixtures/transformers/test.js
index f8d09e74a..e4eb11344 100644
--- a/test/taglib-lookup/fixtures/transformers/test.js
+++ b/test/taglib-lookup/fixtures/transformers/test.js
@@ -1,4 +1,4 @@
-exports.check = function (markoCompiler, expect) {
+exports.check = function(markoCompiler, expect) {
     var taglibLookup = markoCompiler.taglibLookup;
     var transformers;
     var lookup;
@@ -14,22 +14,26 @@ exports.check = function (markoCompiler, expect) {
     lookup = taglibLookup.buildLookup(__dirname);
 
     transformers = [];
-    lookup.forEachTagTransformer('transform-foo', function (transformer) {
+    lookup.forEachTagTransformer("transform-foo", function(transformer) {
         transformers.push(transformer);
     });
 
     expect(transformers.length).to.equal(3);
-    expect(transformers[0].path.indexOf('foo')).to.not.equal(-1);
-    expect(transformers[1].path.indexOf('core-transformer')).to.not.equal(-1);
-    expect(transformers[2].path.indexOf('components-transformer')).to.not.equal(-1);
+    expect(transformers[0].path.indexOf("foo")).to.not.equal(-1);
+    expect(transformers[1].path.indexOf("core-transformer")).to.not.equal(-1);
+    expect(transformers[2].path.indexOf("components-transformer")).to.not.equal(
+        -1
+    );
 
     transformers = [];
-    lookup.forEachTagTransformer('transform-bar', function (transformer) {
+    lookup.forEachTagTransformer("transform-bar", function(transformer) {
         transformers.push(transformer);
     });
 
     expect(transformers.length).to.equal(3);
-    expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1);
-    expect(transformers[1].path.indexOf('bar')).to.not.equal(-1);
-    expect(transformers[2].path.indexOf('components-transformer')).to.not.equal(-1);
+    expect(transformers[0].path.indexOf("core-transformer")).to.not.equal(-1);
+    expect(transformers[1].path.indexOf("bar")).to.not.equal(-1);
+    expect(transformers[2].path.indexOf("components-transformer")).to.not.equal(
+        -1
+    );
 };
diff --git a/test/taglib-lookup/index.test.js b/test/taglib-lookup/index.test.js
index 305445e3a..4731cbe29 100644
--- a/test/taglib-lookup/index.test.js
+++ b/test/taglib-lookup/index.test.js
@@ -1,23 +1,23 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var expect = require('chai').expect;
-var nodePath = require('path');
-var autotest = require('../autotest');
-var markoCompiler = require('../../compiler');
+var expect = require("chai").expect;
+var nodePath = require("path");
+var autotest = require("../autotest");
+var markoCompiler = require("../../compiler");
 
 markoCompiler.buildTaglibLookup(__dirname);
 
-describe('taglib-lookup', function () {
-    var autoTestDir = nodePath.join(__dirname, './fixtures');
+describe("taglib-lookup", function() {
+    var autoTestDir = nodePath.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var test = require(nodePath.join(dir, 'test.js'));
+        var test = require(nodePath.join(dir, "test.js"));
         test.check(markoCompiler, expect, helpers);
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/vdom-compiler/fixtures/custom-tag/marko.json b/test/vdom-compiler/fixtures/custom-tag/marko.json
index e85a78200..7720f87ea 100644
--- a/test/vdom-compiler/fixtures/custom-tag/marko.json
+++ b/test/vdom-compiler/fixtures/custom-tag/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/marko-tag.json b/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/marko-tag.json
+++ b/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/renderer.js b/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/renderer.js
index a38fad98d..150fe73fc 100644
--- a/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/renderer.js
+++ b/test/vdom-compiler/fixtures/custom-tag/tags/test-hello/renderer.js
@@ -1 +1 @@
-exports.render = function (input, out) {};
\ No newline at end of file
+exports.render = function() {};
diff --git a/test/vdom-compiler/fixtures/tag-body/marko.json b/test/vdom-compiler/fixtures/tag-body/marko.json
index e85a78200..7720f87ea 100644
--- a/test/vdom-compiler/fixtures/tag-body/marko.json
+++ b/test/vdom-compiler/fixtures/tag-body/marko.json
@@ -1,3 +1,3 @@
 {
     "tags-dir": "./tags"
-}
\ No newline at end of file
+}
diff --git a/test/vdom-compiler/fixtures/tag-body/tags/test-hello/marko-tag.json b/test/vdom-compiler/fixtures/tag-body/tags/test-hello/marko-tag.json
index e83d0748c..ba1ca98b1 100644
--- a/test/vdom-compiler/fixtures/tag-body/tags/test-hello/marko-tag.json
+++ b/test/vdom-compiler/fixtures/tag-body/tags/test-hello/marko-tag.json
@@ -2,4 +2,4 @@
     "renderer": "./renderer.js",
     "@name": "string",
     "@adult": "boolean"
-}
\ No newline at end of file
+}
diff --git a/test/vdom-compiler/fixtures/tag-body/tags/test-hello/renderer.js b/test/vdom-compiler/fixtures/tag-body/tags/test-hello/renderer.js
index a38fad98d..150fe73fc 100644
--- a/test/vdom-compiler/fixtures/tag-body/tags/test-hello/renderer.js
+++ b/test/vdom-compiler/fixtures/tag-body/tags/test-hello/renderer.js
@@ -1 +1 @@
-exports.render = function (input, out) {};
\ No newline at end of file
+exports.render = function() {};
diff --git a/test/vdom-compiler/index.test.js b/test/vdom-compiler/index.test.js
index b28169215..9df3e1b2e 100644
--- a/test/vdom-compiler/index.test.js
+++ b/test/vdom-compiler/index.test.js
@@ -1,27 +1,31 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
-var path = require('path');
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
-var fs = require('fs');
+var path = require("path");
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
+var fs = require("fs");
 
-describe('vdom-compiler', function () {
-    var autoTestDir = path.join(__dirname, './fixtures');
+describe("vdom-compiler", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
     autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-        var templatePath = path.join(dir, 'template.marko');
-        var mainPath = path.join(dir, 'test.js');
+        var templatePath = path.join(dir, "template.marko");
+        var mainPath = path.join(dir, "test.js");
         var main;
 
         if (fs.existsSync(mainPath)) {
             main = require(mainPath);
         }
 
-        var compilerOptions = { output: 'vdom', writeVersionComment: false, autoKeyEnabled: false };
+        var compilerOptions = {
+            output: "vdom",
+            writeVersionComment: false,
+            autoKeyEnabled: false
+        };
 
         if (main && main.checkError) {
             var e;
@@ -33,16 +37,19 @@ describe('vdom-compiler', function () {
             }
 
             if (!e) {
-                throw new Error('Error expected');
+                throw new Error("Error expected");
             }
 
             main.checkError(e);
             done();
         } else {
-            var compiledTemplate = compiler.compileFileForBrowser(templatePath, Object.assign(compilerOptions, main && main.compilerOptions));
+            var compiledTemplate = compiler.compileFileForBrowser(
+                templatePath,
+                Object.assign(compilerOptions, main && main.compilerOptions)
+            );
             var actualSrc = compiledTemplate.code;
-            actualSrc = actualSrc.replace(/marko\/dist\//g, 'marko/src/');
-            helpers.compare(actualSrc, '.js');
+            actualSrc = actualSrc.replace(/marko\/dist\//g, "marko/src/");
+            helpers.compare(actualSrc, ".js");
             done();
         }
     });
diff --git a/test/vdom-create/fixtures/appendDocumentFragment-children/index.js b/test/vdom-create/fixtures/appendDocumentFragment-children/index.js
index 15db74627..c99fe6d64 100644
--- a/test/vdom-create/fixtures/appendDocumentFragment-children/index.js
+++ b/test/vdom-create/fixtures/appendDocumentFragment-children/index.js
@@ -1,12 +1,14 @@
-module.exports = function (helpers) {
-    var root = helpers.vdom.createElement('div', { class: 'root' });
+module.exports = function(helpers) {
+    var root = helpers.vdom.createElement("div", { class: "root" });
 
-    root.e('div', { class: 'first-child' });
+    root.e("div", { class: "first-child" });
 
     var docFragment = root.___appendDocumentFragment();
-    docFragment.___appendChild(helpers.vdom.createElement('div', { class: 'middle-child' }));
+    docFragment.___appendChild(
+        helpers.vdom.createElement("div", { class: "middle-child" })
+    );
 
-    root.e('div', { class: 'last-child' });
+    root.e("div", { class: "last-child" });
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/appendDocumentFragment-no-children/index.js b/test/vdom-create/fixtures/appendDocumentFragment-no-children/index.js
index e070d7f38..e1a88acea 100644
--- a/test/vdom-create/fixtures/appendDocumentFragment-no-children/index.js
+++ b/test/vdom-create/fixtures/appendDocumentFragment-no-children/index.js
@@ -1,11 +1,11 @@
-module.exports = function (helpers) {
-    var root = helpers.vdom.createElement('div', { class: 'root' });
+module.exports = function(helpers) {
+    var root = helpers.vdom.createElement("div", { class: "root" });
 
-    root.e('div', { class: 'first-child' });
+    root.e("div", { class: "first-child" });
 
     root.___appendDocumentFragment();
 
-    root.e('div', { class: 'last-child' });
+    root.e("div", { class: "last-child" });
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/assignAttributes/index.js b/test/vdom-create/fixtures/assignAttributes/index.js
index 70af833f8..5add5bcf6 100644
--- a/test/vdom-create/fixtures/assignAttributes/index.js
+++ b/test/vdom-create/fixtures/assignAttributes/index.js
@@ -1,10 +1,12 @@
-
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var morphAttrs = helpers.vdom.VElement.___morphAttrs;
 
-    var fromEl = helpers.document.createElement('div');
+    var fromEl = helpers.document.createElement("div");
     var vFromEl = helpers.vdom.virtualizeElement(fromEl);
-    var toEl = helpers.vdom.createElement('div', { class: 'foo', 'xlink:href': 'bar.com' });
+    var toEl = helpers.vdom.createElement("div", {
+        class: "foo",
+        "xlink:href": "bar.com"
+    });
     morphAttrs(fromEl, vFromEl, toEl);
     return fromEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/attributes-attr-collection-child/index.js b/test/vdom-create/fixtures/attributes-attr-collection-child/index.js
index 8571a1c50..8de3a957f 100644
--- a/test/vdom-create/fixtures/attributes-attr-collection-child/index.js
+++ b/test/vdom-create/fixtures/attributes-attr-collection-child/index.js
@@ -1,5 +1,10 @@
-module.exports = function (helpers) {
-    var attributes = { class: 'foo', id: 'bar' };
+module.exports = function(helpers) {
+    var attributes = { class: "foo", id: "bar" };
 
-    return helpers.vdom.createElement('div', null, 2 /* childCount */).e('span', null, 1).e('p', attributes, 1).e('span', { 'class': 'leaf' }, 0).e('a', null, 0);
-};
\ No newline at end of file
+    return helpers.vdom
+        .createElement("div", null, 2 /* childCount */)
+        .e("span", null, 1)
+        .e("p", attributes, 1)
+        .e("span", { class: "leaf" }, 0)
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/attributes-attr-collection/index.js b/test/vdom-create/fixtures/attributes-attr-collection/index.js
index f9a3841d2..5695667e3 100644
--- a/test/vdom-create/fixtures/attributes-attr-collection/index.js
+++ b/test/vdom-create/fixtures/attributes-attr-collection/index.js
@@ -1,5 +1,9 @@
-module.exports = function (helpers) {
-    var attributes = { class: 'foo', id: 'bar' };
+module.exports = function(helpers) {
+    var attributes = { class: "foo", id: "bar" };
 
-    return helpers.vdom.createElement('div', null, 2 /* childCount */).e('span', null, 1).e('p', attributes, 0).e('a', null, 0);
-};
\ No newline at end of file
+    return helpers.vdom
+        .createElement("div", null, 2 /* childCount */)
+        .e("span", null, 1)
+        .e("p", attributes, 0)
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/attributes-null-false/index.js b/test/vdom-create/fixtures/attributes-null-false/index.js
index 9c01bba84..f7b5750c4 100644
--- a/test/vdom-create/fixtures/attributes-null-false/index.js
+++ b/test/vdom-create/fixtures/attributes-null-false/index.js
@@ -1,3 +1,17 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', null, 2 /* childCount */).e('span', null, 1).e('p', { class: 'foo', id: 'bar', title: null, 'data-bar': false, 'checked': true }, 0).e('a', null, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", null, 2 /* childCount */)
+        .e("span", null, 1)
+        .e(
+            "p",
+            {
+                class: "foo",
+                id: "bar",
+                title: null,
+                "data-bar": false,
+                checked: true
+            },
+            0
+        )
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/attributes-object/index.js b/test/vdom-create/fixtures/attributes-object/index.js
index 460042929..976fd644e 100644
--- a/test/vdom-create/fixtures/attributes-object/index.js
+++ b/test/vdom-create/fixtures/attributes-object/index.js
@@ -1,3 +1,7 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', null, 2 /* childCount */).e('span', null, 1).e('p', { class: 'foo', id: 'bar' }, 0).e('a', null, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", null, 2 /* childCount */)
+        .e("span", null, 1)
+        .e("p", { class: "foo", id: "bar" }, 0)
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/attributes-true/index.js b/test/vdom-create/fixtures/attributes-true/index.js
index 766a73f05..ba112e7fe 100644
--- a/test/vdom-create/fixtures/attributes-true/index.js
+++ b/test/vdom-create/fixtures/attributes-true/index.js
@@ -1,5 +1,7 @@
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('select', null, null, null, 1 /* childCount */).e('option', { selected: true }, null, null, 0);
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom
+        .createElement("select", null, null, null, 1 /* childCount */)
+        .e("option", { selected: true }, null, null, 0);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/cloneNode-comment/index.js b/test/vdom-create/fixtures/cloneNode-comment/index.js
index 280df439e..e12a6e7f3 100644
--- a/test/vdom-create/fixtures/cloneNode-comment/index.js
+++ b/test/vdom-create/fixtures/cloneNode-comment/index.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var comment = helpers.vdom.createComment('This is a comment');
+module.exports = function(helpers) {
+    var comment = helpers.vdom.createComment("This is a comment");
     var commentClone = comment.___cloneNode();
     expect(commentClone).to.not.equal(comment);
-    expect(comment.___nodeValue).to.equal('This is a comment');
-    expect(commentClone.___nodeValue).to.equal('This is a comment');
+    expect(comment.___nodeValue).to.equal("This is a comment");
+    expect(commentClone.___nodeValue).to.equal("This is a comment");
     return comment;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/cloneNode-documentFragment/index.js b/test/vdom-create/fixtures/cloneNode-documentFragment/index.js
index 8354fe12a..df0763247 100644
--- a/test/vdom-create/fixtures/cloneNode-documentFragment/index.js
+++ b/test/vdom-create/fixtures/cloneNode-documentFragment/index.js
@@ -1,18 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var SVG_FLAGS = 1; // SVG
 
-    var svg = helpers.vdom.createElement('svg', null /* attrs */, null /* key */, null /* component */, null /* child count */, SVG_FLAGS);
+    var svg = helpers.vdom.createElement(
+        "svg",
+        null /* attrs */,
+        null /* key */,
+        null /* component */,
+        null /* child count */,
+        SVG_FLAGS
+    );
 
     var docFragment = helpers.vdom.createDocumentFragment();
     svg.___appendChild(docFragment);
 
-    expect(svg.___namespaceURI).to.equal('http://www.w3.org/2000/svg');
+    expect(svg.___namespaceURI).to.equal("http://www.w3.org/2000/svg");
 
     var docFragmentClone = docFragment.___cloneNode();
     expect(docFragmentClone.___nextSibling).to.equal(null);
     expect(docFragmentClone.___parentNode == null).to.equal(true);
 
     return svg;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/cloneNode-text/index.js b/test/vdom-create/fixtures/cloneNode-text/index.js
index f840b0a06..d79620a54 100644
--- a/test/vdom-create/fixtures/cloneNode-text/index.js
+++ b/test/vdom-create/fixtures/cloneNode-text/index.js
@@ -1,10 +1,10 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var text = helpers.vdom.createText('Hello World');
+module.exports = function(helpers) {
+    var text = helpers.vdom.createText("Hello World");
     var textClone = text.___cloneNode();
     expect(textClone).to.not.equal(text);
-    expect(text.___nodeValue).to.equal('Hello World');
-    expect(textClone.___nodeValue).to.equal('Hello World');
+    expect(text.___nodeValue).to.equal("Hello World");
+    expect(textClone.___nodeValue).to.equal("Hello World");
     return text;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/cloneNode/index.js b/test/vdom-create/fixtures/cloneNode/index.js
index 16fc98fb7..2763f743f 100644
--- a/test/vdom-create/fixtures/cloneNode/index.js
+++ b/test/vdom-create/fixtures/cloneNode/index.js
@@ -1,31 +1,56 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var SVG_FLAGS = 1; // SVG
 
-    var el = helpers.vdom.createElement('div', {
-        'class': 'foo',
-        'onclick': 'doSomething()'
-    }, null, null, 1 /* childCount */).e('svg', {
-        width: '100',
-        height: '100'
-    }, null, null, 1, SVG_FLAGS, null).e('circle', {
-        'cx': '50',
-        'cy': '50',
-        'r': '40',
-        'stroke': 'green',
-        'stroke-width': '4',
-        'fill': 'yellow',
-        'xlink:href': 'http://ebay.com/'
-    }, null, null, 0, SVG_FLAGS, null);
+    var el = helpers.vdom
+        .createElement(
+            "div",
+            {
+                class: "foo",
+                onclick: "doSomething()"
+            },
+            null,
+            null,
+            1 /* childCount */
+        )
+        .e(
+            "svg",
+            {
+                width: "100",
+                height: "100"
+            },
+            null,
+            null,
+            1,
+            SVG_FLAGS,
+            null
+        )
+        .e(
+            "circle",
+            {
+                cx: "50",
+                cy: "50",
+                r: "40",
+                stroke: "green",
+                "stroke-width": "4",
+                fill: "yellow",
+                "xlink:href": "http://ebay.com/"
+            },
+            null,
+            null,
+            0,
+            SVG_FLAGS,
+            null
+        );
 
     var clone = el.___cloneNode();
     expect(clone).to.not.equal(el);
-    expect(clone.___nodeName).to.equal('div');
-    expect(clone.___hasAttribute('class')).to.equal(true);
+    expect(clone.___nodeName).to.equal("div");
+    expect(clone.___hasAttribute("class")).to.equal(true);
     expect(clone.firstChild).to.equal(el.firstChild);
 
-    var root = helpers.vdom.createElement('div', { class: 'root' });
+    var root = helpers.vdom.createElement("div", { class: "root" });
 
     root.___appendChild(clone);
 
@@ -33,4 +58,4 @@ module.exports = function (helpers) {
     expect(clone.___parentNode).to.equal(root);
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/comment/index.js b/test/vdom-create/fixtures/comment/index.js
index 3e1ec368d..b4d1bd650 100644
--- a/test/vdom-create/fixtures/comment/index.js
+++ b/test/vdom-create/fixtures/comment/index.js
@@ -1,6 +1,14 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', {
-        class: 'foo',
-        onclick: 'doSomething()'
-    }, 1 /* childCount */).e('span', { class: 'bar' }, 1).c('This is a comment').e('p', 0, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement(
+            "div",
+            {
+                class: "foo",
+                onclick: "doSomething()"
+            },
+            1 /* childCount */
+        )
+        .e("span", { class: "bar" }, 1)
+        .c("This is a comment")
+        .e("p", 0, 0);
+};
diff --git a/test/vdom-create/fixtures/createAttributes/index.js b/test/vdom-create/fixtures/createAttributes/index.js
index 21efb372d..3e1405432 100644
--- a/test/vdom-create/fixtures/createAttributes/index.js
+++ b/test/vdom-create/fixtures/createAttributes/index.js
@@ -1,14 +1,25 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var attributes = {
-        id: 'link',
-        href: 'http://ebay.com'
+        id: "link",
+        href: "http://ebay.com"
     };
 
-    var el = helpers.vdom.createElement('div', null, null /* key */, null /* component */, 2 /* childCount */).e('span', null, null /* key */, null /* component */, 1).e('a', attributes, null /* key */, null /* component */, 1).t('eBay').e('footer', null, null /* key */, null /* component */, 0);
+    var el = helpers.vdom
+        .createElement(
+            "div",
+            null,
+            null /* key */,
+            null /* component */,
+            2 /* childCount */
+        )
+        .e("span", null, null /* key */, null /* component */, 1)
+        .e("a", attributes, null /* key */, null /* component */, 1)
+        .t("eBay")
+        .e("footer", null, null /* key */, null /* component */, 0);
 
-    expect(el.___firstChild.___firstChild.___attributes.id).to.equal('link');
+    expect(el.___firstChild.___firstChild.___attributes.id).to.equal("link");
 
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/deeply-nested-element-2/index.js b/test/vdom-create/fixtures/deeply-nested-element-2/index.js
index 33d837710..f82e1b029 100644
--- a/test/vdom-create/fixtures/deeply-nested-element-2/index.js
+++ b/test/vdom-create/fixtures/deeply-nested-element-2/index.js
@@ -1,3 +1,7 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', 0 /* attrCount */, 2 /* childCount */).e('span', null, 1).e('p', null, 1).e('a', null, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", 0 /* attrCount */, 2 /* childCount */)
+        .e("span", null, 1)
+        .e("p", null, 1)
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/deeply-nested-element/index.js b/test/vdom-create/fixtures/deeply-nested-element/index.js
index 54ef8503e..34afebd88 100644
--- a/test/vdom-create/fixtures/deeply-nested-element/index.js
+++ b/test/vdom-create/fixtures/deeply-nested-element/index.js
@@ -1,3 +1,7 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', 0 /* attrCount */, 2 /* childCount */).e('span', null, 1).e('p', null, 0).e('a', null, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", 0 /* attrCount */, 2 /* childCount */)
+        .e("span", null, 1)
+        .e("p", null, 0)
+        .e("a", null, 0);
+};
diff --git a/test/vdom-create/fixtures/doc-fragment-child-with-sibling/index.js b/test/vdom-create/fixtures/doc-fragment-child-with-sibling/index.js
index e8c15bafe..23277d4ae 100644
--- a/test/vdom-create/fixtures/doc-fragment-child-with-sibling/index.js
+++ b/test/vdom-create/fixtures/doc-fragment-child-with-sibling/index.js
@@ -1,20 +1,22 @@
-module.exports = function (helpers) {
-    var root = helpers.vdom.createElement('div', { class: 'root' });
+module.exports = function(helpers) {
+    var root = helpers.vdom.createElement("div", { class: "root" });
 
     var docFragment = helpers.vdom.createDocumentFragment();
 
-    var div1 = helpers.vdom.createElement('div', {
-        class: 'foo1',
-        onclick: 'doSomething()'
+    var div1 = helpers.vdom.createElement("div", {
+        class: "foo1",
+        onclick: "doSomething()"
     });
 
-    var div2 = helpers.vdom.createElement('div', { class: 'foo2' });
+    var div2 = helpers.vdom.createElement("div", { class: "foo2" });
 
     docFragment.___appendChild(div1);
     docFragment.___appendChild(div2);
 
     root.___appendChild(docFragment);
-    root.___appendChild(helpers.vdom.createElement('div', { class: 'sibling' }));
+    root.___appendChild(
+        helpers.vdom.createElement("div", { class: "sibling" })
+    );
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/doc-fragment-child/index.js b/test/vdom-create/fixtures/doc-fragment-child/index.js
index 5e467b806..0797e16dc 100644
--- a/test/vdom-create/fixtures/doc-fragment-child/index.js
+++ b/test/vdom-create/fixtures/doc-fragment-child/index.js
@@ -1,15 +1,15 @@
-module.exports = function (helpers) {
-    var root = helpers.vdom.createElement('div', { class: 'root' });
+module.exports = function(helpers) {
+    var root = helpers.vdom.createElement("div", { class: "root" });
 
     var docFragment = helpers.vdom.createDocumentFragment();
 
-    var div1 = helpers.vdom.createElement('div', {
-        class: 'foo1',
-        onclick: 'doSomething()'
+    var div1 = helpers.vdom.createElement("div", {
+        class: "foo1",
+        onclick: "doSomething()"
     });
 
-    var div2 = helpers.vdom.createElement('div', {
-        class: 'foo2'
+    var div2 = helpers.vdom.createElement("div", {
+        class: "foo2"
     });
 
     docFragment.___appendChild(div1);
@@ -18,4 +18,4 @@ module.exports = function (helpers) {
     root.___appendChild(docFragment);
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/doc-fragment-deeply-nested-empty/index.js b/test/vdom-create/fixtures/doc-fragment-deeply-nested-empty/index.js
index cba639e0b..5350f7b98 100644
--- a/test/vdom-create/fixtures/doc-fragment-deeply-nested-empty/index.js
+++ b/test/vdom-create/fixtures/doc-fragment-deeply-nested-empty/index.js
@@ -1,4 +1,4 @@
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var root = helpers.vdom.createDocumentFragment();
 
     var docFragmentA = helpers.vdom.createDocumentFragment();
@@ -11,11 +11,11 @@ module.exports = function (helpers) {
     var docFragmentBB = helpers.vdom.createDocumentFragment();
     docFragmentB.___appendChild(docFragmentBB);
 
-    docFragmentBB.___appendChild(helpers.vdom.createText('bb1'));
-    docFragmentBB.___appendChild(helpers.vdom.createText('bb2'));
+    docFragmentBB.___appendChild(helpers.vdom.createText("bb1"));
+    docFragmentBB.___appendChild(helpers.vdom.createText("bb2"));
 
     root.___appendChild(docFragmentA);
     root.___appendChild(docFragmentB);
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/doc-fragment-deeply-nested-text/index.js b/test/vdom-create/fixtures/doc-fragment-deeply-nested-text/index.js
index 5cdce699d..bf2cc8466 100644
--- a/test/vdom-create/fixtures/doc-fragment-deeply-nested-text/index.js
+++ b/test/vdom-create/fixtures/doc-fragment-deeply-nested-text/index.js
@@ -1,4 +1,4 @@
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var root = helpers.vdom.createDocumentFragment();
 
     var docFragmentA = helpers.vdom.createDocumentFragment();
@@ -6,19 +6,19 @@ module.exports = function (helpers) {
     var docFragmentAA = helpers.vdom.createDocumentFragment();
     docFragmentA.___appendChild(docFragmentAA);
 
-    docFragmentAA.___appendChild(helpers.vdom.createText('aa1'));
-    docFragmentAA.___appendChild(helpers.vdom.createText('aa2'));
+    docFragmentAA.___appendChild(helpers.vdom.createText("aa1"));
+    docFragmentAA.___appendChild(helpers.vdom.createText("aa2"));
 
     var docFragmentB = helpers.vdom.createDocumentFragment();
 
     var docFragmentBB = helpers.vdom.createDocumentFragment();
     docFragmentB.___appendChild(docFragmentBB);
 
-    docFragmentBB.___appendChild(helpers.vdom.createText('bb1'));
-    docFragmentBB.___appendChild(helpers.vdom.createText('bb2'));
+    docFragmentBB.___appendChild(helpers.vdom.createText("bb1"));
+    docFragmentBB.___appendChild(helpers.vdom.createText("bb2"));
 
     root.___appendChild(docFragmentA);
     root.___appendChild(docFragmentB);
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js b/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js
index 9359bb99f..975955f62 100644
--- a/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js
+++ b/test/vdom-create/fixtures/doc-fragment-deeply-nested/index.js
@@ -1,4 +1,4 @@
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var root = helpers.vdom.createDocumentFragment();
 
     var docFragmentA = helpers.vdom.createDocumentFragment();
@@ -6,15 +6,23 @@ module.exports = function (helpers) {
     var docFragmentAA = helpers.vdom.createDocumentFragment();
     docFragmentA.___appendChild(docFragmentAA);
 
-    docFragmentAA.___appendChild(helpers.vdom.createElement('div', { class: 'aa1' }));
-    docFragmentAA.___appendChild(helpers.vdom.createElement('div', { class: 'aa2' }));
+    docFragmentAA.___appendChild(
+        helpers.vdom.createElement("div", { class: "aa1" })
+    );
+    docFragmentAA.___appendChild(
+        helpers.vdom.createElement("div", { class: "aa2" })
+    );
 
     var docFragmentB = helpers.vdom.createDocumentFragment();
-    docFragmentB.___appendChild(helpers.vdom.createElement('div', { class: 'b1' }));
-    docFragmentB.___appendChild(helpers.vdom.createElement('div', { class: 'b2' }));
+    docFragmentB.___appendChild(
+        helpers.vdom.createElement("div", { class: "b1" })
+    );
+    docFragmentB.___appendChild(
+        helpers.vdom.createElement("div", { class: "b2" })
+    );
 
     root.___appendChild(docFragmentA);
     root.___appendChild(docFragmentB);
 
     return root;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-empty-string/index.js b/test/vdom-create/fixtures/hasAttributeNS-empty-string/index.js
index b44d7b0ab..6a782ce33 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-empty-string/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-empty-string/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: '' });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: "" });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(true);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(true);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-false/index.js b/test/vdom-create/fixtures/hasAttributeNS-false/index.js
index 2587aa63e..658b7fd6d 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-false/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-false/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: false });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: false });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(false);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(false);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-null/index.js b/test/vdom-create/fixtures/hasAttributeNS-null/index.js
index b75c608ce..a99e5d6bc 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-null/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-null/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: null });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: null });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(false);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(false);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-number-zero/index.js b/test/vdom-create/fixtures/hasAttributeNS-number-zero/index.js
index 84a2bcd92..c2c2a6ff4 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-number-zero/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-number-zero/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: 0 });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: 0 });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(true);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(true);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-number/index.js b/test/vdom-create/fixtures/hasAttributeNS-number/index.js
index cdc4ac69a..8ebba96aa 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-number/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-number/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: 1 });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: 1 });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(true);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(true);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-true/index.js b/test/vdom-create/fixtures/hasAttributeNS-true/index.js
index 22fe02c2c..dfa0aa7fc 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-true/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-true/index.js
@@ -1,9 +1,9 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: true });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", { selected: true });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(true);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(true);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/hasAttributeNS-undefined/index.js b/test/vdom-create/fixtures/hasAttributeNS-undefined/index.js
index 5aa4ad904..f0c3c02fe 100644
--- a/test/vdom-create/fixtures/hasAttributeNS-undefined/index.js
+++ b/test/vdom-create/fixtures/hasAttributeNS-undefined/index.js
@@ -1,9 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var virtualEl = helpers.vdom.createElement('option', { selected: undefined });
+module.exports = function(helpers) {
+    var virtualEl = helpers.vdom.createElement("option", {
+        selected: undefined
+    });
 
-    expect(virtualEl.___hasAttribute('selected')).to.equal(false);
+    expect(virtualEl.___hasAttribute("selected")).to.equal(false);
 
     return virtualEl;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/id/index.js b/test/vdom-create/fixtures/id/index.js
index 7ea784c20..81e1bbd94 100644
--- a/test/vdom-create/fixtures/id/index.js
+++ b/test/vdom-create/fixtures/id/index.js
@@ -1,7 +1,13 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var el = helpers.vdom.createElement('input', { id: 'foo' }, null /* key */, null /* component */, 0 /* childCount */);
-    expect(el.___attributes.id).to.equal('foo');
+module.exports = function(helpers) {
+    var el = helpers.vdom.createElement(
+        "input",
+        { id: "foo" },
+        null /* key */,
+        null /* component */,
+        0 /* childCount */
+    );
+    expect(el.___attributes.id).to.equal("foo");
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/input-checked/index.js b/test/vdom-create/fixtures/input-checked/index.js
index 204a4e79b..995c37d4e 100644
--- a/test/vdom-create/fixtures/input-checked/index.js
+++ b/test/vdom-create/fixtures/input-checked/index.js
@@ -1,8 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var el = helpers.vdom.createElement('input', { type: 'checkbox', checked: true }, 0 /* childCount */);
+module.exports = function(helpers) {
+    var el = helpers.vdom.createElement(
+        "input",
+        { type: "checkbox", checked: true },
+        0 /* childCount */
+    );
 
     expect(el.checked).to.equal(true);
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/input-disabled/index.js b/test/vdom-create/fixtures/input-disabled/index.js
index 556aa8909..cd99efb0f 100644
--- a/test/vdom-create/fixtures/input-disabled/index.js
+++ b/test/vdom-create/fixtures/input-disabled/index.js
@@ -1,8 +1,12 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var el = helpers.vdom.createElement('input', { disabled: 'disabled' }, 0 /* childCount */);
+module.exports = function(helpers) {
+    var el = helpers.vdom.createElement(
+        "input",
+        { disabled: "disabled" },
+        0 /* childCount */
+    );
 
     expect(el.disabled).to.equal(true);
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/input-value/index.js b/test/vdom-create/fixtures/input-value/index.js
index 759a4d863..d7ed21ed2 100644
--- a/test/vdom-create/fixtures/input-value/index.js
+++ b/test/vdom-create/fixtures/input-value/index.js
@@ -1,8 +1,14 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var el = helpers.vdom.createElement('input', { value: 'foo' }, null /* key */, null /* component */, 0 /* childCount */);
+module.exports = function(helpers) {
+    var el = helpers.vdom.createElement(
+        "input",
+        { value: "foo" },
+        null /* key */,
+        null /* component */,
+        0 /* childCount */
+    );
 
-    expect(el.___value).to.equal('foo');
+    expect(el.___value).to.equal("foo");
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/isSameNode-createElement/index.js b/test/vdom-create/fixtures/isSameNode-createElement/index.js
index 3a6ed96f7..2d7c80ad7 100644
--- a/test/vdom-create/fixtures/isSameNode-createElement/index.js
+++ b/test/vdom-create/fixtures/isSameNode-createElement/index.js
@@ -1,4 +1,4 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
 function isSameNode(virtualEl, realEl) {
     var vFromEl = realEl.___markoVElement;
@@ -10,9 +10,23 @@ function isSameNode(virtualEl, realEl) {
     return false;
 }
 
-module.exports = function (helpers) {
-    var div = helpers.vdom.createElement('div', null, null /* key */, null /* component */, 0 /* childCount */, null, { i: 'abc123' /* key */ });
-    var span = helpers.vdom.createElement('span', null, null /* key */, null /* component */, 0 /* childCount */);
+module.exports = function(helpers) {
+    var div = helpers.vdom.createElement(
+        "div",
+        null,
+        null /* key */,
+        null /* component */,
+        0 /* childCount */,
+        null,
+        { i: "abc123" /* key */ }
+    );
+    var span = helpers.vdom.createElement(
+        "span",
+        null,
+        null /* key */,
+        null /* component */,
+        0 /* childCount */
+    );
 
     var divClone = div.___cloneNode();
     // expect(div.___isSameNode(divClone)).to.equal(true);
@@ -30,4 +44,4 @@ module.exports = function (helpers) {
     expect(isSameNode(div, realSpan)).to.equal(false);
 
     return div;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/no-children/index.js b/test/vdom-create/fixtures/no-children/index.js
index ead626235..96c614569 100644
--- a/test/vdom-create/fixtures/no-children/index.js
+++ b/test/vdom-create/fixtures/no-children/index.js
@@ -1,3 +1,7 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', { class: 'foo', onclick: 'doSomething()' }, 0 /* childCount */);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom.createElement(
+        "div",
+        { class: "foo", onclick: "doSomething()" },
+        0 /* childCount */
+    );
+};
diff --git a/test/vdom-create/fixtures/one-child-element/index.js b/test/vdom-create/fixtures/one-child-element/index.js
index 9129ef90b..522c51605 100644
--- a/test/vdom-create/fixtures/one-child-element/index.js
+++ b/test/vdom-create/fixtures/one-child-element/index.js
@@ -1,3 +1,5 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', { class: 'foo' }, 1 /* childCount */).e('span', { class: 'bar' }, 0);
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", { class: "foo" }, 1 /* childCount */)
+        .e("span", { class: "bar" }, 0);
+};
diff --git a/test/vdom-create/fixtures/one-child-text/index.js b/test/vdom-create/fixtures/one-child-text/index.js
index 31f86020f..2af1b7a0d 100644
--- a/test/vdom-create/fixtures/one-child-text/index.js
+++ b/test/vdom-create/fixtures/one-child-text/index.js
@@ -1,3 +1,5 @@
-module.exports = function (helpers) {
-    return helpers.vdom.createElement('div', { class: 'foo' }, 1 /* childCount */).t('Hello World!');
-};
\ No newline at end of file
+module.exports = function(helpers) {
+    return helpers.vdom
+        .createElement("div", { class: "foo" }, 1 /* childCount */)
+        .t("Hello World!");
+};
diff --git a/test/vdom-create/fixtures/option-selected/index.js b/test/vdom-create/fixtures/option-selected/index.js
index 0a694702c..9c3700b56 100644
--- a/test/vdom-create/fixtures/option-selected/index.js
+++ b/test/vdom-create/fixtures/option-selected/index.js
@@ -1,7 +1,11 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var el = helpers.vdom.createElement('option', { 'selected': '' }, 0 /* childCount */);
+module.exports = function(helpers) {
+    var el = helpers.vdom.createElement(
+        "option",
+        { selected: "" },
+        0 /* childCount */
+    );
     expect(el.selected).to.equal(true);
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/static-tree-svg/index.js b/test/vdom-create/fixtures/static-tree-svg/index.js
index 8a1827ffa..6dcc91014 100644
--- a/test/vdom-create/fixtures/static-tree-svg/index.js
+++ b/test/vdom-create/fixtures/static-tree-svg/index.js
@@ -1,15 +1,38 @@
-module.exports = function (helpers) {
-
+module.exports = function(helpers) {
     var FLAGS = 1; // SVG
-    var linearGradient = helpers.vdom.createElement('linearGradient', { x1: "0%", y1: "0%", x2: "100%", y2: "0%" }, null, FLAGS);
+    var linearGradient = helpers.vdom.createElement(
+        "linearGradient",
+        { x1: "0%", y1: "0%", x2: "100%", y2: "0%" },
+        null,
+        FLAGS
+    );
 
-    linearGradient.___appendChild(helpers.vdom.createElement('stop', { offset: "0%", style: "stop-color:rgb(255,255,0);stop-opacity:1" }, null, FLAGS));
+    linearGradient.___appendChild(
+        helpers.vdom.createElement(
+            "stop",
+            { offset: "0%", style: "stop-color:rgb(255,255,0);stop-opacity:1" },
+            null,
+            FLAGS
+        )
+    );
 
-    linearGradient.___appendChild(helpers.vdom.createElement('stop', { offset: "100%", style: "stop-color:rgb(255,0,0);stop-opacity:1" }, null, FLAGS));
+    linearGradient.___appendChild(
+        helpers.vdom.createElement(
+            "stop",
+            { offset: "100%", style: "stop-color:rgb(255,0,0);stop-opacity:1" },
+            null,
+            FLAGS
+        )
+    );
 
-    var svg = helpers.vdom.createElement('svg', { height: "150", width: "400" }, null, FLAGS);
+    var svg = helpers.vdom.createElement(
+        "svg",
+        { height: "150", width: "400" },
+        null,
+        FLAGS
+    );
 
     svg.___appendChild(linearGradient);
 
     return svg;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/static-tree/index.js b/test/vdom-create/fixtures/static-tree/index.js
index 300fc50a7..1e23f8f5d 100644
--- a/test/vdom-create/fixtures/static-tree/index.js
+++ b/test/vdom-create/fixtures/static-tree/index.js
@@ -1,9 +1,26 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
-    var link = helpers.vdom.createElement('a', { 'href': 'http://ebay.com' }, null /* key */, null /* component */, 1 /* childCount */).t('eBay');
+module.exports = function(helpers) {
+    var link = helpers.vdom
+        .createElement(
+            "a",
+            { href: "http://ebay.com" },
+            null /* key */,
+            null /* component */,
+            1 /* childCount */
+        )
+        .t("eBay");
 
-    var el = helpers.vdom.createElement('div', { 'class': 'foo', 'onclick': 'doSomething()' }, null /* key */, null /* component */, 2 /* childCount */).n(link).e('span', null, null /* key */, null /* component */, 0);
+    var el = helpers.vdom
+        .createElement(
+            "div",
+            { class: "foo", onclick: "doSomething()" },
+            null /* key */,
+            null /* component */,
+            2 /* childCount */
+        )
+        .n(link)
+        .e("span", null, null /* key */, null /* component */, 0);
 
     var linkClone = el.___firstChild;
 
@@ -11,8 +28,8 @@ module.exports = function (helpers) {
     expect(link.___parentNode).to.equal(null);
     expect(link.___nextSibling).to.equal(null);
 
-    expect(linkClone.___nextSibling.___nodeName).to.equal('span');
-    expect(linkClone.___parentNode.___nodeName).to.equal('div');
+    expect(linkClone.___nextSibling.___nodeName).to.equal("span");
+    expect(linkClone.___parentNode.___nodeName).to.equal("div");
 
     return el;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/svg-dynamic/index.js b/test/vdom-create/fixtures/svg-dynamic/index.js
index e1a8b3bd1..055ebdab1 100644
--- a/test/vdom-create/fixtures/svg-dynamic/index.js
+++ b/test/vdom-create/fixtures/svg-dynamic/index.js
@@ -1,14 +1,33 @@
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var FLAGS = 1;
 
-    return helpers.vdom.createElement('div', { class: 'foo', onclick: 'doSomething()' }, 1 /* childCount */).ed('svg', { width: '100', height: '100', xmlns: 'http://www.w3.org/2000/svg' }, 1) //NO SVG FLAG, from xmlns
-    .e('circle', {
-        'cx': '50',
-        'cy': '50',
-        'r': '40',
-        'stroke': 'green',
-        'stroke-width': '4',
-        'fill': 'yellow',
-        'xlink:href': 'http://ebay.com/'
-    }, 0, FLAGS);
-};
\ No newline at end of file
+    return helpers.vdom
+        .createElement(
+            "div",
+            { class: "foo", onclick: "doSomething()" },
+            1 /* childCount */
+        )
+        .ed(
+            "svg",
+            {
+                width: "100",
+                height: "100",
+                xmlns: "http://www.w3.org/2000/svg"
+            },
+            1
+        ) //NO SVG FLAG, from xmlns
+        .e(
+            "circle",
+            {
+                cx: "50",
+                cy: "50",
+                r: "40",
+                stroke: "green",
+                "stroke-width": "4",
+                fill: "yellow",
+                "xlink:href": "http://ebay.com/"
+            },
+            0,
+            FLAGS
+        );
+};
diff --git a/test/vdom-create/fixtures/svg/index.js b/test/vdom-create/fixtures/svg/index.js
index 5170748a1..2f2234bd1 100644
--- a/test/vdom-create/fixtures/svg/index.js
+++ b/test/vdom-create/fixtures/svg/index.js
@@ -1,13 +1,25 @@
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var FLAGS = 1;
 
-    return helpers.vdom.createElement('div', { class: 'foo', onclick: 'doSomething()' }, 1 /* childCount */).e('svg', { width: '100', height: '100' }, 1, FLAGS).e('circle', {
-        'cx': '50',
-        'cy': '50',
-        'r': '40',
-        'stroke': 'green',
-        'stroke-width': '4',
-        'fill': 'yellow',
-        'xlink:href': 'http://ebay.com/'
-    }, 0, FLAGS);
-};
\ No newline at end of file
+    return helpers.vdom
+        .createElement(
+            "div",
+            { class: "foo", onclick: "doSomething()" },
+            1 /* childCount */
+        )
+        .e("svg", { width: "100", height: "100" }, 1, FLAGS)
+        .e(
+            "circle",
+            {
+                cx: "50",
+                cy: "50",
+                r: "40",
+                stroke: "green",
+                "stroke-width": "4",
+                fill: "yellow",
+                "xlink:href": "http://ebay.com/"
+            },
+            0,
+            FLAGS
+        );
+};
diff --git a/test/vdom-create/fixtures/textarea-invalid-child/index.js b/test/vdom-create/fixtures/textarea-invalid-child/index.js
index 028546dfa..534e7807d 100644
--- a/test/vdom-create/fixtures/textarea-invalid-child/index.js
+++ b/test/vdom-create/fixtures/textarea-invalid-child/index.js
@@ -1,10 +1,20 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var TEXTAREA_FLAGS = 2;
-    expect(function () {
-        helpers.vdom.createElement('textarea', {}, null /* key */, null /* component */, 2 /* childCount */, TEXTAREA_FLAGS).e('div', {}, null /* key */, null /* component */, 0).t('bar');
-    }).to.throw('');
+    expect(function() {
+        helpers.vdom
+            .createElement(
+                "textarea",
+                {},
+                null /* key */,
+                null /* component */,
+                2 /* childCount */,
+                TEXTAREA_FLAGS
+            )
+            .e("div", {}, null /* key */, null /* component */, 0)
+            .t("bar");
+    }).to.throw("");
 
     return null;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/fixtures/textarea/index.js b/test/vdom-create/fixtures/textarea/index.js
index 0c09535a3..629b708b9 100644
--- a/test/vdom-create/fixtures/textarea/index.js
+++ b/test/vdom-create/fixtures/textarea/index.js
@@ -1,11 +1,21 @@
-var expect = require('chai').expect;
+var expect = require("chai").expect;
 
-module.exports = function (helpers) {
+module.exports = function(helpers) {
     var FLAGS = 2; // TEXTAREA
 
-    var textarea = helpers.vdom.createElement('textarea', null, null /* key */, null /* component */, 2 /* childCount */, FLAGS).t('foo').t('bar');
+    var textarea = helpers.vdom
+        .createElement(
+            "textarea",
+            null,
+            null /* key */,
+            null /* component */,
+            2 /* childCount */,
+            FLAGS
+        )
+        .t("foo")
+        .t("bar");
 
-    expect(textarea.___value).to.equal('foobar');
+    expect(textarea.___value).to.equal("foobar");
 
     return textarea;
-};
\ No newline at end of file
+};
diff --git a/test/vdom-create/index.test.js b/test/vdom-create/index.test.js
index 17c16f93b..3f4505205 100644
--- a/test/vdom-create/index.test.js
+++ b/test/vdom-create/index.test.js
@@ -1,48 +1,72 @@
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var path = require('path');
+var path = require("path");
 
-var fs = require('fs');
-var domToString = require('../__util__/domToString');
-var createJSDOMModule = require('../__util__/create-jsdom-module');
+var fs = require("fs");
+var domToString = require("../__util__/domToString");
+var createJSDOMModule = require("../__util__/create-jsdom-module");
 
-var document = createJSDOMModule({ dir: __dirname, html: '<html><body></body></html>' }).window.document;
+var document = createJSDOMModule({
+    dir: __dirname,
+    html: "<html><body></body></html>"
+}).window.document;
 
-var vdom = require('marko/runtime/vdom/vdom');
+var vdom = require("marko/runtime/vdom/vdom");
 var VElement = vdom.___VElement;
 var VText = vdom.___VText;
 var VComment = vdom.___VComment;
 var VDocumentFragment = vdom.___VDocumentFragment;
 
 var vdomHelpers = {
-    createElement: function (tagName, attrs, key, component, childCount, flags, props) {
-        return new VElement(tagName, attrs, key, component, childCount, flags, props);
+    createElement: function(
+        tagName,
+        attrs,
+        key,
+        component,
+        childCount,
+        flags,
+        props
+    ) {
+        return new VElement(
+            tagName,
+            attrs,
+            key,
+            component,
+            childCount,
+            flags,
+            props
+        );
     },
-    createText: function (value) {
+    createText: function(value) {
         return new VText(value);
     },
-    createComment: function (value) {
+    createComment: function(value) {
         return new VComment(value);
     },
-    createDocumentFragment: function () {
+    createDocumentFragment: function() {
         return new VDocumentFragment();
     },
     VElement: VElement,
     virtualizeElement: VElement.___virtualize
 };
 
-describe('vdom-create', () => {
-    require('../autotest').scanDir(path.join(__dirname, './fixtures'), function (dir, helpers, done) {
+describe("vdom-create", () => {
+    require("../autotest").scanDir(path.join(__dirname, "./fixtures"), function(
+        dir,
+        helpers,
+        done
+    ) {
         helpers.vdom = vdomHelpers;
         helpers.document = document;
 
-        var mainPath = path.join(dir, 'index.js');
+        var mainPath = path.join(dir, "index.js");
         if (fs.existsSync(mainPath)) {
             var main = require(mainPath);
             var rootNode = main(helpers);
 
-            var rootNodeHTML = rootNode != null ? domToString(rootNode) : '(null)';
-            helpers.compare(rootNodeHTML, '.html');
+            var rootNodeHTML =
+                rootNode != null ? domToString(rootNode) : "(null)";
+            helpers.compare(rootNodeHTML, ".html");
         }
         done();
     });
diff --git a/test/vdom-virtualize/index.test.js b/test/vdom-virtualize/index.test.js
index ceeef82da..56c3ca1dc 100644
--- a/test/vdom-virtualize/index.test.js
+++ b/test/vdom-virtualize/index.test.js
@@ -1,23 +1,33 @@
-require('../__util__/test-init');
-var path = require('path');
-var virtualize = require('marko/runtime/vdom/vdom').___virtualize;
-var fs = require('fs');
-var toHTML = require('../__util__/toHTML');
-var createJSDOMModule = require('../__util__/create-jsdom-module');
+require("../__util__/test-init");
+var path = require("path");
+var virtualize = require("marko/runtime/vdom/vdom").___virtualize;
+var fs = require("fs");
+var toHTML = require("../__util__/toHTML");
+var createJSDOMModule = require("../__util__/create-jsdom-module");
 
-describe('vdom-virtualize', () => {
-    require('../autotest').scanDir(path.join(__dirname, './fixtures'), function (dir, helpers, done) {
+describe("vdom-virtualize", () => {
+    require("../autotest").scanDir(path.join(__dirname, "./fixtures"), function(
+        dir,
+        helpers,
+        done
+    ) {
         helpers.virtualize = virtualize;
 
-        var inputPath = path.join(dir, 'input.html');
+        var inputPath = path.join(dir, "input.html");
         if (fs.existsSync(inputPath)) {
-            var inputHtml = fs.readFileSync(inputPath, { encoding: 'utf8' });
-            
-            var document = createJSDOMModule({ dir: __dirname, html: '<html><body>' + inputHtml + '</body></html>' }).window.document;
+            var inputHtml = fs.readFileSync(inputPath, { encoding: "utf8" });
+
+            var document = createJSDOMModule({
+                dir: __dirname,
+                html: "<html><body>" + inputHtml + "</body></html>"
+            }).window.document;
             var domNode = document.body.firstChild;
             var vdomNode = virtualize(domNode);
             var vdomHTML = toHTML(vdomNode);
-            helpers.compare(vdomHTML, { suffix: '.html', prefix: 'virtualized-' });
+            helpers.compare(vdomHTML, {
+                suffix: ".html",
+                prefix: "virtualized-"
+            });
         }
         done();
     });
diff --git a/test/walker/fixtures/remove-attrs/index.js b/test/walker/fixtures/remove-attrs/index.js
index 3078cbb51..3ed9088cf 100644
--- a/test/walker/fixtures/remove-attrs/index.js
+++ b/test/walker/fixtures/remove-attrs/index.js
@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
     let text = builder.text;
@@ -10,29 +10,41 @@ module.exports = function (compiler) {
     let literal = builder.literal;
     let forEach = builder.forEach;
 
-    let rootNode = templateRoot([htmlElement('ul', {
-        'class': literal('colors'),
-        'if': {
-            argument: 'notEmpty(data.colors)'
-        }
-    }, [htmlElement('li', {
-        'class': literal('color'),
-        'for': {
-            argument: 'color in data.colors'
-        }
-    }, [text('color')])])]);
+    let rootNode = templateRoot([
+        htmlElement(
+            "ul",
+            {
+                class: literal("colors"),
+                if: {
+                    argument: "notEmpty(data.colors)"
+                }
+            },
+            [
+                htmlElement(
+                    "li",
+                    {
+                        class: literal("color"),
+                        for: {
+                            argument: "color in data.colors"
+                        }
+                    },
+                    [text("color")]
+                )
+            ]
+        )
+    ]);
 
     let walker = compiler.createWalker({
         enter(node) {
-            if (node.type === 'HtmlElement') {
-                if (node.hasAttribute('for')) {
-                    node.wrapWith(forEach('color', 'data.colors'));
-                    node.removeAttribute('for');
+            if (node.type === "HtmlElement") {
+                if (node.hasAttribute("for")) {
+                    node.wrapWith(forEach("color", "data.colors"));
+                    node.removeAttribute("for");
                 }
 
-                if (node.hasAttribute('if')) {
-                    node.wrapWith(ifStatement('notEmpty(data.colors)'));
-                    node.removeAttribute('if');
+                if (node.hasAttribute("if")) {
+                    node.wrapWith(ifStatement("notEmpty(data.colors)"));
+                    node.removeAttribute("if");
                 }
             }
         }
@@ -41,4 +53,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/fixtures/remove-exit/index.js b/test/walker/fixtures/remove-exit/index.js
index 6ef19eea8..384b25bae 100644
--- a/test/walker/fixtures/remove-exit/index.js
+++ b/test/walker/fixtures/remove-exit/index.js
@@ -1,13 +1,19 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
-    let rootNode = builder.templateRoot([builder.htmlElement('ul', null, [builder.htmlElement('li', null, [builder.text('a')]), builder.htmlElement('REMOVEME', null, [builder.text('b')]), builder.htmlElement('li', null, [builder.text('c')])])]);
+    let rootNode = builder.templateRoot([
+        builder.htmlElement("ul", null, [
+            builder.htmlElement("li", null, [builder.text("a")]),
+            builder.htmlElement("REMOVEME", null, [builder.text("b")]),
+            builder.htmlElement("li", null, [builder.text("c")])
+        ])
+    ]);
 
     let walker = compiler.createWalker({
         exit(node) {
-            if (node.type === 'HtmlElement' && node.tagName === 'REMOVEME') {
+            if (node.type === "HtmlElement" && node.tagName === "REMOVEME") {
                 return null;
             }
         }
@@ -16,4 +22,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/fixtures/remove-exit2/index.js b/test/walker/fixtures/remove-exit2/index.js
index 889dc7dd9..af2ef71e9 100644
--- a/test/walker/fixtures/remove-exit2/index.js
+++ b/test/walker/fixtures/remove-exit2/index.js
@@ -1,13 +1,19 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
-    let rootNode = builder.templateRoot([builder.htmlElement('ul', null, [builder.htmlElement('li', null, [builder.text('a')]), builder.htmlElement('REMOVEME', null, [builder.text('b')]), builder.htmlElement('li', null, [builder.text('c')])])]);
+    let rootNode = builder.templateRoot([
+        builder.htmlElement("ul", null, [
+            builder.htmlElement("li", null, [builder.text("a")]),
+            builder.htmlElement("REMOVEME", null, [builder.text("b")]),
+            builder.htmlElement("li", null, [builder.text("c")])
+        ])
+    ]);
 
     let walker = compiler.createWalker({
         exit(node) {
-            if (node.type === 'HtmlElement' && node.tagName === 'REMOVEME') {
+            if (node.type === "HtmlElement" && node.tagName === "REMOVEME") {
                 walker.remove();
             }
         }
@@ -16,4 +22,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/fixtures/remove/index.js b/test/walker/fixtures/remove/index.js
index ab1c80426..5bb242cf4 100644
--- a/test/walker/fixtures/remove/index.js
+++ b/test/walker/fixtures/remove/index.js
@@ -1,13 +1,19 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
-    let rootNode = builder.templateRoot([builder.htmlElement('ul', null, [builder.htmlElement('li', null, [builder.text('a')]), builder.htmlElement('REMOVEME', null, [builder.text('b')]), builder.htmlElement('li', null, [builder.text('c')])])]);
+    let rootNode = builder.templateRoot([
+        builder.htmlElement("ul", null, [
+            builder.htmlElement("li", null, [builder.text("a")]),
+            builder.htmlElement("REMOVEME", null, [builder.text("b")]),
+            builder.htmlElement("li", null, [builder.text("c")])
+        ])
+    ]);
 
     let walker = compiler.createWalker({
         enter(node) {
-            if (node.type === 'HtmlElement' && node.tagName === 'REMOVEME') {
+            if (node.type === "HtmlElement" && node.tagName === "REMOVEME") {
                 return null;
             }
         }
@@ -16,4 +22,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/fixtures/remove2/index.js b/test/walker/fixtures/remove2/index.js
index 1fa48d5fa..f19a85b41 100644
--- a/test/walker/fixtures/remove2/index.js
+++ b/test/walker/fixtures/remove2/index.js
@@ -1,13 +1,19 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
-    let rootNode = builder.templateRoot([builder.htmlElement('ul', null, [builder.htmlElement('li', null, [builder.text('a')]), builder.htmlElement('REMOVEME', null, [builder.text('b')]), builder.htmlElement('li', null, [builder.text('c')])])]);
+    let rootNode = builder.templateRoot([
+        builder.htmlElement("ul", null, [
+            builder.htmlElement("li", null, [builder.text("a")]),
+            builder.htmlElement("REMOVEME", null, [builder.text("b")]),
+            builder.htmlElement("li", null, [builder.text("c")])
+        ])
+    ]);
 
     let walker = compiler.createWalker({
         enter(node) {
-            if (node.type === 'HtmlElement' && node.tagName === 'REMOVEME') {
+            if (node.type === "HtmlElement" && node.tagName === "REMOVEME") {
                 walker.remove();
             }
         }
@@ -16,4 +22,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/fixtures/replace/index.js b/test/walker/fixtures/replace/index.js
index 7996d6cd9..54214b89e 100644
--- a/test/walker/fixtures/replace/index.js
+++ b/test/walker/fixtures/replace/index.js
@@ -1,17 +1,33 @@
-'use strict';
+"use strict";
 
-module.exports = function (compiler) {
+module.exports = function(compiler) {
     let builder = compiler.createBuilder();
 
-    let rootNode = builder.templateRoot([builder.htmlElement('ul', {
-        'class': 'escapeXml(data.foo)'
-    }, [builder.htmlElement('li', {
-        'class': builder.literal('color')
-    }, [builder.text('color')])])]);
+    let rootNode = builder.templateRoot([
+        builder.htmlElement(
+            "ul",
+            {
+                class: "escapeXml(data.foo)"
+            },
+            [
+                builder.htmlElement(
+                    "li",
+                    {
+                        class: builder.literal("color")
+                    },
+                    [builder.text("color")]
+                )
+            ]
+        )
+    ]);
 
     let walker = compiler.createWalker({
         enter(node) {
-            if (node.type === 'FunctionCall' && node.callee.type === 'Identifier' && node.callee.name === 'escapeXml') {
+            if (
+                node.type === "FunctionCall" &&
+                node.callee.type === "Identifier" &&
+                node.callee.name === "escapeXml"
+            ) {
                 return node.args[0];
             }
         }
@@ -20,4 +36,4 @@ module.exports = function (compiler) {
     walker.walk(rootNode);
 
     return rootNode;
-};
\ No newline at end of file
+};
diff --git a/test/walker/index.test.js b/test/walker/index.test.js
index 07b20fdb1..7f9ccc9d5 100644
--- a/test/walker/index.test.js
+++ b/test/walker/index.test.js
@@ -1,20 +1,20 @@
-'use strict';
+"use strict";
 
-require('../__util__/test-init');
+require("../__util__/test-init");
 
-var chai = require('chai');
+var chai = require("chai");
 chai.config.includeStack = true;
 
-var path = require('path');
-var compiler = require('../../compiler');
-var autotest = require('../autotest');
+var path = require("path");
+var compiler = require("../../compiler");
+var autotest = require("../autotest");
 
-describe('compiler/walker', function () {
-        var autoTestDir = path.join(__dirname, './fixtures');
+describe("compiler/walker", function() {
+    var autoTestDir = path.join(__dirname, "./fixtures");
 
-        autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
-                var getAST = require(path.join(dir, 'index.js'));
-                helpers.compare(getAST(compiler), '.json');
-                return done();
-        });
-});
\ No newline at end of file
+    autotest.scanDir(autoTestDir, function run(dir, helpers, done) {
+        var getAST = require(path.join(dir, "index.js"));
+        helpers.compare(getAST(compiler), ".json");
+        return done();
+    });
+});