Update docs output for 2.0.0

2.0.0 (#4701 )
* Bump version to 2.0.0; bump dependencies versions * Make v2 docs the primary docs; jettison the v1 docs’ source: whenever the v1 docs need to be rebuild in the future, that can be done on the `1` branch and copied over; simplify folder tree * Updated v1 docs that reflect that v2 is out and have updated paths to reflect that the v2 docs are now the primary docs, and the v1 docs only live under /v1/ * Add Google Analytics; track navigation, editing code and running code * 2.0.0 changelog * Fix link to root docs * No more @next; installing local copy should be --save-dev * Analytics on the browser-based tests page should prove fascinating . . . * Update annotated source * Add note to changelog clarifying scope
2026-01-13 16:57:54 -05:00 · 2017-09-18 08:31:07 -07:00 · 2017-09-18 08:19:19 -07:00 · 2017-09-16 12:03:33 -07:00 · 2017-09-16 11:57:18 -07:00 · 2017-09-16 09:32:48 -07:00
92 changed files with 4360 additions and 2356 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["env"]
+}
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: node_js
+
+node_js:
+  - 6
+  - 8
+
+cache:
+  directories:
+    - node_modules
+
+script:
+  - node ./bin/cake build:except-parser
+  - node ./bin/cake build:parser
+  - node ./bin/cake build:full
+  - node ./bin/cake build:browser
+  - node ./bin/cake test
+  - node ./bin/cake test:browser
+  - node ./bin/cake test:integrations
--- a/100
+++ b/100
@@ -66,6 +66,20 @@ build = (callback) ->
  buildParser()
  buildExceptParser callback

+transpile = (code) ->
+  babel = require 'babel-core'
+  presets = []
+  # Exclude the `modules` plugin in order to not break the `}(this));`
+  # at the end of the `build:browser` code block.
+  presets.push ['env', {modules: no}] unless process.env.TRANSFORM is 'false'
+  presets.push 'minify' unless process.env.MINIFY is 'false'
+  babelOptions =
+    compact: process.env.MINIFY isnt 'false'
+    presets: presets
+    sourceType: 'script'
+  { code } = babel.transform code, babelOptions unless presets.length is 0
+  code
+
 testBuiltCode = (watch = no) ->
  csPath = './lib/coffeescript'
  csDir  = path.dirname require.resolve csPath
@@ -79,7 +93,7 @@ testBuiltCode = (watch = no) ->

 buildAndTest = (includingParser = yes, harmony = no) ->
  process.stdout.write '\x1Bc' # Clear terminal screen.
-  execSync 'git checkout lib/*', stdio: [0,1,2] # Reset the generated compiler.
+  execSync 'git checkout lib/*', stdio: 'inherit' # Reset the generated compiler.

  buildArgs = ['bin/cake']
  buildArgs.push if includingParser then 'build' else 'build:except-parser'
@@ -141,24 +155,7 @@ task 'build:browser', 'merge the built scripts into a single file for use in a b
      }
    }(this));
  """
-  babel = require 'babel-core'
-  presets = []
-  # Exclude the `modules` plugin in order to not break the `}(this));`
-  # at the end of the above code block.
-  presets.push ['env', {modules: no}] unless process.env.TRANSFORM is 'false'
-  babelOptions =
-    presets: presets
-    sourceType: 'script'
-  { code } = babel.transform code, babelOptions unless presets.length is 0
-  # Running Babel twice due to https://github.com/babel/babili/issues/614.
-  # Once that issue is fixed, move the `babili` preset back up into the
-  # `presets` array and run Babel once with both presets together.
-  presets = if process.env.MINIFY is 'false' then [] else ['babili']
-  babelOptions =
-    compact: process.env.MINIFY isnt 'false'
-    presets: presets
-    sourceType: 'script'
-  { code } = babel.transform code, babelOptions unless presets.length is 0
+  code = transpile code
  outputFolder = "docs/v#{majorVersion}/browser-compiler"
  fs.mkdirSync outputFolder unless fs.existsSync outputFolder
  fs.writeFileSync "#{outputFolder}/coffeescript.js", header + '\n' + code
@@ -177,11 +174,11 @@ task 'build:watch:harmony', 'watch and continually rebuild the CoffeeScript comp

 buildDocs = (watch = no) ->
  # Constants
-  indexFile = 'documentation/index.html'
-  versionedSourceFolder = "documentation/v#{majorVersion}"
+  indexFile            = 'documentation/site/index.html'
+  siteSourceFolder     = "documentation/site"
  sectionsSourceFolder = 'documentation/sections'
  examplesSourceFolder = 'documentation/examples'
-  outputFolder = "docs/v#{majorVersion}"
+  outputFolder         = "docs/v#{majorVersion}"

  # Helpers
  releaseHeader = (date, version, prevVersion) ->
@@ -199,7 +196,7 @@ buildDocs = (watch = no) ->
      </h2>
    """

-  codeFor = require "./documentation/v#{majorVersion}/code.coffee"
+  codeFor = require "./documentation/site/code.coffee"

  htmlFor = ->
    hljs = require 'highlight.js'
@@ -236,9 +233,17 @@ buildDocs = (watch = no) ->
        codeFor: codeFor()
        releaseHeader: releaseHeader

+  includeScript = ->
+    (file) ->
+      file = "#{siteSourceFolder}/#{file}" unless '/' in file
+      code = fs.readFileSync file, 'utf-8'
+      code = CoffeeScript.compile code
+      code = transpile code
+      code
+
  include = ->
    (file) ->
-      file = "#{versionedSourceFolder}/#{file}" if file.indexOf('/') is -1
+      file = "#{siteSourceFolder}/#{file}" unless '/' in file
      output = fs.readFileSync file, 'utf-8'
      if /\.html$/.test(file)
        render = _.template output
@@ -249,6 +254,7 @@ buildDocs = (watch = no) ->
          htmlFor: htmlFor()
          codeFor: codeFor()
          include: include()
+          includeScript: includeScript()
      output

  # Task
@@ -263,7 +269,7 @@ buildDocs = (watch = no) ->
  catch exception

  if watch
-    for target in [indexFile, versionedSourceFolder, examplesSourceFolder, sectionsSourceFolder]
+    for target in [indexFile, siteSourceFolder, examplesSourceFolder, sectionsSourceFolder]
      fs.watch target, interval: 200, renderIndex
    log 'watching...', green

@@ -276,9 +282,9 @@ task 'doc:site:watch', 'watch and continually rebuild the documentation for the

 buildDocTests = (watch = no) ->
  # Constants
-  testFile = 'documentation/test.html'
+  testFile          = 'documentation/site/test.html'
  testsSourceFolder = 'test'
-  outputFolder = "docs/v#{majorVersion}"
+  outputFolder      = "docs/v#{majorVersion}"

  # Included in test.html
  testHelpers = fs.readFileSync('test/support/helpers.coffee', 'utf-8').replace /exports\./g, '@'
@@ -481,20 +487,28 @@ task 'test:integrations', 'test the module integrated with other libraries and e
  # Node modules are required as part of the compiler (as opposed to the tests)
  # and that therefore the compiler will run in a browser environment.
  tmpdir = os.tmpdir()
-  try
-    buildLog = execSync "./node_modules/webpack/bin/webpack.js
-      --entry=./
-      --output-library=CoffeeScript
-      --output-library-target=commonjs2
-      --output-path=#{tmpdir}
-      --output-filename=coffeescript.js"
-  catch exception
-    console.error buildLog.toString()
-    throw exception
+  webpack = require 'webpack'
+  webpack {
+    entry: './'
+    output:
+      path: tmpdir
+      filename: 'coffeescript.js'
+      library: 'CoffeeScript'
+      libraryTarget: 'commonjs2'
+  }, (err, stats) ->
+    if err or stats.hasErrors()
+      if err
+        console.error err.stack or err
+        console.error err.details if err.details
+      if stats.hasErrors()
+        console.error error for error in stats.compilation.errors
+      if stats.hasWarnings()
+        console.warn warning for warning in stats.compilation.warnings
+      process.exit 1

-  builtCompiler = path.join tmpdir, 'coffeescript.js'
-  CoffeeScript = require builtCompiler
-  global.testingBrowser = yes
-  testResults = runTests CoffeeScript
-  fs.unlinkSync builtCompiler
-  process.exit 1 unless testResults
+    builtCompiler = path.join tmpdir, 'coffeescript.js'
+    CoffeeScript = require builtCompiler
+    global.testingBrowser = yes
+    testResults = runTests CoffeeScript
+    fs.unlinkSync builtCompiler
+    process.exit 1 unless testResults
--- a/docs/annotated-source
+++ b/docs/annotated-source
@@ -0,0 +1 @@
+v2/annotated-source
--- a/docs/announcing-coffeescript-2
+++ b/docs/announcing-coffeescript-2
@@ -0,0 +1 @@
+v2/announcing-coffeescript-2
--- a/docs/browser-compiler
+++ b/docs/browser-compiler
@@ -0,0 +1 @@
+v2/browser-compiler
--- a/docs/index.html
+++ b/docs/index.html
@@ -1 +1 @@
-v1/index.html
+v2/index.html
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1,5 +1,6 @@
 {
-	"name": "",
+	"name": "CoffeeScript",
+	"description": "Unfancy JavaScript",
 	"icons": [
 		{
 			"src": "\/android-chrome-192x192.png",
--- a/docs/test.html
+++ b/docs/test.html
@@ -0,0 +1 @@
+v2/test.html
--- a/docs/v1/index.html
+++ b/docs/v1/index.html
@@ -594,18 +594,18 @@ pre .xml .cdata {
      Annotated Source
    </div>
    <div class="contents menu">
-      <a href="/v1/annotated-source/grammar.html">Grammar Rules — src/grammar</a>
-      <a href="/v1/annotated-source/lexer.html">Lexing Tokens — src/lexer</a>
-      <a href="/v1/annotated-source/rewriter.html">The Rewriter — src/rewriter</a>
-      <a href="/v1/annotated-source/nodes.html">The Syntax Tree — src/nodes</a>
-      <a href="/v1/annotated-source/scope.html">Lexical Scope — src/scope</a>
-      <a href="/v1/annotated-source/helpers.html">Helpers &amp; Utility Functions — src/helpers</a>
-      <a href="/v1/annotated-source/coffee-script.html">The CoffeeScript Module — src/coffee-script</a>
-      <a href="/v1/annotated-source/cake.html">Cake &amp; Cakefiles — src/cake</a>
-      <a href="/v1/annotated-source/command.html">“coffee” Command-Line Utility — src/command</a>
-      <a href="/v1/annotated-source/optparse.html">Option Parsing — src/optparse</a>
-      <a href="/v1/annotated-source/repl.html">Interactive REPL — src/repl</a>
-      <a href="/v1/annotated-source/sourcemap.html">Source Maps — src/sourcemap</a>
+      <a href="annotated-source/grammar.html">Grammar Rules — src/grammar</a>
+      <a href="annotated-source/lexer.html">Lexing Tokens — src/lexer</a>
+      <a href="annotated-source/rewriter.html">The Rewriter — src/rewriter</a>
+      <a href="annotated-source/nodes.html">The Syntax Tree — src/nodes</a>
+      <a href="annotated-source/scope.html">Lexical Scope — src/scope</a>
+      <a href="annotated-source/helpers.html">Helpers &amp; Utility Functions — src/helpers</a>
+      <a href="annotated-source/coffee-script.html">The CoffeeScript Module — src/coffee-script</a>
+      <a href="annotated-source/cake.html">Cake &amp; Cakefiles — src/cake</a>
+      <a href="annotated-source/command.html">“coffee” Command-Line Utility — src/command</a>
+      <a href="annotated-source/optparse.html">Option Parsing — src/optparse</a>
+      <a href="annotated-source/repl.html">Interactive REPL — src/repl</a>
+      <a href="annotated-source/sourcemap.html">Source Maps — src/sourcemap</a>
    </div>
  </div>
 </div>
@@ -615,10 +615,10 @@ pre .xml .cdata {
    <p><strong>CoffeeScript is a little language that compiles into JavaScript.</strong> Underneath that awkward Java-esque patina, JavaScript has always had a gorgeous heart. CoffeeScript is an attempt to expose the good parts of JavaScript in a simple way.</p>
 <p>The golden rule of CoffeeScript is: <em>“It’s just JavaScript”</em>. The code compiles one-to-one into the equivalent JS, and there is no interpretation at runtime. You can use any existing JavaScript library seamlessly from CoffeeScript (and vice-versa). The compiled output is readable, pretty-printed, and tends to run as fast or faster than the equivalent handwritten JavaScript.</p>
 <p>The CoffeeScript compiler goes to great lengths to generate output JavaScript that runs in every JavaScript runtime, but there are exceptions. Use <a href="#generator-functions">generator functions</a>, <a href="#generator-iteration"><code>for…from</code></a>, or <a href="#tagged-template-literals">tagged template literals</a> only if you know that your <a href="http://kangax.github.io/compat-table/es6/">target runtimes can support them</a>. If you use <a href="#modules">modules</a>, you will need to <a href="#modules-note">use an additional tool to resolve them</a>.</p>
-<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/1.12.7">1.12.7</a></p>
+<p><strong>Latest 1.x Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/1.12.7">1.12.7</a></p>
 <blockquote class="uneditable-code-block"><pre><code class="language-bash">npm install -g coffeescript
 </code></pre>
-</blockquote><p><strong>CoffeeScript 2 is coming!</strong> It adds support for <a href="/v2/#classes">ES2015 classes</a>, <a href="/v2/#fat-arrow"><code>async</code>/<code>await</code></a>, <a href="/v2/#jsx">JSX</a>, <span class="nowrap"><a href="/v2/#splats">object rest/spread syntax</a></span>, and JavaScript generated using ES2015+ syntax. <a href="/v2/">Learn more</a>.</p>
+</blockquote><p><strong>Upgrade to CoffeeScript 2!</strong> It adds support for <a href="/#classes">ES2015 classes</a>, <a href="/#async-functions"><code>async</code>/<code>await</code></a>, <a href="/#jsx">JSX</a>, <span class="nowrap"><a href="/#splats">object rest/spread syntax</a></span>, and <a href="/#coffeescript-2">JavaScript generated using modern syntax</a>. <a href="/announcing-coffeescript-2/">Learn more</a>.</p>

    <h2>Overview</h2>
 <p><em>CoffeeScript on the left, compiled JavaScript output on the right.</em></p>
@@ -741,7 +741,7 @@ cubes = (function() {
 ;alert(cubes);">run: cubes</div><br class='clear' /></div>
  <span class="bookmark" id="installation"></span>
    <h2>Installation</h2>
-<p>The command-line version of <code>coffee</code> is available as a <a href="https://nodejs.org/">Node.js</a> utility. The <a href="/v1/browser-compiler/coffee-script.js">core compiler</a> however, does not depend on Node, and can be run in any JavaScript environment, or in the browser (see <a href="#try">Try CoffeeScript</a>).</p>
+<p>The command-line version of <code>coffee</code> is available as a <a href="https://nodejs.org/">Node.js</a> utility. The <a href="browser-compiler/coffee-script.js">core compiler</a> however, does not depend on Node, and can be run in any JavaScript environment, or in the browser (see <a href="#try">Try CoffeeScript</a>).</p>
 <p>To install, first make sure you have a working copy of the latest stable version of <a href="https://nodejs.org/">Node.js</a>. You can then install CoffeeScript globally with <a href="https://www.npmjs.com/">npm</a>:</p>
 <blockquote class="uneditable-code-block"><pre><code class="language-bash">npm install --global coffeescript
 </code></pre>
@@ -2441,7 +2441,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
  dir = options.output || <span class="string">'lib'</span>;
  <span class="keyword">return</span> fs.writeFile(dir + <span class="string">"/parser.js"</span>, code);
 });
-</code></pre><script>window.example1 = "fs = require 'fs'\n\noption '-o', '--output [DIR]', 'directory for compiled code'\n\ntask 'build:parser', 'rebuild the Jison parser', (options) ->\n  require 'jison'\n  code = require('./lib/grammar').parser.generate()\n  dir  = options.output or 'lib'\n  fs.writeFile \"#{dir}/parser.js\", code\n"</script><div class='minibutton load' onclick='javascript: loadConsole(example1);'>load</div><br class='clear' /></div><p>If you need to invoke one task before another — for example, running <code>build</code> before <code>test</code>, you can use the <code>invoke</code> function: <code>invoke 'build'</code>. Cake tasks are a minimal way to expose your CoffeeScript functions to the command line, so <a href="/v1/annotated-source/cake.html">don’t expect any fanciness built-in</a>. If you need dependencies, or async callbacks, it’s best to put them in your code itself — not the cake task.</p>
+</code></pre><script>window.example1 = "fs = require 'fs'\n\noption '-o', '--output [DIR]', 'directory for compiled code'\n\ntask 'build:parser', 'rebuild the Jison parser', (options) ->\n  require 'jison'\n  code = require('./lib/grammar').parser.generate()\n  dir  = options.output or 'lib'\n  fs.writeFile \"#{dir}/parser.js\", code\n"</script><div class='minibutton load' onclick='javascript: loadConsole(example1);'>load</div><br class='clear' /></div><p>If you need to invoke one task before another — for example, running <code>build</code> before <code>test</code>, you can use the <code>invoke</code> function: <code>invoke 'build'</code>. Cake tasks are a minimal way to expose your CoffeeScript functions to the command line, so <a href="annotated-source/cake.html">don’t expect any fanciness built-in</a>. If you need dependencies, or async callbacks, it’s best to put them in your code itself — not the cake task.</p>

  <span class="bookmark" id="source-maps"></span>
    <h2>Source Maps</h2>
@@ -2450,7 +2450,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t

  <span class="bookmark" id="scripts"></span>
    <h2>“text/coffeescript” Script Tags</h2>
-<p>While it’s not recommended for serious use, CoffeeScripts may be included directly within the browser using <code>&lt;script type=&quot;text/coffeescript&quot;&gt;</code> tags. The source includes a compressed and minified version of the compiler (<a href="/v1/browser-compiler/coffee-script.js">Download current version here, 51k when gzipped</a>) as <code>v1/browser-compiler/coffee-script.js</code>. Include this file on a page with inline CoffeeScript tags, and it will compile and evaluate them in order.</p>
+<p>While it’s not recommended for serious use, CoffeeScripts may be included directly within the browser using <code>&lt;script type=&quot;text/coffeescript&quot;&gt;</code> tags. The source includes a compressed and minified version of the compiler (<a href="browser-compiler/coffee-script.js">Download current version here, 51k when gzipped</a>) as <code>docs/v1/browser-compiler/coffee-script.js</code>. Include this file on a page with inline CoffeeScript tags, and it will compile and evaluate them in order.</p>
 <p>In fact, the little bit of glue script that runs “Try CoffeeScript” above, as well as the jQuery for the menu, is implemented in just this way. View source and look at the bottom of the page to see the example. Including the script also gives you access to <code>CoffeeScript.compile()</code> so you can pop open Firebug and try compiling some strings.</p>
 <p>The usual caveats about CoffeeScript apply — your inline scripts will run within a closure wrapper, so if you want to expose global variables or functions, attach them to the <code>window</code> object.</p>

@@ -2501,7 +2501,7 @@ Use <code>bin/coffee</code> to test your changes,<br>
 <p><code>git checkout lib &amp;&amp; bin/cake build:full</code> is a good command to run when you’re working on the core language. It’ll refresh the <code>lib</code> folder (in case you broke something), build your altered compiler, use that to rebuild itself (a good sanity test) and then run all of the tests. If they pass, there’s a good chance you’ve made a successful change.</p>
 </li>
 <li>
-<p><a href="/v1/test.html">Browser Tests</a><br>
+<p><a href="test.html">Browser Tests</a><br>
 Run CoffeeScript’s test suite in your current browser.</p>
 </li>
 <li>
@@ -2592,7 +2592,7 @@ The CoffeeScript logo is available in SVG for use in presentations.</p>
 <li>The browser compiler can once again be built unminified via <code>MINIFY=false cake build:browser</code>.</li>
 <li>The error-prone patched version of <code>Error.prepareStackTrace</code> has been removed.</li>
 <li>Command completion in the REPL (pressing tab to get suggestions) has been fixed for Node 6.9.1+.</li>
-<li>The <a href="/v1/test.html">browser-based tests</a> now include all the tests as the Node-based version.</li>
+<li>The <a href="test.html">browser-based tests</a> now include all the tests as the Node-based version.</li>
 </ul>
 <div class="anchor" id="1.12.1"></div>
 <h2 class="header">
@@ -2611,7 +2611,7 @@ The CoffeeScript logo is available in SVG for use in presentations.</p>
 <li>CoffeeScript now provides a <a href="#generator-iteration"><code>for…from</code></a> syntax for outputting ES2015 <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of"><code>for…of</code></a>. (Sorry they couldn’t match, but we came up with <code>for…of</code> first for something else.) This allows iterating over generators or any other iterable object. Note that using <code>for…from</code> in your code makes you responsible for ensuring that either your runtime supports <code>for…of</code> or that you transpile the output JavaScript further to a version your target runtime(s) support.</li>
 <li>Triple backticks (<code>```</code>) allow the creation of embedded JavaScript blocks where escaping single backticks is not required, which should improve interoperability with ES2015 template literals and with Markdown.</li>
 <li>Within single-backtick embedded JavaScript, backticks can now be escaped via <code>\`</code>.</li>
-<li>The browser tests now run in the browser again, and are accessible <a href="/v1/test.html">here</a> if you would like to test your browser.</li>
+<li>The browser tests now run in the browser again, and are accessible <a href="test.html">here</a> if you would like to test your browser.</li>
 <li>CoffeeScript-only keywords in ES2015 <code>import</code>s and <code>export</code>s are now ignored.</li>
 <li>The compiler now throws an error on trying to export an anonymous class.</li>
 <li>Bugfixes related to tokens and location data, for better source maps and improved compatibility with downstream tools.</li>
@@ -3016,7 +3016,7 @@ used to parse as <code>result = (i for i in list)</code> by default … it now p
  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.1...0.5.2">0.5.2</a>
  <span class="timestamp"> &mdash; <time datetime="2010-02-25">February 25, 2010</time></span>
 </h2><p>Added a compressed version of the compiler for inclusion in web pages as
-<code>/v1/browser-compiler/coffee-script.js</code>. It’ll automatically run any script tags with type <code>text/coffeescript</code> for you. Added a <code>--stdio</code> option to the <code>coffee</code> command, for piped-in compiles.</p>
+<code>browser-compiler/coffee-script.js</code>. It’ll automatically run any script tags with type <code>text/coffeescript</code> for you. Added a <code>--stdio</code> option to the <code>coffee</code> command, for piped-in compiles.</p>
 <div class="anchor" id="0.5.1"></div>
 <h2 class="header">
  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.0...0.5.1">0.5.1</a>
@@ -3222,7 +3222,7 @@ compileSource()
 </script>

 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-<script src="v1/browser-compiler/coffee-script.js"></script>
+<script src="browser-compiler/coffee-script.js"></script>

 </body>
 </html>
--- a/docs/v2/annotated-source/coffeescript.html
+++ b/docs/v2/annotated-source/coffeescript.html
@@ -293,9 +293,7 @@ doing programmatic lookups.</p>

            </div>
            
-            <div class="content"><div class='highlight'><pre>exports.compile = compile = withPrettyErrors (code, options) -&gt;
-  {merge, extend} = helpers
-  options = extend {}, options</pre></div></div>
+            <div class="content"><div class='highlight'><pre>exports.compile = compile = withPrettyErrors (code, options = {}) -&gt;</pre></div></div>
            
        </li>
        
@@ -306,6 +304,21 @@ doing programmatic lookups.</p>
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-11">&#182;</a>
              </div>
+              <p>Clone <code>options</code>, to avoid mutating the <code>options</code> object passed in.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  options = Object.assign {}, options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-12">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-12">&#182;</a>
+              </div>
              <p>Always generate a source map if no filename is passed in, since without a
 a filename we have no way to retrieve this source later in the event that
 we need to recompile it to get a source map for <code>prepareStackTrace</code>.</p>
@@ -326,11 +339,11 @@ we need to recompile it to get a source map for <code>prepareStackTrace</code>.<
        </li>
        
        
-        <li id="section-12">
+        <li id="section-13">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-12">&#182;</a>
+                <a class="pilcrow" href="#section-13">&#182;</a>
              </div>
              <p>Pass a list of referenced variables, so that generated variables won’t get
 the same name.</p>
@@ -344,11 +357,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-13">
+        <li id="section-14">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#182;</a>
              </div>
              <p>Check for import or export; if found, force bare mode.</p>

@@ -372,11 +385,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-14">
+        <li id="section-15">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
+                <a class="pilcrow" href="#section-15">&#182;</a>
              </div>
              <p>Update the sourcemap with data from each fragment.</p>

@@ -387,11 +400,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-15">
+        <li id="section-16">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
+                <a class="pilcrow" href="#section-16">&#182;</a>
              </div>
              <p>Do not include empty, whitespace, or semicolon-only fragments.</p>

@@ -412,11 +425,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-16">
+        <li id="section-17">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
+                <a class="pilcrow" href="#section-17">&#182;</a>
              </div>
              <p>Copy the code from each fragment into the final JavaScript.</p>

@@ -433,6 +446,64 @@ the same name.</p>
    sourceMaps[filename] ?= []
    sourceMaps[filename].push map

+  <span class="hljs-keyword">if</span> options.transpile
+    <span class="hljs-keyword">if</span> <span class="hljs-keyword">typeof</span> options.transpile <span class="hljs-keyword">isnt</span> <span class="hljs-string">'object'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-18">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-18">&#182;</a>
+              </div>
+              <p>This only happens if run via the Node API and <code>transpile</code> is set to
+something other than an object.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">'The transpile option must be given an object with options to pass to Babel'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-19">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-19">&#182;</a>
+              </div>
+              <p>Get the reference to Babel that we have been passed if this compiler
+is run via the CLI or Node API.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    transpiler = options.transpile.transpile
+    <span class="hljs-keyword">delete</span> options.transpile.transpile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-20">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-20">&#182;</a>
+              </div>
+              <p>See <a href="https://github.com/babel/babel/issues/827#issuecomment-77573107">https://github.com/babel/babel/issues/827#issuecomment-77573107</a>:
+Babel can take a v3 source map object as input in <code>inputSourceMap</code>
+and it will return an <em>updated</em> v3 source map object in its output.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">if</span> v3SourceMap <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> options.transpile.inputSourceMap?
+      options.transpile.inputSourceMap = v3SourceMap
+    transpilerOutput = transpiler js, options.transpile
+    js = transpilerOutput.code
+    <span class="hljs-keyword">if</span> v3SourceMap <span class="hljs-keyword">and</span> transpilerOutput.map
+      v3SourceMap = transpilerOutput.map
+
  <span class="hljs-keyword">if</span> options.inlineMap
    encoded = base64encode JSON.stringify v3SourceMap
    sourceMapDataURI = <span class="hljs-string">"//# sourceMappingURL=data:application/json;base64,<span class="hljs-subst">#{encoded}</span>"</span>
@@ -451,11 +522,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-17">
+        <li id="section-21">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-17">&#182;</a>
+                <a class="pilcrow" href="#section-21">&#182;</a>
              </div>
              <p>Tokenize a string of CoffeeScript code, and return the array of tokens.</p>

@@ -467,11 +538,11 @@ the same name.</p>
        </li>
        
        
-        <li id="section-18">
+        <li id="section-22">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
+                <a class="pilcrow" href="#section-22">&#182;</a>
              </div>
              <p>Parse a string of CoffeeScript code or an array of lexed tokens, and
 return the AST. You can then compile it by calling <code>.compile()</code> on the root,
@@ -488,11 +559,11 @@ or traverse it by using <code>.traverseChildren()</code> with a callback.</p>
        </li>
        
        
-        <li id="section-19">
+        <li id="section-23">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#182;</a>
+                <a class="pilcrow" href="#section-23">&#182;</a>
              </div>
              <p>This file used to export these methods; leave stubs that throw warnings
 instead. These methods have been moved into <code>index.coffee</code> to provide
@@ -508,11 +579,11 @@ environment.</p>
        </li>
        
        
-        <li id="section-20">
+        <li id="section-24">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-20">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
              </div>
              <p>Instantiate a Lexer for our use here.</p>

@@ -523,11 +594,11 @@ environment.</p>
        </li>
        
        
-        <li id="section-21">
+        <li id="section-25">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-21">&#182;</a>
+                <a class="pilcrow" href="#section-25">&#182;</a>
              </div>
              <p>The real Lexer produces a generic stream of tokens. This object provides a
 thin wrapper around it, compatible with the Jison API. We can then pass it
@@ -553,11 +624,11 @@ directly as a “Jison lexer”.</p>
        </li>
        
        
-        <li id="section-22">
+        <li id="section-26">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
+                <a class="pilcrow" href="#section-26">&#182;</a>
              </div>
              <p>Make all the AST nodes visible to the parser.</p>

@@ -568,11 +639,11 @@ directly as a “Jison lexer”.</p>
        </li>
        
        
-        <li id="section-23">
+        <li id="section-27">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
+                <a class="pilcrow" href="#section-27">&#182;</a>
              </div>
              <p>Override Jison’s default error handling function.</p>

@@ -583,11 +654,11 @@ directly as a “Jison lexer”.</p>
        </li>
        
        
-        <li id="section-24">
+        <li id="section-28">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
+                <a class="pilcrow" href="#section-28">&#182;</a>
              </div>
              <p>Disregard Jison’s message, it contains redundant line number information.
 Disregard the token, we take its value directly from the lexer in case
@@ -611,11 +682,11 @@ the error is caused by a generated token which might refer to its origin.</p>
        </li>
        
        
-        <li id="section-25">
+        <li id="section-29">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
+                <a class="pilcrow" href="#section-29">&#182;</a>
              </div>
              <p>The second argument has a <code>loc</code> property, which should have the location
 data for this token. Unfortunately, Jison seems to send an outdated <code>loc</code>
@@ -629,11 +700,11 @@ from the lexer.</p>
        </li>
        
        
-        <li id="section-26">
+        <li id="section-30">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
+                <a class="pilcrow" href="#section-30">&#182;</a>
              </div>
              <p>Based on <a href="http://v8.googlecode.com/svn/branches/bleeding_edge/src/messages.js">http://v8.googlecode.com/svn/branches/bleeding_edge/src/messages.js</a>
 Modified to handle sourceMap</p>
@@ -661,11 +732,11 @@ Modified to handle sourceMap</p>
        </li>
        
        
-        <li id="section-27">
+        <li id="section-31">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#182;</a>
+                <a class="pilcrow" href="#section-31">&#182;</a>
              </div>
              <p>Check for a sourceMap position</p>

@@ -708,11 +779,11 @@ Modified to handle sourceMap</p>
        </li>
        
        
-        <li id="section-28">
+        <li id="section-32">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-28">&#182;</a>
+                <a class="pilcrow" href="#section-32">&#182;</a>
              </div>
              <p>Skip files that we didn’t compile, like Node system files that appear in
 the stack trace, as they never have source maps.</p>
@@ -727,11 +798,11 @@ the stack trace, as they never have source maps.</p>
        </li>
        
        
-        <li id="section-29">
+        <li id="section-33">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-29">&#182;</a>
+                <a class="pilcrow" href="#section-33">&#182;</a>
              </div>
              <p>CoffeeScript compiled in a browser or via <code>CoffeeScript.compile</code> or <code>.run</code>
 may get compiled with <code>options.filename</code> that’s missing, which becomes
@@ -746,11 +817,11 @@ filename of the script file. See if we have a source map cached under
        </li>
        
        
-        <li id="section-30">
+        <li id="section-34">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-30">&#182;</a>
+                <a class="pilcrow" href="#section-34">&#182;</a>
              </div>
              <p>Work backwards from the most recent anonymous source maps, until we find
 one that works. This isn’t foolproof; there is a chance that multiple
@@ -767,11 +838,11 @@ and it’s not foolproof either.</p>
        </li>
        
        
-        <li id="section-31">
+        <li id="section-35">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-31">&#182;</a>
+                <a class="pilcrow" href="#section-35">&#182;</a>
              </div>
              <p>If all else fails, recompile this source to get a source map. We need the
 previous section (for <code>&lt;anonymous&gt;</code>) despite this option, because after it
@@ -794,11 +865,11 @@ time the source map we want is the last one.</p>
        </li>
        
        
-        <li id="section-32">
+        <li id="section-36">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-32">&#182;</a>
+                <a class="pilcrow" href="#section-36">&#182;</a>
              </div>
              <p>Based on <a href="http://goo.gl/ZTx1p">michaelficarra/CoffeeScriptRedux</a>
 NodeJS / V8 have no support for transforming positions in stack traces using
--- a/docs/v2/annotated-source/command.html
+++ b/docs/v2/annotated-source/command.html
@@ -215,7 +215,8 @@ useWinPathSep  = path.sep <span class="hljs-keyword">is</span> <span class="hljs
  [<span class="hljs-string">'-r'</span>, <span class="hljs-string">'--require [MODULE*]'</span>, <span class="hljs-string">'require the given module before eval or REPL'</span>]
  [<span class="hljs-string">'-s'</span>, <span class="hljs-string">'--stdio'</span>,             <span class="hljs-string">'listen for and compile scripts over stdio'</span>]
  [<span class="hljs-string">'-l'</span>, <span class="hljs-string">'--literate'</span>,          <span class="hljs-string">'treat stdio as literate style coffeescript'</span>]
-  [<span class="hljs-string">'-t'</span>, <span class="hljs-string">'--tokens'</span>,            <span class="hljs-string">'print out the tokens that the lexer/rewriter produce'</span>]
+  [<span class="hljs-string">'-t'</span>, <span class="hljs-string">'--transpile'</span>,         <span class="hljs-string">'pipe generated JavaScript through Babel'</span>]
+  [      <span class="hljs-string">'--tokens'</span>,            <span class="hljs-string">'print out the tokens that the lexer/rewriter produce'</span>]
  [<span class="hljs-string">'-v'</span>, <span class="hljs-string">'--version'</span>,           <span class="hljs-string">'display the version number'</span>]
  [<span class="hljs-string">'-w'</span>, <span class="hljs-string">'--watch'</span>,             <span class="hljs-string">'watch scripts for changes and rerun commands'</span>]
 ]</pre></div></div>
@@ -849,14 +850,129 @@ same directory as the <code>.js</code> file.</p>
            </div>
            
            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">compileOptions</span> = <span class="hljs-params">(filename, base)</span> -&gt;</span>
-  answer = {
-    filename
+  <span class="hljs-keyword">if</span> opts.transpile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-26">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-26">&#182;</a>
+              </div>
+              <p>The user has requested that the CoffeeScript compiler also transpile
+via Babel. We use Babel as an <code>optionalDependency</code>; see
+<a href="https://docs.npmjs.com/files/package.json#optionaldependencies">https://docs.npmjs.com/files/package.json#optionaldependencies</a>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">try</span>
+      <span class="hljs-built_in">require</span> <span class="hljs-string">'babel-core'</span>
+    <span class="hljs-keyword">catch</span>
+      <span class="hljs-built_in">console</span>.error <span class="hljs-string">'''
+        To use --transpile, you must have Babel installed and configured.
+        See http://coffeescript.org/#transpilation
+      '''</span>
+      process.exit <span class="hljs-number">1</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-27">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-27">&#182;</a>
+              </div>
+              <p>We’re giving Babel only a string, not a filename or path to a file, so
+it doesn’t know where to search to find a <code>.babelrc</code> file or a <code>babel</code>
+key in a <code>package.json</code>. So if <code>opts.transpile</code> is an object, use that
+as Babel’s options; otherwise figure out what the options should be.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">unless</span> <span class="hljs-keyword">typeof</span> opts.transpile <span class="hljs-keyword">is</span> <span class="hljs-string">'object'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-28">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-28">&#182;</a>
+              </div>
+              <p>Find the options based on the path to the file being compiled.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">      <span class="hljs-title">cantFindOptions</span> = -&gt;</span>
+        <span class="hljs-built_in">console</span>.error <span class="hljs-string">'''
+          To use the transpile option, there must be a .babelrc file
+          (or a package.json file with a "babel" key) in the path of the file
+          to be compiled, or in the path of the current working directory.
+          If you are compiling a string via the Node API, the transpile option
+          must be an object with the options to pass to Babel.
+          See http://coffeescript.org/#transpilation
+        '''</span>
+        process.exit <span class="hljs-number">1</span>
+
+      checkPath = <span class="hljs-keyword">if</span> filename
+        path.dirname filename
+      <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> base
+        base
+      <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> process?
+        process.cwd()
+      <span class="hljs-keyword">else</span>
+        cantFindOptions()
+
+      <span class="hljs-keyword">loop</span>
+        <span class="hljs-keyword">try</span>
+          opts.transpile = JSON.parse fs.readFileSync path.join(checkPath, <span class="hljs-string">'.babelrc'</span>), <span class="hljs-string">'utf-8'</span>
+          <span class="hljs-keyword">break</span>
+        <span class="hljs-keyword">catch</span>
+          <span class="hljs-keyword">try</span>
+            packageJson = JSON.parse fs.readFileSync(path.join(checkPath, <span class="hljs-string">'package.json'</span>), <span class="hljs-string">'utf-8'</span>)
+            <span class="hljs-keyword">if</span> packageJson.babel?
+              opts.transpile = packageJson.babel
+              <span class="hljs-keyword">break</span>
+
+        <span class="hljs-keyword">if</span> checkPath <span class="hljs-keyword">is</span> path.dirname checkPath <span class="hljs-comment"># We’ve reached the root.</span>
+          cantFindOptions()
+          <span class="hljs-keyword">break</span>
+        <span class="hljs-keyword">else</span>
+          checkPath = path.dirname checkPath</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-29">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-29">&#182;</a>
+              </div>
+              <p>Pass a reference to Babel into the compiler, so that the transpile option
+is available for the CLI. We need to do this so that tools like Webpack
+can <code>require(&#39;coffeescript&#39;)</code> and build correctly, without trying to
+require Babel.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    opts.transpile.transpile = CoffeeScript.transpile
+  <span class="hljs-keyword">else</span>
+    opts.transpile = <span class="hljs-literal">no</span>
+
+  answer =
+    filename: filename
    literate: opts.literate <span class="hljs-keyword">or</span> helpers.isLiterate(filename)
    bare: opts.bare
    header: opts.compile <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> opts[<span class="hljs-string">'no-header'</span>]
+    transpile: opts.transpile
    sourceMap: opts.map
    inlineMap: opts[<span class="hljs-string">'inline-map'</span>]
-  }
+
  <span class="hljs-keyword">if</span> filename
    <span class="hljs-keyword">if</span> base
      cwd = process.cwd()
@@ -878,11 +994,11 @@ same directory as the <code>.js</code> file.</p>
        </li>
        
        
-        <li id="section-26">
+        <li id="section-30">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
+                <a class="pilcrow" href="#section-30">&#182;</a>
              </div>
              <p>Start up a new Node.js instance with the arguments in <code>--nodejs</code> passed to
 the <code>node</code> binary, preserving the other options.</p>
@@ -905,11 +1021,11 @@ the <code>node</code> binary, preserving the other options.</p>
        </li>
        
        
-        <li id="section-27">
+        <li id="section-31">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#182;</a>
+                <a class="pilcrow" href="#section-31">&#182;</a>
              </div>
              <p>Print the <code>--help</code> usage message and exit. Deprecated switches are not
 shown.</p>
@@ -922,11 +1038,11 @@ shown.</p>
        </li>
        
        
-        <li id="section-28">
+        <li id="section-32">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-28">&#182;</a>
+                <a class="pilcrow" href="#section-32">&#182;</a>
              </div>
              <p>Print the <code>--version</code> message and exit.</p>

--- a/docs/v2/annotated-source/index.html
+++ b/docs/v2/annotated-source/index.html
@@ -125,7 +125,11 @@ vm            = <span class="hljs-built_in">require</span> <span class="hljs-str
 path          = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span>

 helpers       = CoffeeScript.helpers
-compile       = CoffeeScript.compile</pre></div></div>
+
+CoffeeScript.transpile = <span class="hljs-function"><span class="hljs-params">(js, options)</span> -&gt;</span>
+  <span class="hljs-keyword">try</span>
+    babel = <span class="hljs-built_in">require</span> <span class="hljs-string">'babel-core'</span>
+  <span class="hljs-keyword">catch</span></pre></div></div>
            
        </li>
        
@@ -136,6 +140,73 @@ compile       = CoffeeScript.compile</pre></div></div>
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-2">&#182;</a>
              </div>
+              <p>This error is only for Node, as CLI users will see a different error
+earlier if they don’t have Babel installed.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">'To use the transpile option, you must have the \'babel-core\' module installed'</span>
+  babel.transform js, options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-3">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-3">&#182;</a>
+              </div>
+              <p>The <code>compile</code> method shared by the CLI, Node and browser APIs.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>universalCompile = CoffeeScript.compile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-4">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-4">&#182;</a>
+              </div>
+              <p>The <code>compile</code> method particular to the Node API.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>CoffeeScript.compile = <span class="hljs-function"><span class="hljs-params">(code, options)</span> -&gt;</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-5">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-5">&#182;</a>
+              </div>
+              <p>Pass a reference to Babel into the compiler, so that the transpile option
+is available in the Node API. We need to do this so that tools like Webpack
+can <code>require(&#39;coffeescript&#39;)</code> and build correctly, without trying to
+require Babel.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> options?.transpile
+    options.transpile.transpile = CoffeeScript.transpile
+  universalCompile.call CoffeeScript, code, options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-6">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-6">&#182;</a>
+              </div>
              <p>Compile and execute a string of CoffeeScript (on the server), correctly
 setting <code>__filename</code>, <code>__dirname</code>, and relative <code>require()</code>.</p>

@@ -147,11 +218,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-3">
+        <li id="section-7">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-3">&#182;</a>
+                <a class="pilcrow" href="#section-7">&#182;</a>
              </div>
              <p>Set the filename.</p>

@@ -163,11 +234,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-4">
+        <li id="section-8">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-4">&#182;</a>
+                <a class="pilcrow" href="#section-8">&#182;</a>
              </div>
              <p>Clear the module cache.</p>

@@ -178,11 +249,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-5">
+        <li id="section-9">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-5">&#182;</a>
+                <a class="pilcrow" href="#section-9">&#182;</a>
              </div>
              <p>Assign paths for node_modules loading</p>

@@ -197,18 +268,18 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-6">
+        <li id="section-10">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-6">&#182;</a>
+                <a class="pilcrow" href="#section-10">&#182;</a>
              </div>
              <p>Compile.</p>

            </div>
            
            <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> helpers.isCoffee(mainModule.filename) <span class="hljs-keyword">or</span> <span class="hljs-built_in">require</span>.extensions
-    answer = compile code, options
+    answer = CoffeeScript.compile code, options
    code = answer.js ? answer

  mainModule._compile code, mainModule.filename</pre></div></div>
@@ -216,11 +287,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-7">
+        <li id="section-11">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-7">&#182;</a>
+                <a class="pilcrow" href="#section-11">&#182;</a>
              </div>
              <p>Compile and evaluate a string of CoffeeScript (in a Node.js-like environment).
 The CoffeeScript REPL uses this to run the input.</p>
@@ -250,11 +321,11 @@ The CoffeeScript REPL uses this to run the input.</p>
        </li>
        
        
-        <li id="section-8">
+        <li id="section-12">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-8">&#182;</a>
+                <a class="pilcrow" href="#section-12">&#182;</a>
              </div>
              <p>define module/require only if they chose not to specify their own</p>

@@ -271,11 +342,11 @@ The CoffeeScript REPL uses this to run the input.</p>
        </li>
        
        
-        <li id="section-9">
+        <li id="section-13">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-9">&#182;</a>
+                <a class="pilcrow" href="#section-13">&#182;</a>
              </div>
              <p>use the same hack node currently uses for their own REPL</p>

@@ -286,7 +357,7 @@ The CoffeeScript REPL uses this to run the input.</p>
  o = {}
  o[k] = v <span class="hljs-keyword">for</span> own k, v <span class="hljs-keyword">of</span> options
  o.bare = <span class="hljs-literal">on</span> <span class="hljs-comment"># ensure return value</span>
-  js = compile code, o
+  js = CoffeeScript.compile code, o
  <span class="hljs-keyword">if</span> sandbox <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
    vm.runInThisContext js
  <span class="hljs-keyword">else</span>
@@ -297,11 +368,11 @@ CoffeeScript.register = <span class="hljs-function">-&gt;</span> <span class="hl
        </li>
        
        
-        <li id="section-10">
+        <li id="section-14">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-10">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#182;</a>
              </div>
              <p>Throw error with deprecation warning when depending upon implicit <code>require.extensions</code> registration</p>

@@ -320,11 +391,11 @@ CoffeeScript._compileFile = <span class="hljs-function"><span class="hljs-params
        </li>
        
        
-        <li id="section-11">
+        <li id="section-15">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-11">&#182;</a>
+                <a class="pilcrow" href="#section-15">&#182;</a>
              </div>
              <p>Strip the Unicode byte order mark, if this file begins with one.</p>

@@ -333,7 +404,7 @@ CoffeeScript._compileFile = <span class="hljs-function"><span class="hljs-params
            <div class="content"><div class='highlight'><pre>  stripped = <span class="hljs-keyword">if</span> raw.charCodeAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">is</span> <span class="hljs-number">0xFEFF</span> <span class="hljs-keyword">then</span> raw.substring <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> raw

  <span class="hljs-keyword">try</span>
-    answer = compile stripped, {
+    answer = CoffeeScript.compile stripped, {
      filename, sourceMap, inlineMap
      sourceFiles: [filename]
      literate: helpers.isLiterate filename
@@ -343,11 +414,11 @@ CoffeeScript._compileFile = <span class="hljs-function"><span class="hljs-params
        </li>
        
        
-        <li id="section-12">
+        <li id="section-16">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-12">&#182;</a>
+                <a class="pilcrow" href="#section-16">&#182;</a>
              </div>
              <p>As the filename and code of a dynamically loaded file will be different
 from the original file compiled with CoffeeScript.run, add that
--- a/docs/v2/annotated-source/nodes.html
+++ b/docs/v2/annotated-source/nodes.html
--- a/docs/v2/annotated-source/public/fonts/roboto-black.eot
+++ b/docs/v2/annotated-source/public/fonts/roboto-black.eot
--- a/docs/v2/annotated-source/public/fonts/roboto-black.ttf
+++ b/docs/v2/annotated-source/public/fonts/roboto-black.ttf
--- a/docs/v2/annotated-source/public/fonts/roboto-black.woff
+++ b/docs/v2/annotated-source/public/fonts/roboto-black.woff
--- a/docs/v2/annotated-source/sourcemap.html
+++ b/docs/v2/annotated-source/sourcemap.html
@@ -385,7 +385,7 @@ column for the current line:</p>
      names:      []
      mappings:   buffer

-    v3.sourcesContent = [code] <span class="hljs-keyword">if</span> options.inlineMap
+    v3.sourcesContent = [code] <span class="hljs-keyword">if</span> options.sourceMap <span class="hljs-keyword">or</span> options.inlineMap

    v3</pre></div></div>
            
--- a/docs/v2/announcing-coffeescript-2/index.html
+++ b/docs/v2/announcing-coffeescript-2/index.html
@@ -0,0 +1,351 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+<title>Announcing CoffeeScript 2</title>
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="canonical" href="http://coffeescript.org" />
+
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+<link rel="manifest" href="/manifest.json">
+<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+<meta name="theme-color" content="#ffffff">
+
+<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+<link href="https://fonts.googleapis.com/css?family=Alegreya+Sans:400,800|Galada:400|Lato:300,300i,400,700|Roboto+Mono:400,400i" rel="stylesheet" crossorigin="anonymous">
+<style>
+body {
+  /* Push below header bar */
+  margin-top: 3.5rem;
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 3"><path opacity=".02" fill="#000" d="M0 0h1v1H0z"/><path opacity=".005" fill="#000" d="M0 1h1v2H0z"/></svg>');
+  background-size: 1px 3px;
+}
+
+svg {
+  width: auto;
+  height: 100%;
+}
+
+a {
+  color: #1b5e20;
+  transition: 0.1s ease-in-out;
+}
+a:focus, a:hover, a:active {
+  color: #388e3c;
+  cursor: pointer;
+  text-decoration: none;
+}
+
+button:focus, .navbar-dark .navbar-toggler:focus {
+  outline: none;
+  border: thin solid rgba(248, 243, 240, 0.3);
+}
+
+.bg-dark {
+  background-color: #3e2723 !important;
+}
+
+.bg-ribbed-light {
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 3"><path opacity=".03" fill="#000" d="M0 0h1v1H0z"/><path opacity=".005" fill="#000" d="M0 1h1v2H0z"/></svg>');
+  background-size: 1px 3px;
+}
+.bg-ribbed-dark {
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 3"><path opacity=".2" fill="#000" d="M0 0h1v1H0z"/><path opacity=".15" fill="#000" d="M0 1h1v2H0z"/></svg>');
+  background-size: 1px 3px;
+}
+
+
+/*
+ * Header
+ */
+.site-navbar {
+  height: 3.5rem;
+  font-family: 'Lato';
+  font-weight: 400;
+  font-size: 1.1em;
+}
+
+.navbar-brand {
+  height: 2.2em;
+  margin-right: 1em;
+}
+
+.navbar-dark path {
+  fill: #fff;
+}
+
+.navbar-nav .nav-item {
+  margin-left: 0.6em;
+  margin-right: 0.6em;
+  border-radius: 0.4em;
+}
+.navbar-nav .nav-item:hover,
+.navbar-nav .nav-item:active,
+.navbar-nav .nav-item.show {
+  background-color: #4e342e;
+}
+
+.navbar-toggler {
+  transition: all 0.1s ease-in-out;
+}
+
+
+/*
+ * Main content
+ */
+
+.main {
+  padding: 1.3em;
+}
+@media (min-width: 992px) {
+  .main {
+    padding-right: 2em;
+    padding-left: 2em;
+  }
+}
+
+h1 {
+  font: 2.5em Galada;
+  color: #2f2625;
+  text-align: center;
+}
+@media (min-width: 768px) {
+  h1 {
+    font-size: 3em;
+  }
+}
+@media (min-width: 992px) {
+  h1 {
+    font-size: 4em;
+  }
+}
+
+.title-logo {
+  display: inline-block;
+  height: 1em;
+  transform: translateY(0.2em);
+  margin-left: 0.3em;
+  margin-right: 0.25em;
+  fill: #2f2625;
+}
+
+.main p, .main li {
+  font-family: Lato;
+  font-weight: 300;
+  font-size: 1.1em;
+  line-height: 1.6;
+}
+.main blockquote {
+  font-size: 1.1em;
+}
+@media (min-width: 768px) {
+  .main p, .main li {
+    font-size: 1.3em;
+  }
+  .main blockquote {
+    font-size: 1.3em;
+  }
+}
+.main strong {
+  font-weight: 700;
+}
+.main a {
+  border-bottom: 2px solid transparent;
+  font-weight: 400;
+}
+.main a:focus, .main a:hover, .main a:active {
+  border-bottom: 2px solid rgba(56, 142, 60, 0.2);
+}
+.main blockquote pre {
+  background-color: #f8f3f0;
+  color: #2f2625;
+  border-radius: .3em;
+  padding: 0.4em 0.6em;
+}
+
+p, blockquote, li {
+  margin-bottom: 1.3rem;
+}
+.credits li {
+  margin-bottom: 0.3em;
+}
+
+h2, h3, h4 {
+  margin-top: 1.3em;
+  margin-bottom: 0.6em;
+  font-family: 'Alegreya Sans';
+}
+h2 {
+  font-weight: 800;
+}
+h3, h4, h2 time {
+  font-weight: 400;
+}
+
+.main h2 {
+  padding-top: 4rem;
+  margin-top: -4rem;
+}
+
+code {
+  font-family: 'Roboto Mono';
+  font-weight: 400;
+}
+code, a > code {
+  background-color: #f8f3f0;
+  padding: 0.2rem 0.4rem;
+}
+code {
+  color: #2f2625;
+}
+
+
+.uneditable-code-block .comment {
+  font-style: italic;
+  color: #837B85;
+}
+.uneditable-code-block .class,
+.uneditable-code-block .function,
+.uneditable-code-block .keyword,
+.uneditable-code-block .reserved,
+.uneditable-code-block .title {
+  color: #534328;
+}
+.uneditable-code-block .string
+.uneditable-code-block .value
+.uneditable-code-block .inheritance
+.uneditable-code-block .header {
+  color: #3A4029;
+}
+.uneditable-code-block .variable,
+.uneditable-code-block .literal,
+.uneditable-code-block .tag,
+.uneditable-code-block .regexp,
+.uneditable-code-block .subst,
+.uneditable-code-block .property {
+  color: #474429;
+}
+.uneditable-code-block .number,
+.uneditable-code-block .preprocessor,
+.uneditable-code-block .built_in,
+.uneditable-code-block .params,
+.uneditable-code-block .constant {
+  color: #474429;
+}
+</style>
+
+</head>
+<body>
+
+<nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-dark bg-ribbed-dark site-navbar">
+  <a class="navbar-brand" href="/" data-close="try"><svg xmlns="http://www.w3.org/2000/svg" viewBox="-22 347 566 100">
+  <title>
+    CoffeeScript Logo
+  </title>
+  <path d="M21.7 351.1c.1.6-.2 1.1-1.2 1.6-1.3-.7-4.1-1.1-6.4-.9-2.5.2-4.6 1-4.3 2.7.4 1.7 2.8 2.7 7.1 2.3 10.5-.9 10.4-8 25.8-9.4 12-1.1 18.7 2.6 19.6 7.1.7 3.5-2.2 6.9-10.9 7.6-7.7.7-12.2-1.4-12.6-3.5-.2-1.1.4-2.7 4.1-3.1.4 1.7 2.5 3.5 7.5 3 3.6-.3 6.6-1.6 6.2-3.6-.4-2.1-4.2-3.3-10.2-2.8-12.2 1.1-15.2 7.8-25.6 8.7-7.4.7-13.4-2-14.2-6-.3-1.5-.3-5 7.5-5.7 4-.3 7.2.4 7.6 2zm-39 41.8c-3.4 4.3-4.9 9.3-4.6 14.2.3 4.9 2.7 8.9 6.5 12 4 3.1 8.3 4 13.2 3.1 1.9-.3 4-1.3 5.9-1.9-4 0-7.4-1.3-10.8-4-3.7-2.7-6.2-6.5-6.8-11.1-.9-4.3 0-8.3 2.4-11.8 2.7-3.4 6.2-5.3 10.8-5.9 4.6-.3 8.6.9 12.6 3.7-.9-1.3-2.2-2.2-3.4-3.4-4-2.7-8.3-4-13.6-2.7-4.8 1-8.8 3.5-12.2 7.8zm53.6-23.1c-12.9 0-24.4-1.3-32.7-3.1-8.9-2.2-13.6-4.6-13.6-7.7 0-1.3.6-2.4 2.4-3.7-5.6 2.2-8.6 4-8.6 6.8.3 3.1 5.3 6.2 15.5 8.6 9.6 2.4 21.9 3.7 36.7 3.7 15.1 0 27.1-1.3 36.7-3.7 10.2-2.4 15.1-5.6 15.1-8.6 0-2.2-2.2-4.3-6.2-5.9.9.6 1.6 1.6 1.6 2.7 0 3.1-4.6 5.6-13.9 7.7-8.6 1.9-19.6 3.2-33 3.2zm36.8 8.6c-9.6 2.2-21.9 3.7-36.7 3.7-15.1 0-27.4-1.6-37-3.7-8.6-2.2-13.2-4.6-14.8-7.1 1.6 10.8 5.3 21 10.2 30 3.7 5.6 7.4 10.5 11.1 15.8 1.6 3.1 2.7 6.2 3.4 9.3 2.4 3.4 5.9 5.6 10.2 6.8 5.3 1.9 10.8 2.7 16.4 2.4h.6c5.6.3 11.5-.6 16.9-2.4 4-1.3 7.4-3.4 9.9-6.8h.3c.6-3.1 1.6-6.2 3.1-9.3 3.7-5.3 7.4-10.2 11.1-15.8 4.9-8.9 8.3-19.1 10.2-30-2 2.8-6.6 5.2-14.9 7.1zm106.2 30.1c-4.8 12.1-17.6 16.9-25.9 16.9-13.4 0-19.9-6-19.9-22.3 0-16.5 7.9-47.3 31.7-47.3 8.5 0 15.2 3.3 15.2 12.1 0 4.8-1.8 8.3-6.4 8.3-1.5 0-3.4-.4-5.2-2.4 2.2-1.1 4.2-4.9 4.2-8.3 0-2.9-1.5-5.6-5.6-5.6-10 0-18.9 23.9-18.9 42.4 0 8.3 2.2 14.2 10.9 14.2 7.1 0 13.5-3.4 17.7-9.1l2.2 1.1zm32.9-16.3c.4.2.7.2 1 .2 4.2 0 10.1-2.7 14-5.5l.8 2.4c-3.4 3.7-9.5 6.5-16.1 7.5-1.5 16.8-10.6 27.3-21.7 27.3-8.4 0-14.5-4-14.5-14.4 0-10.5 6.2-32.2 24.9-32.2 7.8.3 11.6 5.3 11.6 14.7zm-7.7 5c-1.9-.5-2.4-2-2.4-3.8 0-2.5 1.2-4.2 2.8-4.9-.2-3.8-1.1-5.3-3.4-5.3-6.5 0-12 16.6-12 25.6 0 6 1.2 7.3 4.6 7.3 4.2.1 8.9-8 10.4-18.9zm-6.6 39.7c0-8.3 7.1-11 15.8-13.6l10.9-51.9c2.7-13 10.6-15.5 16.5-15.5 4.1 0 8 2.2 9.7 5.7 3.6-4.6 8.4-5.7 12.4-5.7 5.6 0 10.8 3.9 10.8 9.8 0 1.5-.1 2.6-.3 3.7h-4.3c.1-.9.2-1.7.2-2.4 0-2.1-1.7-3.1-3.4-3.1-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9.1l-.8 3.6h-9l-10.3 49.1c-2.7 13-10.6 15.5-16.5 15.5-5.2 0-8.3-2.3-9.8-5.7-3.5 4.6-8.3 5.7-12.3 5.7-5.6.1-10.8-3.8-10.8-9.7zm9.1 1.8c1.9 0 4.2-1.8 5.4-7.1l1.1-5.3c-5.7 2-10.1 4.4-10.1 9.4 0 1.2 1.7 3 3.6 3zm21.7 0c1.9 0 4.2-1.8 5.4-7.1l2.2-10.4-9.4 1.8-1.8 8.3c-.5 2.1-1.1 4-1.8 5.6.9 1.3 3 1.8 5.4 1.8zm-1.4-18l9.4-1.7 7.7-36.8h-9l-8.1 38.5zm16.6-56.7c-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9l2.1-9.5c.2-.7.2-1.3.2-2 .1-2-1.5-3-3.4-3zm37.9 53c7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.5-10 18.5-20.9 19.2-.1 1.3-.2 2.5-.2 3.6 0 6.2 2.2 7.7 6.5 7.7zm5.3-34.4c-4.6 0-9.1 9.7-10.9 18.7 7-.5 13.2-7.4 13.2-15 0-2.2-.5-3.7-2.3-3.7zm28.6 33.4c3.4 0 7.8-2.3 10.8-4.8-2 10.4-8.4 13.4-15.8 13.4-8.4 0-14.1-4.2-14.1-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.6-10 18.5-20.9 19.2-.1.9-.2 2-.2 2.7 0 5.7 2.5 7.6 5.6 7.6zm6.2-33.4c-4.5 0-9.1 10.1-11 18.7 7.1-.4 13.3-7.3 13.3-15 0-2.2-.6-3.7-2.3-3.7zm51.3-6.7c-1.7 0-3-.6-4.2-1.9 2.4-1.5 4.1-4.8 4.1-7.8 0-3.1-1.8-6.1-6.8-6.1s-8.3 2.8-8.3 8.2c0 13.3 20.5 15.2 20.5 34.8 0 15.3-12.3 22.7-25.6 22.7-10.4 0-19.3-4.5-19.3-15.7 0-9.8 7-14.9 13.3-14.9 3.1 0 7.7 1.3 8 6-4.9 0-10.7 2.3-10.7 8.5 0 4.5 2.9 8.7 8.7 8.7 6.1 0 10.6-4.4 10.6-12 0-15.6-18.6-21.1-18.6-34.5 0-9.5 9.3-16.3 21-16.3 4.3 0 14.6.9 14.6 10.9.1 5.5-2.8 9.4-7.3 9.4zm36.2 10.3c0-2.3-.8-3.7-2.5-3.7-5.7 0-11.7 16.6-11.7 26.7 0 6.2 2.2 7.6 6.6 7.6 7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.6 6-32.3 24.5-32.3 8.1 0 10.1 4.2 10.1 8.3 0 4.4-2.2 6.7-4.8 6.7-1 0-2.1-.4-3.1-1.1.5-1.9.9-3.6.9-5.3zm27.7-7.6l-1.2 5.7c3.1-2.7 6.7-5.7 11-5.7 4.1 0 6.3 3.3 6.3 6.9 0 3.1-2.1 6.7-6.6 6.7-5.1 0-2.5-6-5.3-6-2.7 0-4.4 1.4-6.7 3.4l-7.2 34.6h-13.1l9.6-45.4 13.2-.2zm34.2 0l-6.6 30.9c-.3 1.2-.4 2.1-.4 2.9 0 2.5 1.2 3.3 3.7 3.3 3.5 0 6.9-3.4 8.1-8h3.8c-5.2 14.8-14.2 16.8-19.1 16.8-5.5 0-9.7-3.2-9.7-10.9 0-1.8.3-3.7.7-5.9l6.2-29.2 13.3.1zm-4.1-19.4c4 0 7.2 3.2 7.2 7.2s-3.2 7.1-7.2 7.1-7.1-3.1-7.1-7.1c-.1-4 3.2-7.2 7.1-7.2zm29.1 16l-1.5 6.9c2.6-2.3 6.1-3.9 10.7-3.9 6.2 0 11.1 3.5 11.1 14.4 0 12.2-4.7 32.1-22.3 32.1-4.5 0-6.8-1.6-7.7-3.2l-4.7 22.1-13.7 3.2 15.2-71.5 12.9-.1zm7.8 17c0-7-2.9-7.5-4.5-7.5-2 0-4.5 1.6-6.3 4.4l-5.4 25.5c.4 1 1.4 2.1 3.4 2.1 9.7 0 12.8-15.9 12.8-24.5zm27.8 17.3c-.3 1.1-.5 2.2-.5 3.1 0 1.9.7 3.2 3.1 3.2.7 0 1.7 0 2.4-.3-2.5 7.8-6.6 8.9-9.6 8.9-6.4 0-9.1-4.4-9.1-10.3 0-1.6.2-3.1.6-4.8l5.8-27.2h-3l.7-3.6h3L528 366l13.4-1.9s-1.4 6.2-3.1 14.4h5.5l-.7 3.6h-5.5l-5.7 27.4z"/>
+</svg>
+</a>
+  <button class="navbar-toggler" type="button" data-toggle="offcanvas" data-close="try" aria-label="Toggle sidebar">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <nav class="collapse navbar-collapse">
+    <div class="navbar-nav mr-auto d-none d-lg-flex">
+      <a href="../#try" id="try-link" class="nav-item nav-link" data-toggle="try">Try CoffeeScript</a>
+      <a href="../#language" class="nav-item nav-link" data-close="try">Language Reference</a>
+      <a href="../#resources" class="nav-item nav-link" data-close="try">Resources</a>
+      <a href="https://github.com/jashkenas/coffeescript" class="nav-item nav-link" data-close="try">GitHub
+        </a>
+    </div>
+  </nav>
+</nav>
+
+
+<div class="container" id="top">
+  <div class="row">
+    <main class="main">
+      <header>
+        <h1>Announcing <span class="text-nowrap"><svg class="title-logo" xmlns="http://www.w3.org/2000/svg" viewBox="-76 212 458 369">
+          <title>
+            CoffeeScript Icon
+          </title>
+          <path d="M106 228.6c.5 2.3-.9 4.4-5 6.5-5.5-3.1-16.9-4.4-26.7-3.5-10.4.9-19.4 4.2-17.9 11.3 1.5 7.1 11.7 11 29.5 9.5 43.6-3.8 43.4-33.3 107.4-39 49.8-4.4 77.8 11 81.8 29.7 3.1 14.7-9.1 28.6-45.2 31.8-32 2.8-50.7-5.6-52.6-14.6-1-4.5 1.8-11.3 17.2-13.1 1.5 7 10.6 14.4 31.1 12.6 14.8-1.3 27.6-6.6 25.9-14.9-1.8-8.6-17.7-13.7-42.6-11.5-50.7 4.5-63.2 32.5-106.8 36.3-30.8 2.7-55.9-8.5-59.4-25.1-1.3-6.1-1.4-21 31.2-23.9 17.1-1.5 30.7 1.5 32.1 7.9zM-56.4 402.5c-14.3 18-20.4 38.8-19.2 59.2 1.2 20.4 11.4 37.1 26.9 50.2C-32 525-14 528.6 6.4 525c7.8-1.2 16.7-5.3 24.5-7.8-16.7 0-31-5.3-44.9-16.7-15.5-11.4-25.7-26.9-28.2-46.1-3.7-18 0-34.7 10.2-49 11.4-14.3 25.7-22 44.9-24.5 19.2-1.2 35.9 3.7 52.6 15.5-3.7-5.3-9-9-14.3-14.3-16.7-11.4-34.7-16.7-56.7-11.4-19.9 3.6-36.7 13.8-50.9 31.8zm223.6-96.3c-53.9 0-101.6-5.3-136.3-13.1-37.1-9-56.7-19.2-56.7-32.2 0-5.3 2.4-10.2 10.2-15.5-23.3 9-35.9 16.7-35.9 28.2 1.2 13.1 22 25.7 64.5 35.9 40 10.2 91.4 15.5 153 15.5 62.8 0 113-5.3 153-15.5 42.4-10.2 62.8-23.3 62.8-35.9 0-9-9-18-25.7-24.5 3.7 2.4 6.5 6.5 6.5 11.4 0 13.1-19.2 23.3-57.9 32.2-36 8.2-82.1 13.5-137.5 13.5zm153 35.9c-40 9-91.4 15.5-153 15.5-62.8 0-114.2-6.5-154.2-15.5-35.9-9-55.1-19.2-61.6-29.4 6.5 44.9 22 87.3 42.4 124.8 15.5 23.3 31 43.7 46.1 65.7 6.5 13.1 11.4 25.7 14.3 38.8 10.2 14.3 24.5 23.3 42.4 28.2 22 7.8 44.9 11.4 68.1 10.2h2.4c23.3 1.2 47.7-2.4 70.6-10.2 16.7-5.3 31-14.3 41.2-28.2h1.2c2.4-13.1 6.5-25.7 13.1-38.8 15.5-22 31-42.4 46.1-65.7 20.4-37.1 34.7-79.6 42.4-124.8-7.7 11.4-26.9 21.6-61.5 29.4z"/>
+        </svg> CoffeeScript 2</span></h1>
+      </header>
+      <section>
+<p>We are pleased to announce CoffeeScript 2! This new release of the CoffeeScript language and compiler aims to bring CoffeeScript into the modern JavaScript era, closing gaps in compatibility with JavaScript while preserving the clean syntax that is CoffeeScript’s hallmark. In a nutshell:</p>
+<ul>
+<li>The CoffeeScript 2 compiler now translates CoffeeScript code into modern JavaScript syntax. So a CoffeeScript <code>=&gt;</code> is now output as <code>=&gt;</code>, a CoffeeScript <code>class</code> is now output using the <code>class</code> keyword, and so on. This means you may need to <a href="../#transpilation">transpile the CoffeeScript compiler’s output</a>.</li>
+<li>CoffeeScript 2 adds support for <a href="../#async-functions">async functions</a> syntax, for the future <a href="../#destructuring">object destructuring</a> syntax, and for <a href="../#jsx">JSX</a>. Some features, such as <a href="../#modules">modules</a> (<code>import</code> and <code>export</code> statements), <a href="../#generator-iteration"><code>for…of</code></a>, and <a href="../#tagged-template-literals">tagged template literals</a> were backported into CoffeeScript versions 1.11 and 1.12.</li>
+<li>All of the above was achieved with very few <a href="../#breaking-changes">breaking changes from 1.x</a>. Most current CoffeeScript projects should be able to upgrade with little or no refactoring necessary.</li>
+</ul>
+<p>CoffeeScript 2 was developed with two primary goals: remove any incompatibilities with modern JavaScript that might prevent CoffeeScript from being used on a project; and preserve as much backward compatibility as possible. <a href="../#installation">Install now</a>: <code>npm install -g coffeescript@2</code></p>
+<h2 id="modern-javascript-output">Modern JavaScript Output</h2>
+<p>From the beginning, CoffeeScript has been described as being “just JavaScript.” And today, JavaScript is ES2015 (well, ES2017; also commonly known as ES6). CoffeeScript welcomes the changes in the JavaScript world and we’re happy to stop outputting circa-1999 syntax for modern features.</p>
+<p>Many new JavaScript features, such as <code>=&gt;</code>, were informed by CoffeeScript and are one-to-one compatible, or very nearly so. This has made outputting many of CoffeeScript’s innovations into new JS syntax straightforward: not only does <code>=&gt;</code> become <code>=&gt;</code>, but <code>{ a } = obj</code> becomes <code>{ a } = obj</code>, <code>&quot;a#{b}c&quot;</code> becomes <code>`a${b}c`</code> and so on.</p>
+<p>The following CoffeeScript features were updated in 2.0 to output using modern JavaScript syntax (or added in CoffeeScript 1.11 through 2.0, output using modern syntax):</p>
+<ul>
+<li>Modules: <code>import</code>/<code>export</code></li>
+<li>Classes: <code>class Animal</code></li>
+<li>Async functions: <code>await someFunction()</code></li>
+<li>Bound/arrow functions: <code>=&gt;</code></li>
+<li>Function default parameters: <code>(options = {}) -&gt;</code></li>
+<li>Function splat/rest parameters: <code>(items...) -&gt;</code></li>
+<li>Destructuring, for both arrays and objects: <code>[first, second] = items</code>, <code>{length} = items</code></li>
+<li>Object rest/spread properties: <code>{options..., force: yes}</code>, <code>{force, otherOptions...} = options</code></li>
+<li>Interpolated strings/template literals (JS backticked strings): <code>&quot;Hello, #{user}!&quot;</code></li>
+<li>Tagged template literals: <code>html&quot;&lt;strong&gt;coffee&lt;/strong&gt;&quot;</code></li>
+<li>JavaScript’s <code>for…of</code> is now available as CoffeeScript’s <code>for…from</code> (we already had a <code>for…of</code>): <code>for n from generatorFunction()</code></li>
+</ul>
+<p>Not all CoffeeScript features were adopted into JavaScript in 100% the same way; most notably, <a href="../#breaking-changes-default-values">default values</a> in JavaScript (and also in CoffeeScript 2) are only applied when a variable is <code>undefined</code>, not <code>undefined</code> or <code>null</code> as in CoffeeScript 1; and <a href="../#breaking-changes-classes">classes</a> have their own differences. See the <a href="../#breaking-changes">breaking changes</a> for the fine details.</p>
+<p>In our experience, most breaking changes are edge cases that should affect very few people, like JavaScript’s <a href="../#breaking-change-fat-arrow">lack of an <code>arguments</code> object inside arrow functions</a>. There seem to be two breaking changes that affect a significant number of projects:</p>
+<ul>
+<li>In CoffeeScript 2, “bare” <code>super</code> (calling <code>super</code> without arguments) is now no longer allowed, and one must use <code>super()</code> or <code>super arguments...</code> instead.</li>
+<li>References to <code>this</code>/<code>@</code> cannot occur before a call to <code>super</code>, per the JS spec.</li>
+</ul>
+<p>See the <a href="../#breaking-changes-super-extends">full details</a>. Either the CoffeeScript compiler or your transpiler will throw errors for either of these cases, so updating your code is a matter of fixing each occurrence as the compiler errors on it, until your code compiles successfully.</p>
+<h2 id="other-features">Other Features</h2>
+<p>Besides supporting new JavaScript features and outputting older CoffeeScript features in modern JS syntax, CoffeeScript 2 has added support for the following:</p>
+<ul>
+<li><a href="../#jsx">JSX</a></li>
+<li><a href="../#comments">Line comments</a> are now output (in CoffeeScript 1 they were discarded)</li>
+<li>Block comments are now allowed anywhere, enabling <a href="../#type-annotations">static type annotations</a> using Flow’s comment-based syntax</li>
+</ul>
+<p>There are many smaller improvements as well, such as to the <code>coffee</code> command-line tool. You can read all the details in the <a href="../#changelog">changelog</a> for the 2.0.0 betas.</p>
+<h2 id="what-about-…">“What About …?”</h2>
+<p>A few JavaScript features have been intentionally omitted from CoffeeScript. These include <code>let</code> and <code>const</code> (and <code>var</code>), named functions and the <code>get</code> and <code>set</code> keywords. These get asked about so often that we added a section to the docs called <a href="../#unsupported">Unsupported ECMAScript Features</a>. CoffeeScript’s lack of equivalents for these features does not affect compatibility or interoperability with JavaScript modules or libraries.</p>
+<h2 id="future-compatibility">Future Compatibility</h2>
+<p>Back when CoffeeScript 1 was created, ES2015 JavaScript and transpilers like <a href="http://babeljs.io/">Babel</a>, <a href="https://buble.surge.sh/">Bublé</a> or <a href="https://github.com/google/traceur-compiler">Traceur Compiler</a> were several years away. The CoffeeScript compiler itself had to do what today’s transpilers do, converting modern features like destructuring and arrow functions into equivalent lowest-common-denominator JavaScript.</p>
+<p>But transpilers exist now, and they do their job well. With them around, there’s no need for the CoffeeScript compiler to duplicate this functionality. All the CoffeeScript compiler needs to worry about now is converting the CoffeeScript version of new syntax into the JS version of that syntax, e.g. <code>&quot;Hello, #{name}!&quot;</code> into <code>`Hello, ${name}!`</code>. This makes adding support for new JavaScript features much easier than before.</p>
+<p>Most features added by ECMA in recent years haven’t required any updates at all in CoffeeScript. New global objects, or new methods on global objects, don’t require any updates on CoffeeScript’s part to work. Some proposed future JS features <em>do</em> involve new syntax, like <a href="https://github.com/tc39/proposal-class-fields">class fields</a>. We have adopted a policy of supporting new syntax only when it reaches Stage 4 in ECMA’s process, which means that the syntax is final and will be in the next ES release. On occasion we might support a <em>feature</em> before it has reached Stage 4, but output it using equivalent non-experimental syntax instead of the newly-proposed syntax; that’s what’s happening in 2.0.0 for <a href="../#splats">object destructuring</a>, where our output uses the same polyfill that Babel uses. When the new syntax is finalized, we will update our output to use the final syntax.</p>
+<h2 id="credits">Credits</h2>
+<p>The major features of 2.0.0 would not have been possible without the following people:</p>
+<ul class="credits">
+<li><a href="https://github.com/GeoffreyBooth">@GeoffreyBooth</a>: Organizer of the CoffeeScript 2 effort, developer for modules; arrow functions, function default parameters and function rest parameters output using ES2015 syntax; line comments output and block comments output anywhere; block embedded JavaScript via triple backticks; improved parsing of Literate CoffeeScript; and the new docs website.</li>
+<li><a href="https://github.com/connec">@connec</a>: Classes; destructuring; splats/rest syntax in arrays and function calls; and computed properties all output using ES2015 syntax.</li>
+<li><a href="https://github.com/GabrielRatener">@GabrielRatener</a>: Async functions.</li>
+<li><a href="https://github.com/xixixao">@xixixao</a>: JSX.</li>
+<li><a href="https://github.com/zdenko">@zdenko</a>: Object rest/spread properties (object destructuring).</li>
+<li><a href="https://github.com/greghuc">@greghuc</a>: Tagged template literals, interpolated strings output in ES2015 syntax.</li>
+<li><a href="https://github.com/atg">@atg</a>: ES2015 <code>for…of</code>, supported as CoffeeScript’s <code>for…from</code>.</li>
+<li><a href="https://github.com/lydell">@lydell</a> and <a href="https://github.com/jashkenas">@jashkenas</a>: Guidance, code reviews and feedback.</li>
+</ul>
+<p>See the full <a href="https://github.com/jashkenas/coffeescript/wiki/CoffeeScript-2-Honor-Roll">honor roll</a>.</p>
+<p>Thanks and we hope you enjoy CoffeeScript 2!</p>
+
+      </section>
+    </main>
+  </div>
+</div>
+
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-106156830-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments)};
+  gtag('js', new Date());
+  gtag('config', 'UA-106156830-1');
+</script>
+</body>
+</html>
--- a/docs/v2/browser-compiler/coffeescript.js
+++ b/docs/v2/browser-compiler/coffeescript.js
--- a/docs/v2/index.html
+++ b/docs/v2/index.html
--- a/docs/v2/test.html
+++ b/docs/v2/test.html
@@ -172,6 +172,17 @@ done = ->
  msg = "failed #{total - passedTests} tests and #{msg}" unless yay
  say msg, (if yay then 'good' else 'bad')

+  gtag 'event', 'tests_complete',
+    event_category: 'tests'
+    event_label: if yay then 'passed' else 'failed'
+    value: if yay then passedTests else total - passedTests
+  gtag 'event', 'tests_report',
+    event_category: 'tests'
+    event_label: msg
+  gtag 'event', 'timing_complete',
+    name: 'tests_run'
+    value: sec * 1000
+
 Promise.all(asyncTests).then(done).catch(done)
 </script>

@@ -313,7 +324,8 @@ If called without options, `coffee` will run your script.
  -r, --require      require the given module before eval or REPL
  -s, --stdio        listen for and compile scripts over stdio
  -l, --literate     treat stdio as literate style coffeescript
-  -t, --tokens       print out the tokens that the lexer/rewriter produce
+  -t, --transpile    pipe generated JavaScript through Babel
+      --tokens       print out the tokens that the lexer/rewriter produce
  -v, --version      display the version number
  -w, --watch        watch scripts for changes and rerun commands

@@ -1443,6 +1455,18 @@ test "#4674: _extends utility for object spreads 2", ->
  eq e.b, 1
  eq e.d, 2

+test "#4673: complex destructured object spread variables", ->
+  b = c: 1
+  {{a...}...} = b
+  eq a.c, 1
+
+  d = {}
+  {d.e...} = f: 1
+  eq d.e.f, 1
+
+  {{g}...} = g: 1
+  eq g, 1
+
 </script>
 <script type="text/x-coffeescript" class="test" id="async">
 # Functions that contain the `await` keyword will compile into async functions,
@@ -4506,10 +4530,19 @@ test "Flow comment-based syntax support", ->
 # Compilation
 # -----------

-# helper to assert that a string should fail compilation
+# Helper to assert that a string should fail compilation.
 cantCompile = (code) ->
  throws -> CoffeeScript.compile code

+# Helper to pipe the CoffeeScript compiler’s output through a transpiler.
+transpile = (method, code, options = {}) ->
+  # `method` should be 'compile' or 'eval' or 'run'
+  options.bare = yes
+  options.transpile =
+    # Target Internet Explorer 6, which supports no ES2015+ features.
+    presets: [['env', {targets: browsers: ['ie 6']}]]
+  CoffeeScript[method] code, options
+

 test "ensure that carriage returns don't break compilation on Windows", ->
  doesNotThrow -> CoffeeScript.compile 'one\r\ntwo', bare: on
@@ -4629,6 +4662,40 @@ test "#3001: `own` shouldn't be allowed in a `for`-`in` loop", ->
 test "#2994: single-line `if` requires `then`", ->
  cantCompile "if b else x"

+test "transpile option, for Node API CoffeeScript.compile", ->
+  return if global.testingBrowser
+  ok transpile('compile', "import fs from 'fs'").includes 'require'
+
+test "transpile option, for Node API CoffeeScript.eval", ->
+  return if global.testingBrowser
+  ok transpile 'eval', "import path from 'path'; path.sep in ['/', '\\\\']"
+
+test "transpile option, for Node API CoffeeScript.run", ->
+  return if global.testingBrowser
+  doesNotThrow -> transpile 'run', "import fs from 'fs'"
+
+test "transpile option has merged source maps", ->
+  return if global.testingBrowser
+  untranspiledOutput = CoffeeScript.compile "import path from 'path'\nconsole.log path.sep", sourceMap: yes
+  transpiledOutput   = transpile 'compile', "import path from 'path'\nconsole.log path.sep", sourceMap: yes
+  untranspiledOutput.v3SourceMap = JSON.parse untranspiledOutput.v3SourceMap
+  transpiledOutput.v3SourceMap   = JSON.parse transpiledOutput.v3SourceMap
+  ok untranspiledOutput.v3SourceMap.mappings isnt transpiledOutput.v3SourceMap.mappings
+  # Babel adds `'use strict';` to the top of files with the modules transform.
+  eq transpiledOutput.js.indexOf('use strict'), 1
+  # The `'use strict';` followed by two newlines results in the first two lines
+  # of the source map mappings being two blank/skipped lines.
+  eq transpiledOutput.v3SourceMap.mappings.indexOf(';;'), 0
+  # The number of lines in the transpiled code should match the number of lines
+  # in the source map.
+  eq transpiledOutput.js.split('\n').length, transpiledOutput.v3SourceMap.mappings.split(';').length
+
+test "using transpile from the Node API requires an object", ->
+  try
+    CoffeeScript.compile '', transpile: yes
+  catch exception
+    eq exception.message, 'The transpile option must be given an object with options to pass to Babel'
+
 </script>
 <script type="text/x-coffeescript" class="test" id="comprehensions">
 # Comprehensions
@@ -6415,6 +6482,37 @@ test 'unspaced less than after CSX works but is not encouraged', ->
      res = 2 < div;
    '''

+test '#4686: comments inside interpolations that also contain CSX tags', ->
+  eqJS '''
+    <div>
+      {
+        # comment
+        <div />
+      }
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div />}
+    </div>;
+  '''
+
+test '#4686: comments inside interpolations that also contain CSX attributes', ->
+  eqJS '''
+    <div>
+      <div anAttr={
+        # comment
+        "value"
+      } />
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div anAttr={"value"} />}
+    </div>;
+  '''
+
+
 </script>
 <script type="text/x-coffeescript" class="test" id="error_messages">
 # Error Formatting
@@ -10254,6 +10352,29 @@ test "#4413: expressions in function parameters that create generated variables
  eq f(), 33
  eq g(), 34

+test "#4673: complex destructured object spread variables", ->
+  f = ({{a...}...}) ->
+    a
+  eq f(c: 1).c, 1
+
+  g = ({@y...}) ->
+    eq @y.b, 1
+  g b: 1
+
+test "#4657: destructured array param declarations", ->
+  a = 1
+  b = 2
+  f = ([a..., b]) ->
+  f [3, 4, 5]
+  eq a, 1
+  eq b, 2
+
+test "#4657: destructured array parameters", ->
+  f = ([a..., b]) -> {a, b}
+  result = f [1, 2, 3, 4]
+  arrayEq result.a, [1, 2, 3]
+  eq result.b, 4
+
 </script>
 <script type="text/x-coffeescript" class="test" id="generators">
 # Generators
@@ -16195,5 +16316,13 @@ test '#4467: tagged template literal call recognized as a callable function', ->
 </script>


+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-106156830-1"></script>
+<script>
+  window.GA_TRACKING_ID = 'UA-106156830-1';
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments)};
+  gtag('js', new Date());
+  gtag('config', GA_TRACKING_ID);
+</script>
 </body>
 </html>
--- a/documentation/examples/comment.coffee
+++ b/documentation/examples/comment.coffee
@@ -4,4 +4,4 @@ Released under the MIT License
 ###

 sayFortune = (fortune) ->
-	console.log fortune # in bed!
+  console.log fortune # in bed!
--- a/documentation/examples/static.coffee
+++ b/documentation/examples/static.coffee
@@ -1,9 +1,9 @@
 class Teenager
-	@say: (speech) ->
-		words = speech.split ' '
-		fillers = ['uh', 'um', 'like', 'actually', 'so', 'maybe']
-		output = []
-		for word, index in words
-			output.push word
-			output.push fillers[Math.floor(Math.random() * fillers.length)] unless index is words.length - 1
-		output.join ', '
+  @say: (speech) ->
+    words = speech.split ' '
+    fillers = ['uh', 'um', 'like', 'actually', 'so', 'maybe']
+    output = []
+    for word, index in words
+      output.push word
+      output.push fillers[Math.floor(Math.random() * fillers.length)] unless index is words.length - 1
+    output.join ', '
--- a/documentation/images/logo.svg
+++ b/documentation/images/logo.svg
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-22 347 566 100">
-	<title>
-		CoffeeScript Logo
-	</title>
-	<path d="M21.7 351.1c.1.6-.2 1.1-1.2 1.6-1.3-.7-4.1-1.1-6.4-.9-2.5.2-4.6 1-4.3 2.7.4 1.7 2.8 2.7 7.1 2.3 10.5-.9 10.4-8 25.8-9.4 12-1.1 18.7 2.6 19.6 7.1.7 3.5-2.2 6.9-10.9 7.6-7.7.7-12.2-1.4-12.6-3.5-.2-1.1.4-2.7 4.1-3.1.4 1.7 2.5 3.5 7.5 3 3.6-.3 6.6-1.6 6.2-3.6-.4-2.1-4.2-3.3-10.2-2.8-12.2 1.1-15.2 7.8-25.6 8.7-7.4.7-13.4-2-14.2-6-.3-1.5-.3-5 7.5-5.7 4-.3 7.2.4 7.6 2zm-39 41.8c-3.4 4.3-4.9 9.3-4.6 14.2.3 4.9 2.7 8.9 6.5 12 4 3.1 8.3 4 13.2 3.1 1.9-.3 4-1.3 5.9-1.9-4 0-7.4-1.3-10.8-4-3.7-2.7-6.2-6.5-6.8-11.1-.9-4.3 0-8.3 2.4-11.8 2.7-3.4 6.2-5.3 10.8-5.9 4.6-.3 8.6.9 12.6 3.7-.9-1.3-2.2-2.2-3.4-3.4-4-2.7-8.3-4-13.6-2.7-4.8 1-8.8 3.5-12.2 7.8zm53.6-23.1c-12.9 0-24.4-1.3-32.7-3.1-8.9-2.2-13.6-4.6-13.6-7.7 0-1.3.6-2.4 2.4-3.7-5.6 2.2-8.6 4-8.6 6.8.3 3.1 5.3 6.2 15.5 8.6 9.6 2.4 21.9 3.7 36.7 3.7 15.1 0 27.1-1.3 36.7-3.7 10.2-2.4 15.1-5.6 15.1-8.6 0-2.2-2.2-4.3-6.2-5.9.9.6 1.6 1.6 1.6 2.7 0 3.1-4.6 5.6-13.9 7.7-8.6 1.9-19.6 3.2-33 3.2zm36.8 8.6c-9.6 2.2-21.9 3.7-36.7 3.7-15.1 0-27.4-1.6-37-3.7-8.6-2.2-13.2-4.6-14.8-7.1 1.6 10.8 5.3 21 10.2 30 3.7 5.6 7.4 10.5 11.1 15.8 1.6 3.1 2.7 6.2 3.4 9.3 2.4 3.4 5.9 5.6 10.2 6.8 5.3 1.9 10.8 2.7 16.4 2.4h.6c5.6.3 11.5-.6 16.9-2.4 4-1.3 7.4-3.4 9.9-6.8h.3c.6-3.1 1.6-6.2 3.1-9.3 3.7-5.3 7.4-10.2 11.1-15.8 4.9-8.9 8.3-19.1 10.2-30-2 2.8-6.6 5.2-14.9 7.1zm106.2 30.1c-4.8 12.1-17.6 16.9-25.9 16.9-13.4 0-19.9-6-19.9-22.3 0-16.5 7.9-47.3 31.7-47.3 8.5 0 15.2 3.3 15.2 12.1 0 4.8-1.8 8.3-6.4 8.3-1.5 0-3.4-.4-5.2-2.4 2.2-1.1 4.2-4.9 4.2-8.3 0-2.9-1.5-5.6-5.6-5.6-10 0-18.9 23.9-18.9 42.4 0 8.3 2.2 14.2 10.9 14.2 7.1 0 13.5-3.4 17.7-9.1l2.2 1.1zm32.9-16.3c.4.2.7.2 1 .2 4.2 0 10.1-2.7 14-5.5l.8 2.4c-3.4 3.7-9.5 6.5-16.1 7.5-1.5 16.8-10.6 27.3-21.7 27.3-8.4 0-14.5-4-14.5-14.4 0-10.5 6.2-32.2 24.9-32.2 7.8.3 11.6 5.3 11.6 14.7zm-7.7 5c-1.9-.5-2.4-2-2.4-3.8 0-2.5 1.2-4.2 2.8-4.9-.2-3.8-1.1-5.3-3.4-5.3-6.5 0-12 16.6-12 25.6 0 6 1.2 7.3 4.6 7.3 4.2.1 8.9-8 10.4-18.9zm-6.6 39.7c0-8.3 7.1-11 15.8-13.6l10.9-51.9c2.7-13 10.6-15.5 16.5-15.5 4.1 0 8 2.2 9.7 5.7 3.6-4.6 8.4-5.7 12.4-5.7 5.6 0 10.8 3.9 10.8 9.8 0 1.5-.1 2.6-.3 3.7h-4.3c.1-.9.2-1.7.2-2.4 0-2.1-1.7-3.1-3.4-3.1-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9.1l-.8 3.6h-9l-10.3 49.1c-2.7 13-10.6 15.5-16.5 15.5-5.2 0-8.3-2.3-9.8-5.7-3.5 4.6-8.3 5.7-12.3 5.7-5.6.1-10.8-3.8-10.8-9.7zm9.1 1.8c1.9 0 4.2-1.8 5.4-7.1l1.1-5.3c-5.7 2-10.1 4.4-10.1 9.4 0 1.2 1.7 3 3.6 3zm21.7 0c1.9 0 4.2-1.8 5.4-7.1l2.2-10.4-9.4 1.8-1.8 8.3c-.5 2.1-1.1 4-1.8 5.6.9 1.3 3 1.8 5.4 1.8zm-1.4-18l9.4-1.7 7.7-36.8h-9l-8.1 38.5zm16.6-56.7c-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9l2.1-9.5c.2-.7.2-1.3.2-2 .1-2-1.5-3-3.4-3zm37.9 53c7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.5-10 18.5-20.9 19.2-.1 1.3-.2 2.5-.2 3.6 0 6.2 2.2 7.7 6.5 7.7zm5.3-34.4c-4.6 0-9.1 9.7-10.9 18.7 7-.5 13.2-7.4 13.2-15 0-2.2-.5-3.7-2.3-3.7zm28.6 33.4c3.4 0 7.8-2.3 10.8-4.8-2 10.4-8.4 13.4-15.8 13.4-8.4 0-14.1-4.2-14.1-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.6-10 18.5-20.9 19.2-.1.9-.2 2-.2 2.7 0 5.7 2.5 7.6 5.6 7.6zm6.2-33.4c-4.5 0-9.1 10.1-11 18.7 7.1-.4 13.3-7.3 13.3-15 0-2.2-.6-3.7-2.3-3.7zm51.3-6.7c-1.7 0-3-.6-4.2-1.9 2.4-1.5 4.1-4.8 4.1-7.8 0-3.1-1.8-6.1-6.8-6.1s-8.3 2.8-8.3 8.2c0 13.3 20.5 15.2 20.5 34.8 0 15.3-12.3 22.7-25.6 22.7-10.4 0-19.3-4.5-19.3-15.7 0-9.8 7-14.9 13.3-14.9 3.1 0 7.7 1.3 8 6-4.9 0-10.7 2.3-10.7 8.5 0 4.5 2.9 8.7 8.7 8.7 6.1 0 10.6-4.4 10.6-12 0-15.6-18.6-21.1-18.6-34.5 0-9.5 9.3-16.3 21-16.3 4.3 0 14.6.9 14.6 10.9.1 5.5-2.8 9.4-7.3 9.4zm36.2 10.3c0-2.3-.8-3.7-2.5-3.7-5.7 0-11.7 16.6-11.7 26.7 0 6.2 2.2 7.6 6.6 7.6 7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.6 6-32.3 24.5-32.3 8.1 0 10.1 4.2 10.1 8.3 0 4.4-2.2 6.7-4.8 6.7-1 0-2.1-.4-3.1-1.1.5-1.9.9-3.6.9-5.3zm27.7-7.6l-1.2 5.7c3.1-2.7 6.7-5.7 11-5.7 4.1 0 6.3 3.3 6.3 6.9 0 3.1-2.1 6.7-6.6 6.7-5.1 0-2.5-6-5.3-6-2.7 0-4.4 1.4-6.7 3.4l-7.2 34.6h-13.1l9.6-45.4 13.2-.2zm34.2 0l-6.6 30.9c-.3 1.2-.4 2.1-.4 2.9 0 2.5 1.2 3.3 3.7 3.3 3.5 0 6.9-3.4 8.1-8h3.8c-5.2 14.8-14.2 16.8-19.1 16.8-5.5 0-9.7-3.2-9.7-10.9 0-1.8.3-3.7.7-5.9l6.2-29.2 13.3.1zm-4.1-19.4c4 0 7.2 3.2 7.2 7.2s-3.2 7.1-7.2 7.1-7.1-3.1-7.1-7.1c-.1-4 3.2-7.2 7.1-7.2zm29.1 16l-1.5 6.9c2.6-2.3 6.1-3.9 10.7-3.9 6.2 0 11.1 3.5 11.1 14.4 0 12.2-4.7 32.1-22.3 32.1-4.5 0-6.8-1.6-7.7-3.2l-4.7 22.1-13.7 3.2 15.2-71.5 12.9-.1zm7.8 17c0-7-2.9-7.5-4.5-7.5-2 0-4.5 1.6-6.3 4.4l-5.4 25.5c.4 1 1.4 2.1 3.4 2.1 9.7 0 12.8-15.9 12.8-24.5zm27.8 17.3c-.3 1.1-.5 2.2-.5 3.1 0 1.9.7 3.2 3.1 3.2.7 0 1.7 0 2.4-.3-2.5 7.8-6.6 8.9-9.6 8.9-6.4 0-9.1-4.4-9.1-10.3 0-1.6.2-3.1.6-4.8l5.8-27.2h-3l.7-3.6h3L528 366l13.4-1.9s-1.4 6.2-3.1 14.4h5.5l-.7 3.6h-5.5l-5.7 27.4z"/>
-</svg>
--- a/documentation/sections/annotated_source.md
+++ b/documentation/sections/annotated_source.md
@@ -1,16 +1,16 @@
 ## Annotated Source

-You can browse the CoffeeScript <%= fullVersion %> source in readable, annotated form [here](http://coffeescript.org/v<%= majorVersion %>/annotated-source/). You can also jump directly to a particular source file:
+You can browse the CoffeeScript <%= fullVersion %> source in readable, annotated form [here](annotated-source/). You can also jump directly to a particular source file:

- [Grammar Rules — src/grammar](http://coffeescript.org/v<%= majorVersion %>/annotated-source/grammar.html)
- [Lexing Tokens — src/lexer](http://coffeescript.org/v<%= majorVersion %>/annotated-source/lexer.html)
- [The Rewriter — src/rewriter](http://coffeescript.org/v<%= majorVersion %>/annotated-source/rewriter.html)
- [The Syntax Tree — src/nodes](http://coffeescript.org/v<%= majorVersion %>/annotated-source/nodes.html)
- [Lexical Scope — src/scope](http://coffeescript.org/v<%= majorVersion %>/annotated-source/scope.html)
- [Helpers &amp; Utility Functions — src/helpers](http://coffeescript.org/v<%= majorVersion %>/annotated-source/helpers.html)
- [The CoffeeScript Module — src/coffeescript](http://coffeescript.org/v<%= majorVersion %>/annotated-source/coffeescript.html)
- [Cake &amp; Cakefiles — src/cake](http://coffeescript.org/v<%= majorVersion %>/annotated-source/cake.html)
- [“coffee” Command-Line Utility — src/command](http://coffeescript.org/v<%= majorVersion %>/annotated-source/command.html)
- [Option Parsing — src/optparse](http://coffeescript.org/v<%= majorVersion %>/annotated-source/optparse.html)
- [Interactive REPL — src/repl](http://coffeescript.org/v<%= majorVersion %>/annotated-source/repl.html)
- [Source Maps — src/sourcemap](http://coffeescript.org/v<%= majorVersion %>/annotated-source/sourcemap.html)
+- [Grammar Rules — src/grammar](annotated-source/grammar.html)
+- [Lexing Tokens — src/lexer](annotated-source/lexer.html)
+- [The Rewriter — src/rewriter](annotated-source/rewriter.html)
+- [The Syntax Tree — src/nodes](annotated-source/nodes.html)
+- [Lexical Scope — src/scope](annotated-source/scope.html)
+- [Helpers &amp; Utility Functions — src/helpers](annotated-source/helpers.html)
+- [The CoffeeScript Module — src/coffeescript](annotated-source/coffeescript.html)
+- [Cake &amp; Cakefiles — src/cake](annotated-source/cake.html)
+- [“coffee” Command-Line Utility — src/command](annotated-source/command.html)
+- [Option Parsing — src/optparse](annotated-source/optparse.html)
+- [Interactive REPL — src/repl](annotated-source/repl.html)
+- [Source Maps — src/sourcemap](annotated-source/sourcemap.html)
--- a/documentation/sections/announcing_coffeescript_2.md
+++ b/documentation/sections/announcing_coffeescript_2.md
@@ -0,0 +1,78 @@
+# Announcing CoffeeScript 2
+
+We are pleased to announce CoffeeScript 2! This new release of the CoffeeScript language and compiler aims to bring CoffeeScript into the modern JavaScript era, closing gaps in compatibility with JavaScript while preserving the clean syntax that is CoffeeScript’s hallmark. In a nutshell:
+
+- The CoffeeScript 2 compiler now translates CoffeeScript code into modern JavaScript syntax. So a CoffeeScript `=>` is now output as `=>`, a CoffeeScript `class` is now output using the `class` keyword, and so on. This means you may need to [transpile the CoffeeScript compiler’s output](../#es2015plus-output).
+- CoffeeScript 2 adds support for [async functions](../#async-functions) syntax, for the future [object destructuring](../#destructuring) syntax, and for [JSX](../#jsx). Some features, such as [modules](../#modules) (`import` and `export` statements), [`for…of`](../#generator-iteration), and [tagged template literals](../#tagged-template-literals) were backported into CoffeeScript versions 1.11 and 1.12.
+- All of the above was achieved with very few [breaking changes from 1.x](../#breaking-changes). Most current CoffeeScript projects should be able to upgrade with little or no refactoring necessary.
+
+CoffeeScript 2 was developed with two primary goals: remove any incompatibilities with modern JavaScript that might prevent CoffeeScript from being used on a project; and preserve as much backward compatibility as possible. [Install now](../#installation): `npm install -g coffeescript@2`
+
+## Modern JavaScript Output
+
+From the beginning, CoffeeScript has been described as being “just JavaScript.” And today, JavaScript is ES2015 (well, ES2017; also commonly known as ES6). CoffeeScript welcomes the changes in the JavaScript world and we’re happy to stop outputting circa-1999 syntax for modern features.
+
+Many new JavaScript features, such as `=>`, were informed by CoffeeScript and are one-to-one compatible, or very nearly so. This has made outputting many of CoffeeScript’s innovations into new JS syntax straightforward: not only does `=>` become `=>`, but `{ a } = obj` becomes `{ a } = obj`, `"a#{b}c"` becomes `` `a${b}c` `` and so on.
+
+The following CoffeeScript features were updated in 2.0 to output using modern JavaScript syntax (or added in CoffeeScript 1.11 through 2.0, output using modern syntax):
+
+- Modules: `import`/`export`
+- Classes: `class Animal`
+- Async functions: `await someFunction()`
+- Bound/arrow functions: `=>`
+- Function default parameters: `(options = {}) ->`
+- Function splat/rest parameters: `(items...) ->`
+- Destructuring, for both arrays and objects: `[first, second] = items`, `{length} = items`
+- Object rest/spread properties: `{options..., force: yes}`, `{force, otherOptions...} = options`
+- Interpolated strings/template literals (JS backticked strings): `"Hello, #{user}!"`
+- Tagged template literals: `html"<strong>coffee</strong>"`
+- JavaScript’s `for…of` is now available as CoffeeScript’s `for…from` (we already had a `for…of`): `for n from generatorFunction()`
+
+Not all CoffeeScript features were adopted into JavaScript in 100% the same way; most notably, [default values](../#breaking-changes-default-values) in JavaScript (and also in CoffeeScript 2) are only applied when a variable is `undefined`, not `undefined` or `null` as in CoffeeScript 1; and [classes](../#breaking-changes-classes) have their own differences. See the [breaking changes](../#breaking-changes) for the fine details.
+
+In our experience, most breaking changes are edge cases that should affect very few people, like JavaScript’s [lack of an `arguments` object inside arrow functions](../#breaking-change-fat-arrow). There seem to be two breaking changes that affect a significant number of projects:
+
+- In CoffeeScript 2, “bare” `super` (calling `super` without arguments) is now no longer allowed, and one must use `super()` or `super arguments...` instead.
+- References to `this`/`@` cannot occur before a call to `super`, per the JS spec.
+
+See the [full details](../#breaking-changes-super-extends). Either the CoffeeScript compiler or your transpiler will throw errors for either of these cases, so updating your code is a matter of fixing each occurrence as the compiler errors on it, until your code compiles successfully.
+
+## Other Features
+
+Besides supporting new JavaScript features and outputting older CoffeeScript features in modern JS syntax, CoffeeScript 2 has added support for the following:
+
+- [JSX](../#jsx)
+- [Line comments](../#comments) are now output (in CoffeeScript 1 they were discarded)
+- Block comments are now allowed anywhere, enabling [static type annotations](../#type-annotations) using Flow’s comment-based syntax
+
+There are many smaller improvements as well, such as to the `coffee` command-line tool. You can read all the details in the [changelog](../#changelog) for the 2.0.0 betas.
+
+## “What About …?”
+
+A few JavaScript features have been intentionally omitted from CoffeeScript. These include `let` and `const` (and `var`), named functions and the `get` and `set` keywords. These get asked about so often that we added a section to the docs called [Unsupported ECMAScript Features](../#unsupported). CoffeeScript’s lack of equivalents for these features does not affect compatibility or interoperability with JavaScript modules or libraries.
+
+## Future Compatibility
+
+Back when CoffeeScript 1 was created, ES2015 JavaScript and transpilers like [Babel](http://babeljs.io/), [Bublé](https://buble.surge.sh/) or [Traceur Compiler](https://github.com/google/traceur-compiler) were several years away. The CoffeeScript compiler itself had to do what today’s transpilers do, converting modern features like destructuring and arrow functions into equivalent lowest-common-denominator JavaScript.
+
+But transpilers exist now, and they do their job well. With them around, there’s no need for the CoffeeScript compiler to duplicate this functionality. All the CoffeeScript compiler needs to worry about now is converting the CoffeeScript version of new syntax into the JS version of that syntax, e.g. `"Hello, #{name}!"` into `` `Hello, ${name}!` ``. This makes adding support for new JavaScript features much easier than before.
+
+Most features added by ECMA in recent years haven’t required any updates at all in CoffeeScript. New global objects, or new methods on global objects, don’t require any updates on CoffeeScript’s part to work. Some proposed future JS features _do_ involve new syntax, like [class fields](https://github.com/tc39/proposal-class-fields). We have adopted a policy of supporting new syntax only when it reaches Stage 4 in ECMA’s process, which means that the syntax is final and will be in the next ES release. On occasion we might support a _feature_ before it has reached Stage 4, but output it using equivalent non-experimental syntax instead of the newly-proposed syntax; that’s what’s happening in 2.0.0 for [object destructuring](../#splats), where our output uses the same polyfill that Babel uses. When the new syntax is finalized, we will update our output to use the final syntax.
+
+## Credits
+
+The major features of 2.0.0 would not have been possible without the following people:
+
+- [@GeoffreyBooth](https://github.com/GeoffreyBooth): Organizer of the CoffeeScript 2 effort, developer for modules; arrow functions, function default parameters and function rest parameters output using ES2015 syntax; line comments output and block comments output anywhere; block embedded JavaScript via triple backticks; improved parsing of Literate CoffeeScript; and the new docs website.
+- [@connec](https://github.com/connec): Classes; destructuring; splats/rest syntax in arrays and function calls; and computed properties all output using ES2015 syntax.
+- [@GabrielRatener](https://github.com/GabrielRatener): Async functions.
+- [@xixixao](https://github.com/xixixao): JSX.
+- [@zdenko](https://github.com/zdenko): Object rest/spread properties (object destructuring).
+- [@greghuc](https://github.com/greghuc): Tagged template literals, interpolated strings output in ES2015 syntax.
+- [@atg](https://github.com/atg): ES2015 `for…of`, supported as CoffeeScript’s `for…from`.
+- [@lydell](https://github.com/lydell) and [@jashkenas](https://github.com/jashkenas): Guidance, code reviews and feedback.
+
+
+See the full [honor roll](https://github.com/jashkenas/coffeescript/wiki/CoffeeScript-2-Honor-Roll).
+
+Thanks and we hope you enjoy CoffeeScript 2!
--- a/documentation/sections/changelog.md
+++ b/documentation/sections/changelog.md
@@ -1,20 +1,29 @@
 ## Changelog

+```
+releaseHeader('2017-09-17', '2.0.0', '2.0.0-beta5')
+```
+
+*   Added `--transpile` flag or `transpile` Node API option to tell the CoffeeScript compiler to pipe its output through Babel before saving or returning it; see [Transpilation](#transpilation). Also changed the `-t` short flag to refer to `--transpile` instead of `--tokens`.
+*   Always populate source maps’ `sourcesContent` property.
+*   Bugfixes for destructuring and for comments in JSX.
+*   _Note that these are only the changes between 2.0.0-beta5 and 2.0.0. See below for all changes since 1.x._
+
 ```
 releaseHeader('2017-09-02', '2.0.0-beta5', '2.0.0-beta4')
 ```

-*	 Node 6 is now supported, and we will try to maintain that as the minimum required version for CoffeeScript 2 via the `coffee` command or Node API. Older versions of Node, or non-evergreen browsers, can compile via the [browser compiler](./browser-compiler/coffeescript.js).
-*	 The command line `--output` flag now allows you to specify an output filename, not just an output folder.
-*	 The command line `--require` flag now properly handles filenames or module names that are invalid identifiers (like an NPM module with a hyphen in the name).
-*	 `Object.assign`, output when object destructuring is used, is polyfilled using the same polyfill that Babel outputs. This means that polyfills shouldn’t be required unless support for Internet Explorer 8 or below is desired (or your own code uses a feature that requires a polyfill). See [ES2015+ Output](#es2015plus-output).
-*	 A string or JSX interpolation that contains only a comment (`"a#{### comment ###}b"` or `<div>{### comment ###}</div>`) is now output (`` `a${/* comment */}b` ``)
-*	 Interpolated strings (ES2015 template literals) that contain quotation marks no longer have the quotation marks escaped: `` `say "${message}"` ``
-*	 It is now possible to chain after a function literal (for example, to define a function and then call `.call` on it).
-*	 The results of the async tests are included in the output when you run `cake test`.
-*	 Bugfixes for object destructuring; expansions in function parameters; generated reference variables in function parameters; chained functions after `do`; splats after existential operator soaks in arrays (`[a?.b...]`); trailing `if` with splat in arrays or function parameters (`[a if b...]`); attempting to `throw` an `if`, `for`, `switch`, `while` or other invalid construct.
-*	 Bugfixes for syntactical edge cases: semicolons after `=` and other “mid-expression” tokens; spaces after `::`; and scripts that begin with `:` or `*`.
-*	 Bugfixes for source maps generated via the Node API; and stack trace line numbers when compiling CoffeeScript via the Node API from within a `.coffee` file.
+*   Node 6 is now supported, and we will try to maintain that as the minimum required version for CoffeeScript 2 via the `coffee` command or Node API. Older versions of Node, or non-evergreen browsers, can compile via the [browser compiler](./browser-compiler/coffeescript.js).
+*   The command line `--output` flag now allows you to specify an output filename, not just an output folder.
+*   The command line `--require` flag now properly handles filenames or module names that are invalid identifiers (like an NPM module with a hyphen in the name).
+*   `Object.assign`, output when object destructuring is used, is polyfilled using the same polyfill that Babel outputs. This means that polyfills shouldn’t be required unless support for Internet Explorer 8 or below is desired (or your own code uses a feature that requires a polyfill). See [ES2015+ Output](#es2015plus-output).
+*   A string or JSX interpolation that contains only a comment (`"a#{### comment ###}b"` or `<div>{### comment ###}</div>`) is now output (`` `a${/* comment */}b` ``)
+*   Interpolated strings (ES2015 template literals) that contain quotation marks no longer have the quotation marks escaped: `` `say "${message}"` ``
+*   It is now possible to chain after a function literal (for example, to define a function and then call `.call` on it).
+*   The results of the async tests are included in the output when you run `cake test`.
+*   Bugfixes for object destructuring; expansions in function parameters; generated reference variables in function parameters; chained functions after `do`; splats after existential operator soaks in arrays (`[a?.b...]`); trailing `if` with splat in arrays or function parameters (`[a if b...]`); attempting to `throw` an `if`, `for`, `switch`, `while` or other invalid construct.
+*   Bugfixes for syntactical edge cases: semicolons after `=` and other “mid-expression” tokens; spaces after `::`; and scripts that begin with `:` or `*`.
+*   Bugfixes for source maps generated via the Node API; and stack trace line numbers when compiling CoffeeScript via the Node API from within a `.coffee` file.

 ```
 releaseHeader('2017-08-03', '2.0.0-beta4', '2.0.0-beta3')
--- a/documentation/sections/coffeescript_2.md
+++ b/documentation/sections/coffeescript_2.md
@@ -1,17 +1 @@
 ## CoffeeScript 2
-
-### What’s New In CoffeeScript 2?
-
-The biggest change in CoffeeScript 2 is that now the CoffeeScript compiler produces modern, ES2015+ JavaScript. A CoffeeScript `=>` becomes an ES `=>`, a CoffeeScript `class` becomes an ES `class` and so on. With the exception of [modules](#modules) (`import` and `export` statements) and [JSX](#jsx), all the ES2015+ features that CoffeeScript supports can run natively in Node 7.6+, meaning that Node can run CoffeeScript’s output without any further processing required. You can [run the tests in your browser](http://coffeescript.org/v<%= majorVersion %>/test.html) to see if your browser can do the same; Chrome has supported all features since version 55.
-
-Support for ES2015+ syntax is important to ensure compatibility with frameworks that assume ES2015. Now that CoffeeScript compiles classes to the ES `class` keyword, it’s possible to `extend` an ES class; that wasn’t possible in CoffeeScript 1. Parity in how language features work is also important on its own; CoffeeScript “is just JavaScript,” and so things like [function parameter default values](#breaking-changes-default-values) should behave the same in CoffeeScript as in JavaScript.
-
-Many ES2015+ features have been backported to CoffeeScript 1.11 and 1.12, including [modules](#modules), [`for…of`](#generator-iteration), and [tagged template literals](#tagged-template-literals). Major new features unique to CoffeeScript 2 are support for ES2017’s [async functions](#async-functions) and for [JSX](#jsx). More details are in the [changelog](#changelog).
-
-There are very few [breaking changes from CoffeeScript 1.x to 2](#breaking-changes); we hope the upgrade process is smooth for most projects.
-
-### Why CoffeeScript When There’s ES2015?
-
-CoffeeScript introduced many new features to the JavaScript world, such as [`=>`](#fat-arrow) and [destructuring](#destructuring) and [classes](#classes). We are happy that ECMA has seen their utility and adopted them into ECMAScript.
-
-CoffeeScript’s intent, however, was never to be a superset of JavaScript. One of the guiding principles of CoffeeScript has been _simplicity:_ not just removing JavaScript’s “bad parts,” but providing an elegant, concise syntax that eschews unnecessary punctuation whenever possible, to make code easier to read and reason about. This benefit of CoffeeScript remains, even in an ES2015 world.
--- a/documentation/sections/command_line_interface.md
+++ b/documentation/sections/command_line_interface.md
@@ -5,6 +5,7 @@ Once installed, you should have access to the `coffee` command, which can execut
 | Option | Description |
 | --- | --- |
 | `-c, --compile` | Compile a `.coffee` script into a `.js` JavaScript file of the same name. |
+| `-t, --transpile` | Pipe the CoffeeScript compiler’s output through Babel before saving or running the generated JavaScript. Requires `babel-core` to be installed, and options to pass to Babel in a `.babelrc` file or a `package.json` with a `babel` key in the path of the file or folder to be compiled. See [Transpilation](#transpilation).
 | `-m, --map` | Generate source maps alongside the compiled JavaScript files. Adds `sourceMappingURL` directives to the JavaScript as well. |
 | `-M, --inline-map` | Just like `--map`, but include the source map directly in the compiled JavaScript files, rather than in a separate file. |
 | `-i, --interactive` | Launch an interactive CoffeeScript session to try short snippets. Identical to calling `coffee` with no arguments. |
@@ -16,10 +17,10 @@ Once installed, you should have access to the `coffee` command, which can execut
 | `-e, --eval` | Compile and print a little snippet of CoffeeScript directly from the command line. For example:<br>`coffee -e "console.log num for num in [10..1]"` |
 | `-r, --require [MODULE]`&emsp; | `require()` the given module before starting the REPL or evaluating the code given with the `--eval` flag. |
 | `-b, --bare` | Compile the JavaScript without the [top-level function safety wrapper](#lexical-scope). |
-| `-t, --tokens` | Instead of parsing the CoffeeScript, just lex it, and print out the token stream. Used for debugging the compiler. |
-| `-n, --nodes` | Instead of compiling the CoffeeScript, just lex and parse it, and print out the parse tree. Used for debugging the compiler. |
-| `--nodejs` | The `node` executable has some useful options you can set, such as `--debug`, `--debug-brk`, `--max-stack-size`, and `--expose-gc`. Use this flag to forward options directly to Node.js. To pass multiple flags, use `--nodejs` multiple times. |
 | `--no-header` | Suppress the “Generated by CoffeeScript” header. |
+| `--nodejs` | The `node` executable has some useful options you can set, such as `--debug`, `--debug-brk`, `--max-stack-size`, and `--expose-gc`. Use this flag to forward options directly to Node.js. To pass multiple flags, use `--nodejs` multiple times. |
+| `--tokens` | Instead of parsing the CoffeeScript, just lex it, and print out the token stream. Used for debugging the compiler. |
+| `-n, --nodes` | Instead of compiling the CoffeeScript, just lex and parse it, and print out the parse tree. Used for debugging the compiler. |

 #### Examples:

@@ -35,3 +36,5 @@ Once installed, you should have access to the `coffee` command, which can execut
    `coffee -o lib/ -cw src/`
 *   Start the CoffeeScript REPL (`Ctrl-D` to exit, `Ctrl-V`for multi-line):<br>
    `coffee`
+
+To use `--transpile`, see [Transpilation](#transpilation).
--- a/documentation/sections/compatibility.md
+++ b/documentation/sections/compatibility.md
@@ -0,0 +1,5 @@
+### Compatibility
+
+With the exception of [modules](#modules) (`import` and `export` statements) and [JSX](#jsx), all the modern JavaScript features that CoffeeScript supports can run natively in Node 7.6+, meaning that Node can run CoffeeScript’s output without any further processing required. You can [run the tests in your browser](test.html) to see if your browser can do the same. For older browsers or older versions of Node, however, [transpilation](#transpilation) is required.
+
+Support for modern JavaScript syntax is important to ensure compatibility with frameworks that assume modern features. Now that CoffeeScript compiles classes to the `class` keyword, it’s possible to `extend` a JavaScript class; that wasn’t possible in CoffeeScript 1. Parity in how language features work is also important on its own; CoffeeScript “is just JavaScript,” and so things like [function parameter default values](#breaking-changes-default-values) should behave the same in CoffeeScript as in JavaScript. Some such features behave slightly differently in JavaScript than they did in CoffeeScript 1; in such cases we are conforming with the JavaScript spec, and we’ve documented the differences as [breaking changes](#breaking-changes).
--- a/documentation/sections/contributing.md
+++ b/documentation/sections/contributing.md
@@ -1,8 +1,8 @@
 ## Contributing

-Contributions are welcome! Feel free to fork [the repo](http://github.com/jashkenas/coffeescript) and submit a pull request.
+Contributions are welcome! Feel free to fork [the repo](https://github.com/jashkenas/coffeescript) and submit a pull request.

-[Some features of ECMAScript are intentionally unsupported](#unsupported). Please review both the open and closed [issues on GitHub](http://github.com/jashkenas/coffeescript/issues) to see if the feature you’re looking for has already been discussed. As a general rule, we don’t support ECMAScript syntax for features that aren’t yet finalized (at Stage 4 in the proposal approval process).
+[Some features of ECMAScript are intentionally unsupported](#unsupported). Please review both the open and closed [issues on GitHub](https://github.com/jashkenas/coffeescript/issues) to see if the feature you’re looking for has already been discussed. As a general rule, we don’t support ECMAScript syntax for features that aren’t yet finalized (at Stage 4 in the proposal approval process).

 For more resources on adding to CoffeeScript, please see [the Wiki](https://github.com/jashkenas/coffeescript/wiki/%5BHowto%5D-Hacking-on-the-CoffeeScript-Compiler), especially [How The Parser Works](https://github.com/jashkenas/coffeescript/wiki/%5BHowTo%5D-How-parsing-works).

--- a/documentation/sections/es2015plus_output.md
+++ b/documentation/sections/es2015plus_output.md
@@ -1,15 +0,0 @@
-### ES2015+ Output
-
-CoffeeScript 2 outputs the latest ES2015+ syntax. If you’re looking for a single tool that takes CoffeeScript input and generates JavaScript output that runs in any JavaScript runtime, assuming you opt out of certain newer features, stick to [CoffeeScript 1.x](/v1/). CoffeeScript 2 [breaks compatibility](#breaking-changes) with certain CoffeeScript 1.x features in order to conform with the ES2015+ specifications, and generate more idiomatic output (a CoffeeScript `=>` becomes an ES `=>`; a CoffeeScript `class` becomes an ES `class`; and so on).
-
-Since the CoffeeScript 2 compiler outputs ES2015+ syntax, it is your responsibility to either ensure that your target JavaScript runtime(s) support all these features, or that you pass the output through another transpiler like [Babel](http://babeljs.io/), [Rollup](https://github.com/rollup/rollup) or [Traceur Compiler](https://github.com/google/traceur-compiler). In general, [CoffeeScript 2’s output is supported as is by Node.js 7.6+](http://node.green/), except for modules and JSX which require transpilation.
-
-There are many great task runners for setting up JavaScript build chains, such as [Gulp](http://gulpjs.com/), [Webpack](https://webpack.github.io/), [Grunt](https://gruntjs.com/) and [Broccoli](http://broccolijs.com/). If you’re looking for a very minimal solution to get started, you can use [babel-preset-env](https://babeljs.io/docs/plugins/preset-env/) and the command line:
-
-```bash
-npm install --global coffeescript@next
-npm install --save-dev coffeescript@next babel-cli babel-preset-env
-coffee --print *.coffee | babel --presets env > app.js
-```
-
-Note that [babel-preset-env](https://babeljs.io/docs/plugins/preset-env/) doesn’t automatically supply polyfills for your code. CoffeeScript itself will output [`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf) if you use the `in` operator, or destructuring or spread/rest syntax; and [`Function.bind`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind) if you use a bound (`=>`) method in a class. Both are supported in Internet Explorer 9+ and all more recent browsers, but you will need to supply polyfills if you need to support Internet Explorer 8 or below and are using features that would cause these methods to be output, or in your own code are using similarly modern methods. One option is [`babel-polyfill`](https://babeljs.io/docs/usage/polyfill/), though there are many [other](https://hackernoon.com/polyfills-everything-you-ever-wanted-to-know-or-maybe-a-bit-less-7c8de164e423) [strategies](https://philipwalton.com/articles/loading-polyfills-only-when-needed/).
--- a/documentation/sections/installation.md
+++ b/documentation/sections/installation.md
@@ -5,7 +5,7 @@ The command-line version of `coffee` is available as a [Node.js](https://nodejs.
 To install, first make sure you have a working copy of the latest stable version of [Node.js](https://nodejs.org/). You can then install CoffeeScript globally with [npm](https://www.npmjs.com/):

 ```bash
-npm install --global coffeescript@next
+npm install --global coffeescript
 ```

 This will make the `coffee` and `cake` commands available globally.
@@ -13,7 +13,7 @@ This will make the `coffee` and `cake` commands available globally.
 When you need CoffeeScript as a dependency of a project, within that project’s folder you can install it locally:

 ```bash
-npm install --save coffeescript@next
+npm install --save-dev coffeescript
 ```

 The `coffee` and `cake` commands will first look in the current folder to see if CoffeeScript is installed locally, and use that version if so. This allows different versions of CoffeeScript to be installed globally and locally.
--- a/documentation/sections/introduction.md
+++ b/documentation/sections/introduction.md
@@ -5,5 +5,5 @@ The golden rule of CoffeeScript is: _“It’s just JavaScript.”_ The code com
 **Latest Version:** [<%= fullVersion %>](https://github.com/jashkenas/coffeescript/tarball/<%= fullVersion %>)

 ```bash
-npm install -g coffeescript@next
+npm install -g coffeescript
 ```
--- a/documentation/sections/nodejs_usage.md
+++ b/documentation/sections/nodejs_usage.md
@@ -23,3 +23,4 @@ The `compile` method has the signature `compile(code, options)` where `code` is
 * `options.filename`, string: the filename to use for the source map. It can include a path (relative or absolute).
 * `options.bare`, boolean: if true, output without the [top-level function safety wrapper](#lexical-scope).
 * `options.header`, boolean: if true, output the `Generated by CoffeeScript` header.
+* `options.transpile`, **object**: if set, this must be an object with the [options to pass to Babel](http://babeljs.io/docs/usage/api/#options). See [Transpilation](#transpilation).
--- a/documentation/sections/test.md
+++ b/documentation/sections/test.md
@@ -4,4 +4,4 @@ CoffeeScript includes an extensive test suite, which verifies that the compiler

 Note that since no JavaScript runtime yet supports ES2015 modules, the tests for module support verify only that the CoffeeScript compiler’s output is the correct syntax; the tests don’t verify that the modules resolve properly.

-[Run the tests in your browser.](http://coffeescript.org/v<%= majorVersion %>/test.html)
+[Run the tests in your browser.](test.html)
--- a/documentation/sections/transpilation.md
+++ b/documentation/sections/transpilation.md
@@ -0,0 +1,47 @@
+### Transpilation
+
+CoffeeScript 2 generates JavaScript that uses the latest, modern syntax. Your runtime [might not support all of that syntax](#compatibility). If so, you need to _transpile_ the JavaScript. To make things a little easier, CoffeeScript has built-in support for the popular [Babel](http://babeljs.io/) transpiler.
+
+#### Quickstart
+
+From the root of your project:
+
+```bash
+npm install --save-dev babel-core babel-preset-env
+echo '{ "presets": ["env"] }' > .babelrc
+coffee --compile --transpile --inline-map some-file.coffee
+```
+
+#### About Transpilation
+
+Transpilation is the conversion of source code into equivalent but different source code. In our case, we want to convert modern JavaScript into older JavaScript that will run in older versions of Node or older browsers; for example, `{ a } = obj` into `a = obj.a`. This is done via transpilers like [Babel](http://babeljs.io/), [Bublé](https://buble.surge.sh/) or [Traceur Compiler](https://github.com/google/traceur-compiler).
+
+CoffeeScript includes a `--transpile` option when used via the `coffee` command, or a `transpile` option when used via Node. To use either, [Babel](http://babeljs.io/) must be installed in your project:
+
+```bash
+npm install --save-dev babel-core
+```
+
+By default, Babel doesn’t do anything—it doesn’t make assumptions about what you want to transpile to. You might know that your code will run in Node 8, and so you want Babel to transpile modules and JSX and nothing else. Or you might want to support Internet Explorer 8, in which case Babel will transpile every feature introduced in ES2015 and later specs.
+
+If you’re not sure what you need, a good starting point is [`babel-preset-env`](https://babeljs.io/docs/plugins/preset-env/):
+
+```bash
+npm install --save-dev babel-preset-env
+```
+
+See [Babel’s website to learn about presets and plugins](https://babeljs.io/docs/plugins/) and the multitude of options you have.
+
+Simply installing `babel-preset-env` isn’t enough. You also need to define the configuration options that you want Babel to use. You can do this by creating a [`.babelrc` file](https://babeljs.io/docs/usage/babelrc/) in the folder containing the files you’re compiling, or in any parent folder up the path above those files. So if your project is in `~/app` and your files are in `~/app/src`, you can put `.babelrc` in either `~/app` or in `~/app/src`. You can also define the Babel options via a `babel` key in the `package.json` file for your project. A minimal `.babelrc` file (or `package.json` `babel` key) for use with `babel-preset-env` would be just `{ "presets": ["env"] }`.
+
+Once you have `babel-core` and `babel-preset-env` (or other presets or plugins) installed, and a `.babelrc` file (or `package.json` `babel` key) in place, you can use `coffee --transpile` to pipe CoffeeScript’s output through Babel using the options you’ve saved.
+
+If you’re using CoffeeScript via the [Node API](nodejs_usage), where you call `CoffeeScript.compile` with a string to be compiled and an `options` object, the `transpile` key of the `options` object should be the Babel options:
+
+```js
+CoffeeScript.compile(code, {transpile: {presets: ['env']}})
+```
+
+You can also transpile CoffeeScript’s output without using the `transpile` option, for example as part of a build chain. This lets you use transpilers other than Babel, and it gives you greater control over the process. There are many great task runners for setting up JavaScript build chains, such as [Gulp](http://gulpjs.com/), [Webpack](https://webpack.github.io/), [Grunt](https://gruntjs.com/) and [Broccoli](http://broccolijs.com/).
+
+Note that [babel-preset-env](https://babeljs.io/docs/plugins/preset-env/) doesn’t automatically supply [polyfills](https://developer.mozilla.org/en-US/docs/Glossary/Polyfill) for your code. CoffeeScript itself will output [`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf) if you use the `in` operator, or destructuring or spread/rest syntax; and [`Function.bind`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind) if you use a bound (`=>`) method in a class. Both are supported in Internet Explorer 9+ and all more recent browsers, but you will need to supply polyfills if you need to support Internet Explorer 8 or below and are using features that would cause these methods to be output. You’ll also need to supply polyfills if your own code uses these methods or another method added in recent versions of JavaScript. One polyfill option is [`babel-polyfill`](https://babeljs.io/docs/usage/polyfill/), though there are many [other](https://hackernoon.com/polyfills-everything-you-ever-wanted-to-know-or-maybe-a-bit-less-7c8de164e423) [strategies](https://philipwalton.com/articles/loading-polyfills-only-when-needed/).
--- a/documentation/sections/whats_new_in_coffeescript_2.md
+++ b/documentation/sections/whats_new_in_coffeescript_2.md
@@ -0,0 +1,5 @@
+### What’s New In CoffeeScript 2?
+
+The biggest change in CoffeeScript 2 is that now the CoffeeScript compiler produces modern JavaScript syntax (ES6, or ES2015 and later). A CoffeeScript `=>` becomes a JS `=>`, a CoffeeScript `class` becomes a JS `class` and so on. Major new features in CoffeeScript 2 include [async functions](#async-functions) and [JSX](#jsx). You can read more in the [announcement](announcing-coffeescript-2/).
+
+There are very few [breaking changes from CoffeeScript 1.x to 2](#breaking-changes); we hope the upgrade process is smooth for most projects.
--- a/documentation/sections/why_coffeescript.md
+++ b/documentation/sections/why_coffeescript.md
@@ -0,0 +1,5 @@
+### Why CoffeeScript When There’s ES6?
+
+CoffeeScript introduced many new features to the JavaScript world, such as [`=>`](#fat-arrow) and [destructuring](#destructuring) and [classes](#classes). We are happy that ECMA has seen their utility and adopted them into ECMAScript.
+
+CoffeeScript’s intent, however, was never to be a superset of JavaScript. One of the guiding principles of CoffeeScript has been _simplicity:_ not just removing JavaScript’s “bad parts,” but providing an elegant, concise syntax that eschews unnecessary punctuation whenever possible, to make code easier to read and reason about. This benefit of CoffeeScript remains, even in an ES2015+ world.
--- a/documentation/site/body.html
+++ b/documentation/site/body.html
@@ -3,22 +3,29 @@
 <%= include('try.html') %>

 <div class="container-fluid" id="top">
-  <div class="row row-offcanvas row-offcanvas-left">
-    <nav class="sidebar sidebar-offcanvas col-xs-12 col-lg-3 bg-ribbed-light">
+  <div class="row flex-nowrap">
+    <nav class="sidebar col-lg-3 bg-ribbed-light">
      <%= include('sidebar.html') %>
    </nav>
    <main class="main col-lg-9 ml-auto">
-
      <header class="title-logo d-none d-lg-block">
-        <%= include('documentation/images/logo.svg') %>
+        <%= include('logo.svg') %>
      </header>
-
      <section id="overview">
        <%= htmlFor('introduction') %>
        <%= htmlFor('overview') %>
      </section>
      <section id="coffeescript-2">
        <%= htmlFor('coffeescript_2') %>
+        <section id="whats-new-in-coffeescript-2">
+          <%= htmlFor('whats_new_in_coffeescript_2') %>
+        </section>
+        <section id="why-coffeescript">
+          <%= htmlFor('why_coffeescript') %>
+        </section>
+        <section id="compatibility">
+          <%= htmlFor('compatibility') %>
+        </section>
      </section>
      <section id="installation">
        <%= htmlFor('installation') %>
@@ -28,12 +35,12 @@
        <section id="cli">
          <%= htmlFor('command_line_interface') %>
        </section>
-        <section id="es2015plus-output">
-          <%= htmlFor('es2015plus_output') %>
-        </section>
        <section id="nodejs-usage">
          <%= htmlFor('nodejs_usage') %>
        </section>
+        <section id="transpilation">
+          <%= htmlFor('transpilation') %>
+        </section>
      </section>
      <section id="language">
        <%= htmlFor('language') %>
@@ -197,7 +204,6 @@
      <section id="changelog">
        <%= htmlFor('changelog') %>
      </section>
-
    </main>
  </div>
 </div>
--- a/documentation/site/code.coffee
+++ b/documentation/site/code.coffee
@@ -0,0 +1,47 @@
+fs           = require 'fs'
+_            = require 'underscore'
+
+# Use CodeMirror in Node for syntax highlighting, per
+# https://github.com/codemirror/CodeMirror/blob/master/bin/source-highlight
+CodeMirror   = require 'codemirror/addon/runmode/runmode.node.js'
+require 'codemirror/mode/coffeescript/coffeescript.js'
+require 'codemirror/mode/javascript/javascript.js'
+
+CoffeeScript = require '../../lib/coffeescript'
+
+
+module.exports = ->
+  (file, run = no) ->
+    cs = fs.readFileSync "documentation/examples/#{file}.coffee", 'utf-8'
+    js = CoffeeScript.compile cs, bare: yes # This is just the initial JavaScript output; it is replaced by dynamic compilation on changes of the CoffeeScript pane.
+    render = _.template fs.readFileSync('documentation/site/code.html', 'utf-8')
+    include = (file) -> fs.readFileSync("documentation/site/#{file}", 'utf-8')
+
+    highlight = (language, code) ->
+      # Adapted from https://github.com/codemirror/CodeMirror/blob/master/bin/source-highlight.
+      html = ''
+      curStyle = null
+      accum = ''
+
+      esc = (str) ->
+        str.replace /[<&]/g, (ch) ->
+          if ch is '&' then '&amp;' else '&lt;'
+
+      flush = ->
+        if curStyle
+          html += "<span class=\"#{curStyle.replace /(^|\s+)/g, '$1cm-'}\">#{esc accum}</span>"
+        else
+          html += esc accum
+
+      CodeMirror.runMode code, {name: language}, (text, style) ->
+        if style isnt curStyle
+          flush()
+          curStyle = style
+          accum = text
+        else
+          accum += text
+      flush()
+
+      html
+
+    output = render {file, cs, js, highlight, include, run}
--- a/documentation/v2/twilight.css
+++ b/documentation/v2/twilight.css
@@ -1,41 +1,66 @@
 /* Adapted from https://github.com/FarhadG/code-mirror-themes/blob/master/themes/twilight.css */

-.cm-s-twilight {
+.CodeMirror,
+.placeholder-code {
  letter-spacing: 0.3px;
  color: #f8f8f8;
+  /* Prevent mobile Safari from zooming in on our code editors; the code is 16px naturally, but somehow being explicit about it prevents the zooming */
+  font-size: 16px;
 }
-.cm-s-twilight .CodeMirror-lines {
+.CodeMirror-lines {
  padding: 0.5em 0;
 }
-.cm-s-twilight div.CodeMirror-cursor {
+.placeholder-code {
+  padding: 0.5em 4px;
+  margin-bottom: 1.3rem;
+  white-space: pre-wrap;
+}
+div.CodeMirror-cursor {
  border-left: 3px solid #f8f8f8;
 }
-.cm-s-twilight .CodeMirror-activeline-background {
+.CodeMirror-activeline-background {
  background: #ffffff08;
 }
-.cm-s-twilight .CodeMirror-selected {
+.CodeMirror-selected {
  background: #ddf0ff33;
 }
-.cm-s-twilight .cm-comment {
+.cm-comment,
+.placeholder-code .comment {
  font-style: italic;
  color: #5f5a60;
 }
-.cm-s-twilight .cm-keyword {
+.cm-keyword,
+.placeholder-code .keyword {
  color: #cda869;
 }
-.cm-s-twilight .cm-string {
+.cm-string,
+.placeholder-code .string {
  color: #8f9d6a;
 }
-.cm-s-twilight .cm-property {
+.cm-property,
+.placeholder-code .attribute {
  color: #dad085;
 }
-.cm-s-twilight .cm-atom {
+.cm-atom {
  color: #dad085;
 }
-.cm-s-twilight .cm-number {
+.cm-number,
+.placeholder-code .number,
+.placeholder-code .built_in,
+.placeholder-code .builtin-name,
+.placeholder-code .literal,
+.placeholder-code .type,
+/*.placeholder-code .params,*/
+.placeholder-code .meta,
+.placeholder-code .link {
  color: #dad085;
 }
-.cm-s-twilight .cm-operator {
+.cm-operator,
+.placeholder-code .punctuation,
+.placeholder-code .symbol,
+.placeholder-code .bullet,
+.placeholder-code .addition,
+.placeholder-code .operator {
  color: #cda869;
 }

--- a/documentation/site/code.html
+++ b/documentation/site/code.html
@@ -2,15 +2,17 @@
  <div class="row">
    <div class="col-md-6 coffeescript-input-column">
      <textarea class="coffeescript-input" id="<%= file %>-coffee"><%= cs %></textarea>
+      <pre class="placeholder-code"><%= highlight('coffeescript', cs) %></pre>
    </div>
    <div class="col-md-6 javascript-output-column">
      <textarea class="javascript-output" id="<%= file %>-js"><%= js %></textarea>
+      <pre class="placeholder-code"><%= highlight('javascript', js) %></pre>
    </div>
  </div>
  <% if (run) { %>
  <div class="row">
    <div class="col text-right">
-      <button type="button" class="btn btn-primary" data-action="run-code-example" data-example="<%= file %>" data-run="<%= escape(run) %>"><% if (run === true) { %>▶<% } else { %><small>▶</small>&ensp;<%= run.replace(/"/g, '&quot;') %><% } %></button>
+      <button type="button" class="btn btn-primary" data-action="run-code-example" data-example="<%= file %>" data-run="<%= escape(run) %>"><% if (run === true) { include('play.svg') } else { %><small><%= include('play.svg') %></small><%= run.replace(/"/g, '&quot;') %><% } %></button>
    </div>
  </div>
  <% } %>
--- a/documentation/site/docs.coffee
+++ b/documentation/site/docs.coffee
@@ -1,7 +1,10 @@
+unless window.location.origin # Polyfill `location.origin` for IE < 11
+  window.location.origin = "#{window.location.protocol}//#{window.location.hostname}"
+
 $(document).ready ->
  # Mobile navigation
  toggleSidebar = ->
-    $('.navbar-toggler, .row-offcanvas').toggleClass 'show'
+    $('.navbar-toggler, .sidebar').toggleClass 'show'

  $('[data-toggle="offcanvas"]').click toggleSidebar

@@ -12,8 +15,11 @@ $(document).ready ->
      setTimeout ->
        window.location = event.target.href
      , 260 # Wait for the sidebar to slide away before navigating
+    gtag 'event', 'sidebar_navigate',
+      event_category: 'navigation'
+      event_label: event.target.href.replace window.location.origin, ''

-  # Initialize Scrollspy for sidebar navigation; http://v4-alpha.getbootstrap.com/components/scrollspy/
+  # Initialize Scrollspy for sidebar navigation; https://getbootstrap.com/docs/4.0/components/scrollspy/
  # See also http://www.codingeverything.com/2014/02/BootstrapDocsSideBar.html and http://jsfiddle.net/KyleMit/v6zhz/
  $('body').scrollspy
    target: '#contents'
@@ -26,18 +32,27 @@ $(document).ready ->
    # We only want one active link in the nav
    $("#contents a.active[href!='#{target.relatedTarget}']").removeClass 'show'
    $target = $("#contents a[href='#{target.relatedTarget}']")
+    return if $target.prop('href') is "#{window.location.origin}/#try"
    # Update the browser address bar on scroll or navigation
    window.history.pushState {}, $target.text(), $target.prop('href')
+    # Track this as a new pageview; we only want '/#hash', not 'http://coffeescript.org/#hash'
+    gtag 'config', GA_TRACKING_ID,
+      page_path: $target.prop('href').replace window.location.origin, ''


  # Initialize CodeMirror for code examples; https://codemirror.net/doc/manual.html
+  # Defer this until a code example is clicked or focused, to avoid unnecessary computation/slowness
+  textareas = []
  editors = []
  lastCompilationElapsedTime = 200
  $('textarea').each (index) ->
+    textareas[index] = @
    $(@).data 'index', index
-    mode = if $(@).hasClass('javascript-output') then 'javascript' else 'coffeescript'

-    editors[index] = editor = CodeMirror.fromTextArea @,
+  initializeEditor = ($textarea) ->
+    index = $textarea.data 'index'
+    mode = if $textarea.hasClass('javascript-output') then 'javascript' else 'coffeescript'
+    editors[index] = editor = CodeMirror.fromTextArea $textarea[0],
      mode: mode
      theme: 'twilight'
      indentUnit: 2
@@ -72,6 +87,9 @@ $(document).ready ->
          catch exception
            output = "#{exception}"
          editors[index + 1].setValue output
+          gtag 'event', 'edit_code',
+            event_category: 'engagement'
+            event_label: $textarea.closest('[data-example]').data('example')
        , lastCompilationElapsedTime

      # Fix the code editors’ handling of tab-indented code
@@ -90,17 +108,43 @@ $(document).ready ->
          cm.options.indentWithTabs = /^\t/m.test cm.getValue()
          cm.execCommand 'newlineAndIndent'

+  $('.placeholder-code').one 'mouseover', (event) ->
+    $textarea = $(@).prev 'textarea'
+    $(@).remove()
+    initializeEditor $textarea
+    # Initialize the sibling column too
+    $siblingColumn = $ $textarea.parent().siblings()[0]
+    $siblingColumn.children('.placeholder-code').remove()
+    initializeEditor $ $siblingColumn.children('textarea')[0]
+
+  initializeTryEditors = ->
+    initializeEditor $ '#try-coffeescript-coffee'
+    initializeEditor $ '#try-coffeescript-js'
+
  # Handle the code example buttons
  $('[data-action="run-code-example"]').click ->
    run = $(@).data 'run'
    index = $("##{$(@).data('example')}-js").data 'index'
-    js = editors[index].getValue()
+    js = if editors[index]?
+      editors[index].getValue()
+    else
+      $(textareas[index]).val()
    js = "#{js}\nalert(#{unescape run});" unless run is yes
    eval js
+    gtag 'event', 'run_code',
+      event_category: 'engagement'
+      event_label: $(@).closest('[data-example]').data('example')

+  clearHash = ->
+    window.history.pushState '', document.title, window.location.pathname
+
+  $(window).on 'hashchange', ->
+    # Get rid of dangling # in the address bar
+    clearHash() if window.location.hash is ''

  # Try CoffeeScript
  toggleTry = (checkLocalStorage = no) ->
+    initializeTryEditors() if $('#try .CodeMirror').length is 0
    if checkLocalStorage and window.localStorage?
      try
        coffee = window.localStorage.getItem 'tryCoffeeScriptCode'
@@ -108,8 +152,10 @@ $(document).ready ->
          editors[0].setValue coffee
      catch exception
    $('#try, #try-link').toggleClass 'show'
+    setTimeout clearHash, 200 unless $('#try').hasClass('show')
  closeTry = ->
    $('#try, #try-link').removeClass 'show'
+    window.history.pushState '', document.title, window.location.pathname

  $('[data-toggle="try"]').click toggleTry
  $('[data-close="try"]').click closeTry
@@ -120,8 +166,11 @@ $(document).ready ->
    if window.location.hash is '#try'
      toggleTry yes
    else if window.location.hash.indexOf('#try') is 0
+      initializeTryEditors() if $('#try .CodeMirror').length is 0
      editors[0].setValue decodeURIComponent window.location.hash[5..]
      toggleTry()
+    else if window.location.hash is ''
+      clearHash()
    else
      initializeScrollspyFromHash window.location.hash
      if window.location.hash.length > 1
--- a/documentation/site/docs.css
+++ b/documentation/site/docs.css
@@ -1,5 +1,3 @@
-/* Adapted from https://v4-alpha.getbootstrap.com/examples/dashboard/dashboard.css and http://v4-alpha.getbootstrap.com/examples/offcanvas/offcanvas.css */
-
 html,
 body {
  /* Prevent scroll on narrow devices */
@@ -51,7 +49,7 @@ button:focus, .navbar-dark .navbar-toggler:focus {
 */
 .site-navbar {
  height: 3.5rem;
-  font-family: Lato;
+  font-family: 'Lato';
  font-weight: 400;
  font-size: 1.1em;
 }
@@ -86,44 +84,39 @@ button:focus, .navbar-dark .navbar-toggler:focus {
 */

 .sidebar {
-  background-color: #efebe9;
-  border-right: 1px solid #efebe9;
-  top: 3.5rem;
-  bottom: 0;
-  left: 0;
-  z-index: 1000;
-  display: block;
-  padding: 0;
-}
-.sidebar .contents {
-  height: 100%;
+  position: fixed;
+  top: 3.5em;
+  height: calc(100% - 3.5rem);
  /* Scrollable contents if viewport is shorter than content */
  overflow-y: auto;
  overflow-x: hidden;
-  padding: 0.5em 0 0.5em 0.3em;
+  left: 0;
+  bottom: 0;
+  z-index: 1000;
+  padding: 0;
+  background-color: #efebe9;
+  border-right: 1px solid #efebe9;
+}
+.sidebar::-webkit-scrollbar {
+  display: none;
+}
+@media screen and (max-width: 991px) {
+  .sidebar {
+    left: -100%;
+    transition: 0.25s left ease-in-out;
+  }
+  .sidebar.show {
+    left: 0;
+  }
+}
+
+.contents {
+  padding: 0.5em 0 0.5em 0.5em;
  font-family: 'Alegreya Sans';
  font-weight: 400;
  font-size: 1.2em;
  align-items: normal;
 }
-.sidebar .contents::-webkit-scrollbar {
-  display: none;
-}
-@media screen and (max-width: 991px) {
-  .sidebar .contents {
-    position: fixed;
-    height: calc(100% - 3.5rem);
-  }
-}
-@media screen and (min-width: 992px) {
-  .sidebar {
-    position: fixed;
-  }
-}
-
-.contents-column {
-  display: block;
-}

 .contents .nav .nav {
  margin-left: 1em;
@@ -141,44 +134,6 @@ button:focus, .navbar-dark .navbar-toggler:focus {
 }


-/*
- * Off Canvas
- */
-@media screen and (max-width: 991px) {
-  .row-offcanvas {
-    position: relative;
-    transition: all .25s ease-in-out;
-  }
-  .row-offcanvas-left {
-    left: 0;
-  }
-  .sidebar-offcanvas {
-    position: absolute;
-    top: 0;
-  }
-}
-@media screen and (max-width: 767px) {
-  .row-offcanvas-left .sidebar-offcanvas {
-    left: -100%;
-  }
-  .row-offcanvas-left.show {
-    left: calc(100% + 30px)
-  }
-}
-@media screen and (min-width: 768px) and (max-width: 991px) {
-  .row-offcanvas-left .sidebar-offcanvas {
-    left: calc(-66.667% - 15px);
-    width: 66.667%;
-  }
-  .row-offcanvas-left.show {
-    left: calc(66.667% + 30px);
-  }
-  .row-offcanvas-left .sidebar-offcanvas .contents {
-    width: 66.667%;
-  }
-}
-
-
 /*
 * Main content
 */
@@ -311,7 +266,12 @@ textarea {
  outline: 0;
 }

-.CodeMirror {
+.play-button {
+  height: 1em;
+}
+
+.CodeMirror,
+.placeholder-code {
  /* https://codemirror.net/demo/resize.html */
  height: auto;
  background: transparent;
@@ -321,7 +281,8 @@ textarea {
  font-size: 0.9em;
 }
@media (min-width: 768px) {
-  .CodeMirror {
+  .CodeMirror,
+  .placeholder-code {
    font-size: 1em;
  }
 }
--- a/documentation/images/icon.svg
+++ b/documentation/images/icon.svg
--- a/documentation/site/index.html
+++ b/documentation/site/index.html
--- a/documentation/site/logo.svg
+++ b/documentation/site/logo.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-22 347 566 100">
+  <title>
+    CoffeeScript Logo
+  </title>
+  <path d="M21.7 351.1c.1.6-.2 1.1-1.2 1.6-1.3-.7-4.1-1.1-6.4-.9-2.5.2-4.6 1-4.3 2.7.4 1.7 2.8 2.7 7.1 2.3 10.5-.9 10.4-8 25.8-9.4 12-1.1 18.7 2.6 19.6 7.1.7 3.5-2.2 6.9-10.9 7.6-7.7.7-12.2-1.4-12.6-3.5-.2-1.1.4-2.7 4.1-3.1.4 1.7 2.5 3.5 7.5 3 3.6-.3 6.6-1.6 6.2-3.6-.4-2.1-4.2-3.3-10.2-2.8-12.2 1.1-15.2 7.8-25.6 8.7-7.4.7-13.4-2-14.2-6-.3-1.5-.3-5 7.5-5.7 4-.3 7.2.4 7.6 2zm-39 41.8c-3.4 4.3-4.9 9.3-4.6 14.2.3 4.9 2.7 8.9 6.5 12 4 3.1 8.3 4 13.2 3.1 1.9-.3 4-1.3 5.9-1.9-4 0-7.4-1.3-10.8-4-3.7-2.7-6.2-6.5-6.8-11.1-.9-4.3 0-8.3 2.4-11.8 2.7-3.4 6.2-5.3 10.8-5.9 4.6-.3 8.6.9 12.6 3.7-.9-1.3-2.2-2.2-3.4-3.4-4-2.7-8.3-4-13.6-2.7-4.8 1-8.8 3.5-12.2 7.8zm53.6-23.1c-12.9 0-24.4-1.3-32.7-3.1-8.9-2.2-13.6-4.6-13.6-7.7 0-1.3.6-2.4 2.4-3.7-5.6 2.2-8.6 4-8.6 6.8.3 3.1 5.3 6.2 15.5 8.6 9.6 2.4 21.9 3.7 36.7 3.7 15.1 0 27.1-1.3 36.7-3.7 10.2-2.4 15.1-5.6 15.1-8.6 0-2.2-2.2-4.3-6.2-5.9.9.6 1.6 1.6 1.6 2.7 0 3.1-4.6 5.6-13.9 7.7-8.6 1.9-19.6 3.2-33 3.2zm36.8 8.6c-9.6 2.2-21.9 3.7-36.7 3.7-15.1 0-27.4-1.6-37-3.7-8.6-2.2-13.2-4.6-14.8-7.1 1.6 10.8 5.3 21 10.2 30 3.7 5.6 7.4 10.5 11.1 15.8 1.6 3.1 2.7 6.2 3.4 9.3 2.4 3.4 5.9 5.6 10.2 6.8 5.3 1.9 10.8 2.7 16.4 2.4h.6c5.6.3 11.5-.6 16.9-2.4 4-1.3 7.4-3.4 9.9-6.8h.3c.6-3.1 1.6-6.2 3.1-9.3 3.7-5.3 7.4-10.2 11.1-15.8 4.9-8.9 8.3-19.1 10.2-30-2 2.8-6.6 5.2-14.9 7.1zm106.2 30.1c-4.8 12.1-17.6 16.9-25.9 16.9-13.4 0-19.9-6-19.9-22.3 0-16.5 7.9-47.3 31.7-47.3 8.5 0 15.2 3.3 15.2 12.1 0 4.8-1.8 8.3-6.4 8.3-1.5 0-3.4-.4-5.2-2.4 2.2-1.1 4.2-4.9 4.2-8.3 0-2.9-1.5-5.6-5.6-5.6-10 0-18.9 23.9-18.9 42.4 0 8.3 2.2 14.2 10.9 14.2 7.1 0 13.5-3.4 17.7-9.1l2.2 1.1zm32.9-16.3c.4.2.7.2 1 .2 4.2 0 10.1-2.7 14-5.5l.8 2.4c-3.4 3.7-9.5 6.5-16.1 7.5-1.5 16.8-10.6 27.3-21.7 27.3-8.4 0-14.5-4-14.5-14.4 0-10.5 6.2-32.2 24.9-32.2 7.8.3 11.6 5.3 11.6 14.7zm-7.7 5c-1.9-.5-2.4-2-2.4-3.8 0-2.5 1.2-4.2 2.8-4.9-.2-3.8-1.1-5.3-3.4-5.3-6.5 0-12 16.6-12 25.6 0 6 1.2 7.3 4.6 7.3 4.2.1 8.9-8 10.4-18.9zm-6.6 39.7c0-8.3 7.1-11 15.8-13.6l10.9-51.9c2.7-13 10.6-15.5 16.5-15.5 4.1 0 8 2.2 9.7 5.7 3.6-4.6 8.4-5.7 12.4-5.7 5.6 0 10.8 3.9 10.8 9.8 0 1.5-.1 2.6-.3 3.7h-4.3c.1-.9.2-1.7.2-2.4 0-2.1-1.7-3.1-3.4-3.1-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9.1l-.8 3.6h-9l-10.3 49.1c-2.7 13-10.6 15.5-16.5 15.5-5.2 0-8.3-2.3-9.8-5.7-3.5 4.6-8.3 5.7-12.3 5.7-5.6.1-10.8-3.8-10.8-9.7zm9.1 1.8c1.9 0 4.2-1.8 5.4-7.1l1.1-5.3c-5.7 2-10.1 4.4-10.1 9.4 0 1.2 1.7 3 3.6 3zm21.7 0c1.9 0 4.2-1.8 5.4-7.1l2.2-10.4-9.4 1.8-1.8 8.3c-.5 2.1-1.1 4-1.8 5.6.9 1.3 3 1.8 5.4 1.8zm-1.4-18l9.4-1.7 7.7-36.8h-9l-8.1 38.5zm16.6-56.7c-2 0-4.8 1.1-6.2 7.1l-1.7 7.4h9l2.1-9.5c.2-.7.2-1.3.2-2 .1-2-1.5-3-3.4-3zm37.9 53c7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.5-10 18.5-20.9 19.2-.1 1.3-.2 2.5-.2 3.6 0 6.2 2.2 7.7 6.5 7.7zm5.3-34.4c-4.6 0-9.1 9.7-10.9 18.7 7-.5 13.2-7.4 13.2-15 0-2.2-.5-3.7-2.3-3.7zm28.6 33.4c3.4 0 7.8-2.3 10.8-4.8-2 10.4-8.4 13.4-15.8 13.4-8.4 0-14.1-4.2-14.1-14.5 0-10.5 5.9-32.3 24.6-32.3 8.1 0 10 4.2 10 8.7 0 10.6-10 18.5-20.9 19.2-.1.9-.2 2-.2 2.7 0 5.7 2.5 7.6 5.6 7.6zm6.2-33.4c-4.5 0-9.1 10.1-11 18.7 7.1-.4 13.3-7.3 13.3-15 0-2.2-.6-3.7-2.3-3.7zm51.3-6.7c-1.7 0-3-.6-4.2-1.9 2.4-1.5 4.1-4.8 4.1-7.8 0-3.1-1.8-6.1-6.8-6.1s-8.3 2.8-8.3 8.2c0 13.3 20.5 15.2 20.5 34.8 0 15.3-12.3 22.7-25.6 22.7-10.4 0-19.3-4.5-19.3-15.7 0-9.8 7-14.9 13.3-14.9 3.1 0 7.7 1.3 8 6-4.9 0-10.7 2.3-10.7 8.5 0 4.5 2.9 8.7 8.7 8.7 6.1 0 10.6-4.4 10.6-12 0-15.6-18.6-21.1-18.6-34.5 0-9.5 9.3-16.3 21-16.3 4.3 0 14.6.9 14.6 10.9.1 5.5-2.8 9.4-7.3 9.4zm36.2 10.3c0-2.3-.8-3.7-2.5-3.7-5.7 0-11.7 16.6-11.7 26.7 0 6.2 2.2 7.6 6.6 7.6 7.1 0 11.6-4 16.1-9.2h3.1c-5.2 8.3-12.9 16.8-25 16.8-8.5 0-14.2-4.2-14.2-14.5 0-10.6 6-32.3 24.5-32.3 8.1 0 10.1 4.2 10.1 8.3 0 4.4-2.2 6.7-4.8 6.7-1 0-2.1-.4-3.1-1.1.5-1.9.9-3.6.9-5.3zm27.7-7.6l-1.2 5.7c3.1-2.7 6.7-5.7 11-5.7 4.1 0 6.3 3.3 6.3 6.9 0 3.1-2.1 6.7-6.6 6.7-5.1 0-2.5-6-5.3-6-2.7 0-4.4 1.4-6.7 3.4l-7.2 34.6h-13.1l9.6-45.4 13.2-.2zm34.2 0l-6.6 30.9c-.3 1.2-.4 2.1-.4 2.9 0 2.5 1.2 3.3 3.7 3.3 3.5 0 6.9-3.4 8.1-8h3.8c-5.2 14.8-14.2 16.8-19.1 16.8-5.5 0-9.7-3.2-9.7-10.9 0-1.8.3-3.7.7-5.9l6.2-29.2 13.3.1zm-4.1-19.4c4 0 7.2 3.2 7.2 7.2s-3.2 7.1-7.2 7.1-7.1-3.1-7.1-7.1c-.1-4 3.2-7.2 7.1-7.2zm29.1 16l-1.5 6.9c2.6-2.3 6.1-3.9 10.7-3.9 6.2 0 11.1 3.5 11.1 14.4 0 12.2-4.7 32.1-22.3 32.1-4.5 0-6.8-1.6-7.7-3.2l-4.7 22.1-13.7 3.2 15.2-71.5 12.9-.1zm7.8 17c0-7-2.9-7.5-4.5-7.5-2 0-4.5 1.6-6.3 4.4l-5.4 25.5c.4 1 1.4 2.1 3.4 2.1 9.7 0 12.8-15.9 12.8-24.5zm27.8 17.3c-.3 1.1-.5 2.2-.5 3.1 0 1.9.7 3.2 3.1 3.2.7 0 1.7 0 2.4-.3-2.5 7.8-6.6 8.9-9.6 8.9-6.4 0-9.1-4.4-9.1-10.3 0-1.6.2-3.1.6-4.8l5.8-27.2h-3l.7-3.6h3L528 366l13.4-1.9s-1.4 6.2-3.1 14.4h5.5l-.7 3.6h-5.5l-5.7 27.4z"/>
+</svg>
--- a/documentation/site/navbar.html
+++ b/documentation/site/navbar.html
@@ -1,15 +1,16 @@
 <nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-dark bg-ribbed-dark site-navbar">
-  <a class="navbar-brand" href="#" data-close="try"><%= include('documentation/images/logo.svg') %></a>
+  <a class="navbar-brand" href="#" data-close="try"><%= include('logo.svg') %></a>
  <button class="navbar-toggler" type="button" data-toggle="offcanvas" data-close="try" aria-label="Toggle sidebar">
    <span class="navbar-toggler-icon"></span>
  </button>

  <nav class="collapse navbar-collapse">
-    <ul class="navbar-nav mr-auto d-none d-lg-flex">
+    <div class="navbar-nav mr-auto d-none d-lg-flex">
      <a href="#try" id="try-link" class="nav-item nav-link" data-toggle="try">Try CoffeeScript</a>
      <a href="#language" class="nav-item nav-link" data-close="try">Language Reference</a>
      <a href="#resources" class="nav-item nav-link" data-close="try">Resources</a>
-      <a href="http://github.com/jashkenas/coffeescript/" class="nav-item nav-link" data-close="try">GitHub
+      <a href="https://github.com/jashkenas/coffeescript/" class="nav-item nav-link" data-close="try">GitHub
        </a>
+    </div>
  </nav>
 </nav>
--- a/documentation/site/play.svg
+++ b/documentation/site/play.svg
@@ -0,0 +1,3 @@
+<svg class="play-button" viewBox="0 0 24 24">
+  <path d="M2.56-0.01v24.02L21.44 11.98 2.56-0.01z"/>
+</svg>
--- a/documentation/site/scripts.html
+++ b/documentation/site/scripts.html
@@ -6,6 +6,14 @@
 <script src="https://cdn.jsdelivr.net/combine/npm/codemirror@5.29.0/lib/codemirror.js,npm/codemirror@5.29.0/mode/coffeescript/coffeescript.js,npm/codemirror@5.29.0/addon/lint/coffeescript-lint.js,npm/codemirror@5.29.0/mode/javascript/javascript.js"></script>

 <script src="browser-compiler/coffeescript.js"></script>
-<script type="text/coffeescript">
-<%= include('docs.coffee') %>
+<script>
+<%= includeScript('docs.coffee') %>
+</script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-106156830-1"></script>
+<script>
+  window.GA_TRACKING_ID = 'UA-106156830-1';
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments)};
+  gtag('js', new Date());
+  gtag('config', GA_TRACKING_ID);
 </script>
--- a/documentation/site/sidebar.html
+++ b/documentation/site/sidebar.html
@@ -1,14 +1,19 @@
 <nav id="contents" class="navbar contents">
-  <nav class="nav flex-column contents-column">
+  <nav class="nav flex-column">
    <a href="#try" class="nav-link d-md-none" data-action="sidebar-nav" data-toggle="try">Try CoffeeScript</a>
    <a href="#top" class="nav-link" data-action="sidebar-nav">Overview</a>
    <a href="#coffeescript-2" class="nav-link" data-action="sidebar-nav">CoffeeScript 2</a>
+    <nav class="nav flex-column">
+      <a href="#whats-new-in-coffeescript-2" class="nav-link" data-action="sidebar-nav">What’s New in CoffeeScript 2</a>
+      <a href="#why-coffeescript" class="nav-link" data-action="sidebar-nav">Why CoffeeScript When There’s ES6?</a>
+      <a href="#compatibility" class="nav-link" data-action="sidebar-nav">Compatibility</a>
+    </nav>
    <a href="#installation" class="nav-link" data-action="sidebar-nav">Installation</a>
    <a href="#usage" class="nav-link" data-action="sidebar-nav">Usage</a>
    <nav class="nav flex-column">
      <a href="#cli" class="nav-link" data-action="sidebar-nav">Command Line</a>
-      <a href="#es2015plus-output" class="nav-link" data-action="sidebar-nav">ES2015+ Output</a>
      <a href="#nodejs-usage" class="nav-link" data-action="sidebar-nav">Node.js</a>
+      <a href="#transpilation" class="nav-link" data-action="sidebar-nav">Transpilation</a>
    </nav>
    <a href="#language" class="nav-link" data-action="sidebar-nav">Language Reference</a>
      <nav class="nav flex-column">
@@ -54,7 +59,7 @@
        <a href="#annotated-source" class="nav-link" data-action="sidebar-nav">Annotated Source</a>
        <a href="#contributing" class="nav-link" data-action="sidebar-nav">Contributing</a>
      </nav>
-    <a href="http://github.com/jashkenas/coffeescript/" class="nav-item nav-link d-md-none" data-action="sidebar-nav">GitHub</a>
+    <a href="https://github.com/jashkenas/coffeescript/" class="nav-item nav-link d-md-none" data-action="sidebar-nav">GitHub</a>
    <a href="#unsupported" class="nav-link" data-action="sidebar-nav">Unsupported ECMAScript Features</a>
      <nav class="nav flex-column">
        <a href="#unsupported-let-const" class="nav-link" data-action="sidebar-nav"><code>let</code> and <code>const</code></a>
--- a/documentation/site/styles.html
+++ b/documentation/site/styles.html
@@ -4,5 +4,5 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/codemirror/4.5.0/codemirror.css" crossorigin="anonymous">
 <style>
 <%= include('docs.css') %>
-<%= include('twilight.css') %>
+<%= include('code.css') %>
 </style>
--- a/documentation/site/test.html
+++ b/documentation/site/test.html
@@ -132,10 +132,29 @@ done = ->
  msg = "failed #{total - passedTests} tests and #{msg}" unless yay
  say msg, (if yay then 'good' else 'bad')

+  gtag 'event', 'tests_complete',
+    event_category: 'tests'
+    event_label: if yay then 'passed' else 'failed'
+    value: if yay then passedTests else total - passedTests
+  gtag 'event', 'tests_report',
+    event_category: 'tests'
+    event_label: msg
+  gtag 'event', 'timing_complete',
+    name: 'tests_run'
+    value: sec * 1000
+
 Promise.all(asyncTests).then(done).catch(done)
 </script>

 <%= tests %>

+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-106156830-1"></script>
+<script>
+  window.GA_TRACKING_ID = 'UA-106156830-1';
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments)};
+  gtag('js', new Date());
+  gtag('config', GA_TRACKING_ID);
+</script>
 </body>
 </html>
--- a/documentation/site/try.html
+++ b/documentation/site/try.html
@@ -9,7 +9,7 @@
  </div>
  <div class="row">
    <div class="col text-right try-buttons">
-      <button type="button" class="btn btn-primary" data-action="run-code-example" data-example="try-coffeescript" data-run="true">▶</button>&emsp;
+      <button type="button" class="btn btn-primary" data-action="run-code-example" data-example="try-coffeescript" data-run="true"><%= include('play.svg') %></button>&emsp;
    </div>
  </div>
 </aside>
--- a/documentation/v1/body.html
+++ b/documentation/v1/body.html
@@ -1,155 +0,0 @@
-<div id="fadeout"></div>
-
-<div id="flybar">
-  <a id="logo" href="#top"><%= include('documentation/images/logo.svg') %></a>
-  <div class="navigation toc">
-    <div class="button">
-      Table of Contents
-    </div>
-    <div class="contents menu">
-      <a href="#overview">Overview</a>
-      <a href="#installation">Installation</a>
-      <a href="#usage">Usage</a>
-      <a href="#literate">Literate CoffeeScript</a>
-      <a href="#language">Language Reference</a>
-      <a href="#literals">Literals: Functions, Objects and Arrays</a>
-      <a href="#lexical-scope">Lexical Scoping and Variable Safety</a>
-      <a href="#conditionals">If, Else, Unless, and Conditional Assignment</a>
-      <a href="#splats">Splats…</a>
-      <a href="#loops">Loops and Comprehensions</a>
-      <a href="#slices">Array Slicing and Splicing</a>
-      <a href="#expressions">Everything is an Expression</a>
-      <a href="#operators">Operators and Aliases</a>
-      <a href="#existential-operator">Existential Operator</a>
-      <a href="#classes">Classes, Inheritance, and Super</a>
-      <a href="#destructuring">Destructuring Assignment</a>
-      <a href="#fat-arrow">Bound and Generator Functions</a>
-      <a href="#embedded">Embedded JavaScript</a>
-      <a href="#switch">Switch and Try/Catch</a>
-      <a href="#comparisons">Chained Comparisons</a>
-      <a href="#strings">String Interpolation, Block Strings, and Block Comments</a>
-      <a href="#tagged-template-literals">Tagged Template Literals</a>
-      <a href="#regexes">Block Regular Expressions</a>
-      <a href="#modules">Modules</a>
-      <a href="#cake">Cake, and Cakefiles</a>
-      <a href="#source-maps">Source Maps</a>
-      <a href="#scripts">"text/coffeescript" Script Tags</a>
-      <a href="#resources">Books, Screencasts, Examples and Resources</a>
-      <a href="#changelog">Changelog</a>
-    </div>
-  </div>
-  <div class="navigation try">
-    <div class="button">
-      Try CoffeeScript
-      <div class="repl_bridge"></div>
-    </div>
-    <div class="contents repl_wrapper">
-      <div class="code">
-        <div class="screenshadow tl"></div>
-        <div class="screenshadow tr"></div>
-        <div class="screenshadow bl"></div>
-        <div class="screenshadow br"></div>
-        <div id="repl_source_wrap">
-          <textarea id="repl_source" rows="100" spellcheck="false">alert "Hello CoffeeScript!"</textarea>
-        </div>
-        <div id="repl_results_wrap"><pre id="repl_results"></pre></div>
-        <div class="minibutton dark run" title="Ctrl-Enter">Run</div>
-        <a class="minibutton permalink" id="repl_permalink">Link</a>
-        <br class="clear" />
-      </div>
-    </div>
-  </div>
-  <div class="navigation annotated">
-    <div class="button">
-      Annotated Source
-    </div>
-    <div class="contents menu">
-      <a href="/v<%= majorVersion %>/annotated-source/grammar.html">Grammar Rules — src/grammar</a>
-      <a href="/v<%= majorVersion %>/annotated-source/lexer.html">Lexing Tokens — src/lexer</a>
-      <a href="/v<%= majorVersion %>/annotated-source/rewriter.html">The Rewriter — src/rewriter</a>
-      <a href="/v<%= majorVersion %>/annotated-source/nodes.html">The Syntax Tree — src/nodes</a>
-      <a href="/v<%= majorVersion %>/annotated-source/scope.html">Lexical Scope — src/scope</a>
-      <a href="/v<%= majorVersion %>/annotated-source/helpers.html">Helpers &amp; Utility Functions — src/helpers</a>
-      <a href="/v<%= majorVersion %>/annotated-source/coffee-script.html">The CoffeeScript Module — src/coffee-script</a>
-      <a href="/v<%= majorVersion %>/annotated-source/cake.html">Cake &amp; Cakefiles — src/cake</a>
-      <a href="/v<%= majorVersion %>/annotated-source/command.html">“coffee” Command-Line Utility — src/command</a>
-      <a href="/v<%= majorVersion %>/annotated-source/optparse.html">Option Parsing — src/optparse</a>
-      <a href="/v<%= majorVersion %>/annotated-source/repl.html">Interactive REPL — src/repl</a>
-      <a href="/v<%= majorVersion %>/annotated-source/sourcemap.html">Source Maps — src/sourcemap</a>
-    </div>
-  </div>
-</div>
-
-<div id="top" class="container">
-  <span class="bookmark" id="overview"></span>
-    <%= htmlFor('introduction') %>
-    <%= htmlFor('overview') %>
-  <span class="bookmark" id="installation"></span>
-    <%= htmlFor('installation') %>
-  <span class="bookmark" id="usage"></span>
-    <%= htmlFor('usage') %>
-  <span class="bookmark" id="literate"></span>
-    <%= htmlFor('literate') %>
-  <span class="bookmark" id="language"></span>
-    <%= htmlFor('language') %>
-    <span class="bookmark" id="literals"></span>
-      <%= htmlFor('functions') %>
-    <span class="bookmark" id="objects-and-arrays"></span>
-      <%= htmlFor('objects_and_arrays') %>
-    <span class="bookmark" id="lexical-scope"></span>
-      <%= htmlFor('lexical_scope') %>
-    <span class="bookmark" id="conditionals"></span>
-      <%= htmlFor('conditionals') %>
-    <span class="bookmark" id="splats"></span>
-      <%= htmlFor('splats') %>
-    <span class="bookmark" id="loops"></span>
-      <%= htmlFor('loops') %>
-    <span class="bookmark" id="slices"></span>
-      <%= htmlFor('slices') %>
-    <span class="bookmark" id="expressions"></span>
-      <%= htmlFor('expressions') %>
-    <span class="bookmark" id="operators"></span>
-      <%= htmlFor('operators') %>
-    <span class="bookmark" id="existential-operator"></span>
-      <%= htmlFor('existential_operator') %>
-    <span class="bookmark" id="classes"></span>
-      <%= htmlFor('classes') %>
-    <span class="bookmark" id="destructuring"></span>
-      <%= htmlFor('destructuring') %>
-    <span class="bookmark" id="fat-arrow"></span>
-      <%= htmlFor('fat_arrow') %>
-    <span class="bookmark" id="embedded"></span>
-      <%= htmlFor('embedded') %>
-    <span class="bookmark" id="switch"></span>
-      <%= htmlFor('switch') %>
-    <span class="bookmark" id="try-catch"></span>
-      <%= htmlFor('try') %>
-    <span class="bookmark" id="comparisons"></span>
-      <%= htmlFor('comparisons') %>
-    <span class="bookmark" id="strings"></span>
-      <%= htmlFor('strings') %>
-    <span class="bookmark" id="tagged-template-literals"></span>
-      <%= htmlFor('tagged_template_literals') %>
-    <span class="bookmark" id="regexes"></span>
-      <%= htmlFor('heregexes') %>
-    <span class="bookmark" id="modules"></span>
-      <%= htmlFor('modules') %>
-  <span class="bookmark" id="cake"></span>
-    <%= htmlFor('cake') %>
-  <span class="bookmark" id="source-maps"></span>
-    <%= htmlFor('source_maps') %>
-  <span class="bookmark" id="scripts"></span>
-    <%= htmlFor('scripts') %>
-  <span class="bookmark" id="resources"></span>
-    <%= htmlFor('books') %>
-  <span class="bookmark" id="screencasts"></span>
-    <%= htmlFor('screencasts') %>
-  <span class="bookmark" id="examples"></span>
-    <%= htmlFor('examples') %>
-  <span class="bookmark" id="additional-resources"></span>
-    <%= htmlFor('resources') %>
-  <span class="bookmark" id="chat"></span>
-    <%= htmlFor('chat') %>
-  <span class="bookmark" id="changelog"></span>
-    <%= htmlFor('changelog') %>
-</div>
--- a/documentation/v1/code.coffee
+++ b/documentation/v1/code.coffee
@@ -1,25 +0,0 @@
-fs           = require 'fs'
-CoffeeScript = require '../../lib/coffeescript'
-
-
-module.exports = ->
-  counter = 0
-  hljs = require 'highlight.js'
-  hljs.configure classPrefix: ''
-  (file, executable = no, showLoad = yes) ->
-    counter++
-    cs = fs.readFileSync "documentation/examples/#{file}.coffee", 'utf-8'
-    js = CoffeeScript.compile cs, bare: yes
-    js = js.replace /^\/\/ generated.*?\n/i, ''
-
-    cshtml = "<pre><code>#{hljs.highlight('coffeescript', cs).value}</code></pre>"
-    jshtml = "<pre><code>#{hljs.highlight('javascript', js).value}</code></pre>"
-    append = if executable is yes then '' else "alert(#{executable});".replace /"/g, '&quot;'
-    if executable and executable isnt yes
-      cs.replace /(\S)\s*\Z/m, "$1\n\nalert #{executable}"
-    run    = if executable is yes then 'run' else "run: #{executable}"
-    name   = "example#{counter}"
-    script = "<script>window.#{name} = #{JSON.stringify cs}</script>"
-    load   = if showLoad then "<div class='minibutton load' onclick='javascript: loadConsole(#{name});'>load</div>" else ''
-    button = if executable then """<div class="minibutton ok" onclick="javascript: #{js.replace /"/g, '&quot;'};#{append}">#{run}</div>""" else ''
-    "<div class='code'>#{cshtml}#{jshtml}#{script}#{load}#{button}<br class='clear' /></div>"
--- a/documentation/v1/docs.coffee
+++ b/documentation/v1/docs.coffee
@@ -1,95 +0,0 @@
-sourceFragment = "try:"
-
-# Set up the compilation function, to run when you stop typing.
-compileSource = ->
-  source = $('#repl_source').val()
-  results = $('#repl_results')
-  window.compiledJS = ''
-  try
-    window.compiledJS = CoffeeScript.compile source, bare: on
-    el = results[0]
-    if el.innerText
-      el.innerText = window.compiledJS
-    else
-      results.text(window.compiledJS)
-    results.removeClass 'error'
-    $('.minibutton.run').removeClass 'error'
-  catch {location, message}
-    if location?
-      message = "Error on line #{location.first_line + 1}: #{message}"
-    results.text(message).addClass 'error'
-    $('.minibutton.run').addClass 'error'
-
-  # Update permalink
-  $('#repl_permalink').attr 'href', "##{sourceFragment}#{encodeURIComponent source}"
-
-# Listen for keypresses and recompile.
-$('#repl_source').keyup -> compileSource()
-
-# Use tab key to insert tabs
-$('#repl_source').keydown (e) ->
-  if e.keyCode is 9
-    e.preventDefault()
-    textbox = e.target
-    # Insert tab character at caret or in selection
-    textbox.value = textbox.value[0...textbox.selectionStart] + "\t" + textbox.value[textbox.selectionEnd...]
-    # Put caret in correct position
-    textbox.selectionEnd = ++textbox.selectionStart
-
-# Eval the compiled js.
-evalJS = ->
-  try
-    eval window.compiledJS
-  catch error then alert error
-
-# Load the console with a string of CoffeeScript.
-window.loadConsole = (coffee) ->
-  $('#repl_source').val coffee
-  compileSource()
-  $('.navigation.try').addClass('active')
-  false
-
-# Helper to hide the menus.
-closeMenus = ->
-  $('.navigation.active').removeClass 'active'
-
-$('.minibutton.run').click -> evalJS()
-
-# Bind navigation buttons to open the menus.
-$('.navigation').click (e) ->
-  return if e.target.tagName.toLowerCase() is 'a'
-  return false if $(e.target).closest('.repl_wrapper').length
-  if $(this).hasClass('active')
-    closeMenus()
-  else
-    closeMenus()
-    $(this).addClass 'active'
-  false
-
-$(document).on 'click', '[href="#try"]', (e) ->
-  $('.navigation.try').addClass 'active'
-
-# Dismiss console if Escape pressed or click falls outside console
-# Trigger Run button on Ctrl-Enter
-$(document.body)
-  .keydown (e) ->
-    closeMenus() if e.which == 27
-    evalJS() if e.which == 13 and (e.metaKey or e.ctrlKey) and $('.minibutton.run:visible').length
-  .click (e) ->
-    return false if $(e.target).hasClass('minibutton')
-    closeMenus()
-
-$('#open_webchat').click ->
-  $(this).replaceWith $('<iframe src="http://webchat.freenode.net/?channels=coffeescript" width="625" height="400"></iframe>')
-
-$("#repl_permalink").click (e) ->
-    window.location = $(this).attr("href")
-    false
-
-# If source code is included in location.hash, display it.
-hash = decodeURIComponent location.hash.replace(/^#/, '')
-if hash.indexOf(sourceFragment) == 0
-    src = hash.substr sourceFragment.length
-    loadConsole src
-
-compileSource()
--- a/documentation/v1/docs.css
+++ b/documentation/v1/docs.css
--- a/documentation/v1/scripts.html
+++ b/documentation/v1/scripts.html
@@ -1,6 +0,0 @@
-<script type="text/coffeescript">
-<%= include('docs.coffee') %>
-</script>
-
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-<script src="v<%= majorVersion %>/browser-compiler/coffeescript.js"></script>
--- a/documentation/v1/styles.html
+++ b/documentation/v1/styles.html
@@ -1,4 +0,0 @@
-<style>
-<%= include('docs.css') %>
-<%= include('tomorrow.css') %>
-</style>
--- a/documentation/v1/tomorrow.css
+++ b/documentation/v1/tomorrow.css
@@ -1,60 +0,0 @@
-/* Highlight.js syntax highlighting */
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
-/* Forked from http://softwaremaniacs.org/media/soft/highlight/styles/tomorrow.css */
-.tomorrow-comment, pre .comment, pre .title {
-  color: #8e908c;
-}
-
-.tomorrow-red, pre .variable, pre .tag, pre .regexp, pre .ruby .constant, pre .xml .tag .title, pre .xml .pi, pre .xml .doctype, pre .html .doctype, pre .css .id, pre .css .class, pre .css .pseudo {
-  color: #c82829;
-}
-
-.tomorrow-orange, pre .number, pre .preprocessor, pre .built_in, pre .params, pre .constant {
-  color: #000000;
-}
-
-.tomorrow-yellow, pre .class, pre .ruby .class .title, pre .css .rules .attribute {
-  color: #eab700;
-}
-
-.tomorrow-green, pre .string, pre .value, pre .inheritance, pre .header, pre .ruby .symbol, pre .xml .cdata {
-  color: #718c00;
-}
-
-.tomorrow-aqua, pre .css .hexcolor {
-  color: #3e999f;
-}
-
-.tomorrow-blue, pre .function, pre .function .title, pre .python .decorator, pre .python .title, pre .ruby .function .title, pre .ruby .title .keyword, pre .perl .sub, pre .javascript .title, pre .coffeescript .title {
-  color: #21439C;
-}
-
-.tomorrow-purple, pre .keyword, pre .reserved, pre .javascript .function {
-  color: #FF5600;
-}
-
-pre .subst {
-  color: #A535AE;
-}
-
-pre .literal {
-  color: #A535AE;
-}
-
-pre .property {
-  color: #A535AE;
-}
-
-pre .class .title {
-  color: #21439C;
-}
-
-pre .coffeescript .javascript,
-pre .javascript .xml,
-pre .tex .formula,
-pre .xml .javascript,
-pre .xml .vbscript,
-pre .xml .css,
-pre .xml .cdata {
-  opacity: 0.5;
-}
--- a/documentation/v2/code.coffee
+++ b/documentation/v2/code.coffee
@@ -1,11 +0,0 @@
-fs           = require 'fs'
-_            = require 'underscore'
-CoffeeScript = require '../../lib/coffeescript'
-
-
-module.exports = ->
-  (file, run = no) ->
-    cs = fs.readFileSync "documentation/examples/#{file}.coffee", 'utf-8'
-    js = CoffeeScript.compile cs, bare: yes # This is just the initial JavaScript output; it is replaced by dynamic compilation on changes of the CoffeeScript pane
-    render = _.template fs.readFileSync('documentation/v2/code.html', 'utf-8')
-    output = render {file, cs, js, run}
--- a/lib/coffeescript/browser.js
+++ b/lib/coffeescript/browser.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // This **Browser** compatibility layer extends core CoffeeScript functions
  // to make things work smoothly when compiling code directly in the browser.
--- a/lib/coffeescript/cake.js
+++ b/lib/coffeescript/cake.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // `cake` is a simplified version of [Make](http://www.gnu.org/software/make/)
  // ([Rake](http://rake.rubyforge.org/), [Jake](https://github.com/280north/jake))
--- a/lib/coffeescript/coffeescript.js
+++ b/lib/coffeescript/coffeescript.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // CoffeeScript can be used both on the server, as a command-line compiler based
  // on Node.js/V8, or to run CoffeeScript directly in the browser. This module
@@ -84,10 +84,10 @@
  // in which case this returns a `{js, v3SourceMap, sourceMap}`
  // object, where sourceMap is a sourcemap.coffee#SourceMap object, handy for
  // doing programmatic lookups.
-  exports.compile = compile = withPrettyErrors(function(code, options) {
-    var currentColumn, currentLine, encoded, extend, filename, fragment, fragments, generateSourceMap, header, i, j, js, len, len1, map, merge, newLines, ref, ref1, sourceMapDataURI, sourceURL, token, tokens, v3SourceMap;
-    ({merge, extend} = helpers);
-    options = extend({}, options);
+  exports.compile = compile = withPrettyErrors(function(code, options = {}) {
+    var currentColumn, currentLine, encoded, filename, fragment, fragments, generateSourceMap, header, i, j, js, len, len1, map, newLines, ref, ref1, sourceMapDataURI, sourceURL, token, tokens, transpiler, transpilerOutput, v3SourceMap;
+    // Clone `options`, to avoid mutating the `options` object passed in.
+    options = Object.assign({}, options);
    // Always generate a source map if no filename is passed in, since without a
    // a filename we have no way to retrieve this source later in the event that
    // we need to recompile it to get a source map for `prepareStackTrace`.
@@ -167,6 +167,28 @@
      }
      sourceMaps[filename].push(map);
    }
+    if (options.transpile) {
+      if (typeof options.transpile !== 'object') {
+        // This only happens if run via the Node API and `transpile` is set to
+        // something other than an object.
+        throw new Error('The transpile option must be given an object with options to pass to Babel');
+      }
+      // Get the reference to Babel that we have been passed if this compiler
+      // is run via the CLI or Node API.
+      transpiler = options.transpile.transpile;
+      delete options.transpile.transpile;
+      // See https://github.com/babel/babel/issues/827#issuecomment-77573107:
+      // Babel can take a v3 source map object as input in `inputSourceMap`
+      // and it will return an *updated* v3 source map object in its output.
+      if (v3SourceMap && (options.transpile.inputSourceMap == null)) {
+        options.transpile.inputSourceMap = v3SourceMap;
+      }
+      transpilerOutput = transpiler(js, options.transpile);
+      js = transpilerOutput.code;
+      if (v3SourceMap && transpilerOutput.map) {
+        v3SourceMap = transpilerOutput.map;
+      }
+    }
    if (options.inlineMap) {
      encoded = base64encode(JSON.stringify(v3SourceMap));
      sourceMapDataURI = `//# sourceMappingURL=data:application/json;base64,${encoded}`;
--- a/lib/coffeescript/command.js
+++ b/lib/coffeescript/command.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // The `coffee` utility. Handles command-line compilation of CoffeeScript
  // into various forms: saved into `.js` files or printed to stdout
@@ -45,7 +45,7 @@
  BANNER = 'Usage: coffee [options] path/to/script.coffee [args]\n\nIf called without options, `coffee` will run your script.';

  // The list of all the valid option flags that `coffee` knows how to handle.
-  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-m', '--map', 'generate source map and save as .js.map files'], ['-M', '--inline-map', 'generate source map and include it directly in output'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-o', '--output [PATH]', 'set the output path or path/filename for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-r', '--require [MODULE*]', 'require the given module before eval or REPL'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffeescript'], ['-t', '--tokens', 'print out the tokens that the lexer/rewriter produce'], ['-v', '--version', 'display the version number'], ['-w', '--watch', 'watch scripts for changes and rerun commands']];
+  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-m', '--map', 'generate source map and save as .js.map files'], ['-M', '--inline-map', 'generate source map and include it directly in output'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-o', '--output [PATH]', 'set the output path or path/filename for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-r', '--require [MODULE*]', 'require the given module before eval or REPL'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffeescript'], ['-t', '--transpile', 'pipe generated JavaScript through Babel'], ['--tokens', 'print out the tokens that the lexer/rewriter produce'], ['-v', '--version', 'display the version number'], ['-w', '--watch', 'watch scripts for changes and rerun commands']];

  // Top-level objects shared by all the functions.
  opts = {};
@@ -605,12 +605,63 @@

  // The compile-time options to pass to the CoffeeScript compiler.
  compileOptions = function(filename, base) {
-    var answer, cwd, jsDir, jsPath;
+    var answer, cantFindOptions, checkPath, cwd, jsDir, jsPath, packageJson;
+    if (opts.transpile) {
+      try {
+        // The user has requested that the CoffeeScript compiler also transpile
+        // via Babel. We use Babel as an `optionalDependency`; see
+        // https://docs.npmjs.com/files/package.json#optionaldependencies.
+        require('babel-core');
+      } catch (error) {
+        console.error('To use --transpile, you must have Babel installed and configured.\nSee http://coffeescript.org/#transpilation');
+        process.exit(1);
+      }
+      // We’re giving Babel only a string, not a filename or path to a file, so
+      // it doesn’t know where to search to find a `.babelrc` file or a `babel`
+      // key in a `package.json`. So if `opts.transpile` is an object, use that
+      // as Babel’s options; otherwise figure out what the options should be.
+      if (typeof opts.transpile !== 'object') {
+        // Find the options based on the path to the file being compiled.
+        cantFindOptions = function() {
+          console.error('To use the transpile option, there must be a .babelrc file\n(or a package.json file with a "babel" key) in the path of the file\nto be compiled, or in the path of the current working directory.\nIf you are compiling a string via the Node API, the transpile option\nmust be an object with the options to pass to Babel.\nSee http://coffeescript.org/#transpilation');
+          return process.exit(1);
+        };
+        checkPath = filename ? path.dirname(filename) : base ? base : typeof process !== "undefined" && process !== null ? process.cwd() : cantFindOptions();
+        while (true) {
+          try {
+            opts.transpile = JSON.parse(fs.readFileSync(path.join(checkPath, '.babelrc'), 'utf-8'));
+            break;
+          } catch (error) {
+            try {
+              packageJson = JSON.parse(fs.readFileSync(path.join(checkPath, 'package.json'), 'utf-8'));
+              if (packageJson.babel != null) {
+                opts.transpile = packageJson.babel;
+                break;
+              }
+            } catch (error) {}
+          }
+          if (checkPath === path.dirname(checkPath)) { // We’ve reached the root.
+            cantFindOptions();
+            break;
+          } else {
+            checkPath = path.dirname(checkPath);
+          }
+        }
+      }
+      // Pass a reference to Babel into the compiler, so that the transpile option
+      // is available for the CLI. We need to do this so that tools like Webpack
+      // can `require('coffeescript')` and build correctly, without trying to
+      // require Babel.
+      opts.transpile.transpile = CoffeeScript.transpile;
+    } else {
+      opts.transpile = false;
+    }
    answer = {
-      filename,
+      filename: filename,
      literate: opts.literate || helpers.isLiterate(filename),
      bare: opts.bare,
      header: opts.compile && !opts['no-header'],
+      transpile: opts.transpile,
      sourceMap: opts.map,
      inlineMap: opts['inline-map']
    };
--- a/lib/coffeescript/grammar.js
+++ b/lib/coffeescript/grammar.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // The CoffeeScript parser is generated by [Jison](https://github.com/zaach/jison)
  // from this grammar file. Jison is a bottom-up parser generator, similar in
--- a/lib/coffeescript/helpers.js
+++ b/lib/coffeescript/helpers.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // This file contains the common helper functions that we'd like to share among
  // the **Lexer**, **Rewriter**, and the **Nodes**. Merge objects, flatten
--- a/lib/coffeescript/index.js
+++ b/lib/coffeescript/index.js
@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // Node.js Implementation
-  var CoffeeScript, compile, ext, fn, fs, helpers, i, len, path, ref, vm,
+  var CoffeeScript, ext, fn, fs, helpers, i, len, path, ref, universalCompile, vm,
    hasProp = {}.hasOwnProperty;

  CoffeeScript = require('./coffeescript');
@@ -14,7 +14,32 @@

  helpers = CoffeeScript.helpers;

-  compile = CoffeeScript.compile;
+  CoffeeScript.transpile = function(js, options) {
+    var babel;
+    try {
+      babel = require('babel-core');
+    } catch (error) {
+      // This error is only for Node, as CLI users will see a different error
+      // earlier if they don’t have Babel installed.
+      throw new Error('To use the transpile option, you must have the \'babel-core\' module installed');
+    }
+    return babel.transform(js, options);
+  };
+
+  // The `compile` method shared by the CLI, Node and browser APIs.
+  universalCompile = CoffeeScript.compile;
+
+  // The `compile` method particular to the Node API.
+  CoffeeScript.compile = function(code, options) {
+    // Pass a reference to Babel into the compiler, so that the transpile option
+    // is available in the Node API. We need to do this so that tools like Webpack
+    // can `require('coffeescript')` and build correctly, without trying to
+    // require Babel.
+    if (options != null ? options.transpile : void 0) {
+      options.transpile.transpile = CoffeeScript.transpile;
+    }
+    return universalCompile.call(CoffeeScript, code, options);
+  };

  // Compile and execute a string of CoffeeScript (on the server), correctly
  // setting `__filename`, `__dirname`, and relative `require()`.
@@ -30,7 +55,7 @@
    mainModule.paths = require('module')._nodeModulePaths(dir);
    // Compile.
    if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
-      answer = compile(code, options);
+      answer = CoffeeScript.compile(code, options);
      code = (ref = answer.js) != null ? ref : answer;
    }
    return mainModule._compile(code, mainModule.filename);
@@ -95,7 +120,7 @@
      o[k] = v;
    }
    o.bare = true; // ensure return value
-    js = compile(code, o);
+    js = CoffeeScript.compile(code, o);
    if (sandbox === global) {
      return vm.runInThisContext(js);
    } else {
@@ -128,7 +153,7 @@
    // Strip the Unicode byte order mark, if this file begins with one.
    stripped = raw.charCodeAt(0) === 0xFEFF ? raw.substring(1) : raw;
    try {
-      answer = compile(stripped, {
+      answer = CoffeeScript.compile(stripped, {
        filename,
        sourceMap,
        inlineMap,
--- a/lib/coffeescript/lexer.js
+++ b/lib/coffeescript/lexer.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // The CoffeeScript Lexer. Uses a series of token-matching regexes to attempt
  // matches against the beginning of the source code. When a match is found,
--- a/lib/coffeescript/nodes.js
+++ b/lib/coffeescript/nodes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // `nodes.coffee` contains all of the node classes for the syntax tree. Most
  // nodes are created as the result of actions in the [grammar](grammar.html),
@@ -2109,15 +2109,15 @@

      // Check if object contains splat.
      hasSplat() {
-        var j, len1, prop, ref1, splat;
+        var j, len1, prop, ref1;
        ref1 = this.properties;
        for (j = 0, len1 = ref1.length; j < len1; j++) {
          prop = ref1[j];
          if (prop instanceof Splat) {
-            splat = true;
+            return true;
          }
        }
-        return splat != null ? splat : false;
+        return false;
      }

      compileNode(o) {
@@ -2240,7 +2240,7 @@
      }

      // Object spread properties. https://github.com/tc39/proposal-object-rest-spread/blob/master/Spread.md
-      // `obj2 = {a: 1, obj..., c: 3, d: 4}` → `obj2 = Object.assign({}, {a: 1}, obj, {c: 3, d: 4})`
+      // `obj2 = {a: 1, obj..., c: 3, d: 4}` → `obj2 = _extends({}, {a: 1}, obj, {c: 3, d: 4})`
      compileSpread(o) {
        var _extends, addSlice, j, len1, prop, propSlices, props, slices, splatSlice;
        props = this.properties;
@@ -3200,6 +3200,8 @@
            this.checkAssignability(o, name);
            if (this.moduleDeclaration) {
              return o.scope.add(name.value, this.moduleDeclaration);
+            } else if (this.param) {
+              return o.scope.add(name.value, this.param === 'alwaysDeclare' ? 'var' : 'param');
            } else {
              return o.scope.find(name.value);
            }
@@ -3230,7 +3232,7 @@
        answer = compiledName.concat(this.makeCode(` ${this.context || '='} `), val);
        // Per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment#Assignment_without_declaration,
        // if we’re destructuring without declaring, the destructuring assignment must be wrapped in parentheses.
-        if (o.level > LEVEL_LIST || (o.level === LEVEL_TOP && isValue && this.variable.base instanceof Obj && !this.nestedLhs && !this.param)) {
+        if (o.level > LEVEL_LIST || o.level === LEVEL_TOP && isValue && this.variable.base instanceof Obj && !this.nestedLhs && !(this.param === true)) {
          return this.wrapInParentheses(answer);
        } else {
          return answer;
@@ -3240,31 +3242,7 @@
      // Check object destructuring variable for rest elements;
      // can be removed once ES proposal hits Stage 4.
      compileObjectDestruct(o) {
-        var fragments, getPropKey, getPropName, j, len1, restElement, restElements, result, setScopeVar, traverseRest, value, valueRef, valueRefTemp;
-        // Per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment#Assignment_without_declaration,
-        // if we’re destructuring without declaring, the destructuring assignment
-        // must be wrapped in parentheses: `({a, b} = obj)`. Helper function
-        // `setScopeVar()` declares variables `a` and `b` at the top of the
-        // current scope.
-        setScopeVar = function(prop) {
-          var newVar;
-          newVar = false;
-          if (prop instanceof Assign && prop.value.base instanceof Obj) {
-            return;
-          }
-          if (prop instanceof Assign) {
-            if (prop.value.base instanceof IdentifierLiteral) {
-              newVar = prop.value.base.compileWithoutComments(o);
-            } else {
-              newVar = prop.variable.base.compileWithoutComments(o);
-            }
-          } else {
-            newVar = prop.compileWithoutComments(o);
-          }
-          if (newVar) {
-            return o.scope.add(newVar, 'var', true);
-          }
-        };
+        var fragments, getPropKey, getPropName, j, len1, restElement, restElements, result, traverseRest, value, valueRef, valueRefTemp;
        // Returns a safe (cached) reference to the key for a given property
        getPropKey = function(prop) {
          var key;
@@ -3300,7 +3278,6 @@
          for (index = j = 0, len1 = properties.length; j < len1; index = ++j) {
            prop = properties[index];
            nestedSourceDefault = nestedSource = nestedProperties = null;
-            setScopeVar(prop.unwrap());
            if (prop instanceof Assign) {
              if (typeof (base1 = prop.value).isObject === "function" ? base1.isObject() : void 0) {
                if (prop.context !== 'object') {
@@ -3350,13 +3327,9 @@
          return restElements;
        };
        // Cache the value for reuse with rest elements.
-        if (this.value.shouldCache()) {
-          valueRefTemp = new IdentifierLiteral(o.scope.freeVariable('ref', {
-            reserve: false
-          }));
-        } else {
-          valueRefTemp = this.value.base;
-        }
+        valueRefTemp = this.value.shouldCache() ? new IdentifierLiteral(o.scope.freeVariable('ref', {
+          reserve: false
+        })) : this.value.base;
        // Find all rest elements.
        restElements = traverseRest(this.variable.base.properties, valueRefTemp);
        if (!(restElements && restElements.length > 0)) {
@@ -3367,7 +3340,9 @@
        for (j = 0, len1 = restElements.length; j < len1; j++) {
          restElement = restElements[j];
          value = new Call(new Value(new Literal(utility('objectWithoutKeys', o))), [restElement.source, restElement.excludeProps]);
-          result.push(new Assign(restElement.name, value));
+          result.push(new Assign(new Value(restElement.name), value, null, {
+            param: this.param ? 'alwaysDeclare' : null
+          }));
        }
        fragments = result.compileToFragments(o);
        if (o.level === LEVEL_TOP) {
@@ -3802,7 +3777,9 @@
                ifTrue = new Assign(new Value(param.name), param.value);
                exprs.push(new If(condition, ifTrue));
              } else {
-                exprs.push(new Assign(new Value(param.name), param.asReference(o)));
+                exprs.push(new Assign(new Value(param.name), param.asReference(o), null, {
+                  param: 'alwaysDeclare'
+                }));
              }
            }
            // If this parameter comes before the splat or expansion, it will go
@@ -3827,22 +3804,25 @@
              if (param.name instanceof Arr || param.name instanceof Obj) {
                // This parameter is destructured.
                param.name.lhs = true;
-                param.name.eachName(function(prop) {
-                  return o.scope.parameter(prop.value);
-                });
                // Compile `foo({a, b...}) ->` to `foo(arg) -> {a, b...} = arg`.
                // Can be removed once ES proposal hits Stage 4.
                if (param.name instanceof Obj && param.name.hasSplat()) {
                  splatParamName = o.scope.freeVariable('arg');
                  o.scope.parameter(splatParamName);
                  ref = new Value(new IdentifierLiteral(splatParamName));
-                  exprs.push(new Assign(new Value(param.name), ref));
+                  exprs.push(new Assign(new Value(param.name), ref, null, {
+                    param: 'alwaysDeclare'
+                  }));
                  // Compile `foo({a, b...} = {}) ->` to `foo(arg = {}) -> {a, b...} = arg`.
                  if ((param.value != null) && !param.assignedInBody) {
                    ref = new Assign(ref, param.value, null, {
                      param: true
                    });
                  }
+                } else if (!param.shouldCache()) {
+                  param.name.eachName(function(prop) {
+                    return o.scope.parameter(prop.value);
+                  });
                }
              } else {
                // This compilation of the parameter is only to get its name to add
@@ -4077,12 +4057,12 @@
  // as well as be a splat, gathering up a group of parameters into an array.
  exports.Param = Param = (function() {
    class Param extends Base {
-      constructor(name1, value1, splat1) {
+      constructor(name1, value1, splat) {
        var message, token;
        super();
        this.name = name1;
        this.value = value1;
-        this.splat = splat1;
+        this.splat = splat;
        message = isUnassignable(this.name.unwrapAll().value);
        if (message) {
          this.name.error(message);
@@ -5030,7 +5010,9 @@
              fragments.push(this.makeCode('$'));
            }
            code = element.compileToFragments(o, LEVEL_PAREN);
-            if (!this.isNestedTag(element)) {
+            if (!this.isNestedTag(element) || code.some(function(fragment) {
+              return fragment.comments != null;
+            })) {
              code = this.wrapInBraces(code);
              // Flag the `{` and `}` fragments as having been generated by this
              // `StringWithInterpolations` node, so that `compileComments` knows
--- a/lib/coffeescript/optparse.js
+++ b/lib/coffeescript/optparse.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat,
    slice = [].slice;
--- a/lib/coffeescript/parser.js
+++ b/lib/coffeescript/parser.js
@@ -1,4 +1,4 @@
-/* parser generated by jison 0.4.17 */
+/* parser generated by jison 0.4.18 */
 /*
  Returns a Parser object of the following structure:

@@ -906,13 +906,9 @@ parseError: function parseError(str, hash) {
    if (hash.recoverable) {
        this.trace(str);
    } else {
-        function _parseError (msg, hash) {
-            this.message = msg;
-            this.hash = hash;
-        }
-        _parseError.prototype = Error;
-
-        throw new _parseError(str, hash);
+        var error = new Error(str);
+        error.hash = hash;
+        throw error;
    }
 },
 parse: function parse(input) {
--- a/lib/coffeescript/register.js
+++ b/lib/coffeescript/register.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, i, len, loadFile, path, ref;

--- a/lib/coffeescript/repl.js
+++ b/lib/coffeescript/repl.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, replDefaults, runInContext, sawSIGINT, updateSyntaxError, vm;

--- a/lib/coffeescript/rewriter.js
+++ b/lib/coffeescript/rewriter.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // The CoffeeScript language has a good deal of optional syntax, implicit syntax,
  // and shorthand syntax. This can greatly complicate a grammar and bloat
--- a/lib/coffeescript/scope.js
+++ b/lib/coffeescript/scope.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // The **Scope** class regulates lexical scoping within CoffeeScript. As you
  // generate code, you create a tree of scopes in the same shape as the nested
--- a/lib/coffeescript/sourcemap.js
+++ b/lib/coffeescript/sourcemap.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.0-beta5
+// Generated by CoffeeScript 2.0.0
 (function() {
  // Source maps allow JavaScript runtimes to match running JavaScript back to
  // the original source code that corresponds to it. This can be minified
@@ -150,7 +150,7 @@
          names: [],
          mappings: buffer
        };
-        if (options.inlineMap) {
+        if (options.sourceMap || options.inlineMap) {
          v3.sourcesContent = [code];
        }
        return v3;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "compiler"
  ],
  "author": "Jeremy Ashkenas",
-  "version": "2.0.0-beta5",
+  "version": "2.0.0",
  "license": "MIT",
  "engines": {
    "node": ">=6"
@@ -42,13 +42,17 @@
    "babel-core": "~6.26.0",
    "babel-preset-babili": "~0.1.4",
    "babel-preset-env": "~1.6.0",
-    "babili": "^0.1.4",
+    "babel-preset-minify": "^0.2.0",
+    "codemirror": "^5.29.0",
    "docco": "~0.7.0",
    "highlight.js": "~9.12.0",
-    "jison": ">=0.4.17",
+    "jison": ">=0.4.18",
    "markdown-it": "~8.4.0",
    "underscore": "~1.8.3",
-    "webpack": "~3.5.5"
+    "webpack": "~3.6.0"
+  },
+  "optionalDependencies": {
+    "babel-core": "^6"
  },
  "dependencies": {}
 }
--- a/src/coffeescript.coffee
+++ b/src/coffeescript.coffee
@@ -64,9 +64,9 @@ sourceMaps = {}
 # in which case this returns a `{js, v3SourceMap, sourceMap}`
 # object, where sourceMap is a sourcemap.coffee#SourceMap object, handy for
 # doing programmatic lookups.
-exports.compile = compile = withPrettyErrors (code, options) ->
-  {merge, extend} = helpers
-  options = extend {}, options
+exports.compile = compile = withPrettyErrors (code, options = {}) ->
+  # Clone `options`, to avoid mutating the `options` object passed in.
+  options = Object.assign {}, options
  # Always generate a source map if no filename is passed in, since without a
  # a filename we have no way to retrieve this source later in the event that
  # we need to recompile it to get a source map for `prepareStackTrace`.
@@ -129,6 +129,27 @@ exports.compile = compile = withPrettyErrors (code, options) ->
    sourceMaps[filename] ?= []
    sourceMaps[filename].push map

+  if options.transpile
+    if typeof options.transpile isnt 'object'
+      # This only happens if run via the Node API and `transpile` is set to
+      # something other than an object.
+      throw new Error 'The transpile option must be given an object with options to pass to Babel'
+
+    # Get the reference to Babel that we have been passed if this compiler
+    # is run via the CLI or Node API.
+    transpiler = options.transpile.transpile
+    delete options.transpile.transpile
+
+    # See https://github.com/babel/babel/issues/827#issuecomment-77573107:
+    # Babel can take a v3 source map object as input in `inputSourceMap`
+    # and it will return an *updated* v3 source map object in its output.
+    if v3SourceMap and not options.transpile.inputSourceMap?
+      options.transpile.inputSourceMap = v3SourceMap
+    transpilerOutput = transpiler js, options.transpile
+    js = transpilerOutput.code
+    if v3SourceMap and transpilerOutput.map
+      v3SourceMap = transpilerOutput.map
+
  if options.inlineMap
    encoded = base64encode JSON.stringify v3SourceMap
    sourceMapDataURI = "//# sourceMappingURL=data:application/json;base64,#{encoded}"
--- a/src/command.coffee
+++ b/src/command.coffee
@@ -48,7 +48,8 @@ SWITCHES = [
  ['-r', '--require [MODULE*]', 'require the given module before eval or REPL']
  ['-s', '--stdio',             'listen for and compile scripts over stdio']
  ['-l', '--literate',          'treat stdio as literate style coffeescript']
-  ['-t', '--tokens',            'print out the tokens that the lexer/rewriter produce']
+  ['-t', '--transpile',         'pipe generated JavaScript through Babel']
+  [      '--tokens',            'print out the tokens that the lexer/rewriter produce']
  ['-v', '--version',           'display the version number']
  ['-w', '--watch',             'watch scripts for changes and rerun commands']
 ]
@@ -441,14 +442,79 @@ parseOptions = ->

 # The compile-time options to pass to the CoffeeScript compiler.
 compileOptions = (filename, base) ->
-  answer = {
-    filename
+  if opts.transpile
+    # The user has requested that the CoffeeScript compiler also transpile
+    # via Babel. We use Babel as an `optionalDependency`; see
+    # https://docs.npmjs.com/files/package.json#optionaldependencies.
+    try
+      require 'babel-core'
+    catch
+      console.error '''
+        To use --transpile, you must have Babel installed and configured.
+        See http://coffeescript.org/#transpilation
+      '''
+      process.exit 1
+
+    # We’re giving Babel only a string, not a filename or path to a file, so
+    # it doesn’t know where to search to find a `.babelrc` file or a `babel`
+    # key in a `package.json`. So if `opts.transpile` is an object, use that
+    # as Babel’s options; otherwise figure out what the options should be.
+    unless typeof opts.transpile is 'object'
+      # Find the options based on the path to the file being compiled.
+      cantFindOptions = ->
+        console.error '''
+          To use the transpile option, there must be a .babelrc file
+          (or a package.json file with a "babel" key) in the path of the file
+          to be compiled, or in the path of the current working directory.
+          If you are compiling a string via the Node API, the transpile option
+          must be an object with the options to pass to Babel.
+          See http://coffeescript.org/#transpilation
+        '''
+        process.exit 1
+
+      checkPath = if filename
+        path.dirname filename
+      else if base
+        base
+      else if process?
+        process.cwd()
+      else
+        cantFindOptions()
+
+      loop
+        try
+          opts.transpile = JSON.parse fs.readFileSync path.join(checkPath, '.babelrc'), 'utf-8'
+          break
+        catch
+          try
+            packageJson = JSON.parse fs.readFileSync(path.join(checkPath, 'package.json'), 'utf-8')
+            if packageJson.babel?
+              opts.transpile = packageJson.babel
+              break
+
+        if checkPath is path.dirname checkPath # We’ve reached the root.
+          cantFindOptions()
+          break
+        else
+          checkPath = path.dirname checkPath
+
+    # Pass a reference to Babel into the compiler, so that the transpile option
+    # is available for the CLI. We need to do this so that tools like Webpack
+    # can `require('coffeescript')` and build correctly, without trying to
+    # require Babel.
+    opts.transpile.transpile = CoffeeScript.transpile
+  else
+    opts.transpile = no
+
+  answer =
+    filename: filename
    literate: opts.literate or helpers.isLiterate(filename)
    bare: opts.bare
    header: opts.compile and not opts['no-header']
+    transpile: opts.transpile
    sourceMap: opts.map
    inlineMap: opts['inline-map']
-  }
+
  if filename
    if base
      cwd = process.cwd()
--- a/src/index.coffee
+++ b/src/index.coffee
@@ -5,7 +5,27 @@ vm            = require 'vm'
 path          = require 'path'

 helpers       = CoffeeScript.helpers
-compile       = CoffeeScript.compile
+
+CoffeeScript.transpile = (js, options) ->
+  try
+    babel = require 'babel-core'
+  catch
+    # This error is only for Node, as CLI users will see a different error
+    # earlier if they don’t have Babel installed.
+    throw new Error 'To use the transpile option, you must have the \'babel-core\' module installed'
+  babel.transform js, options
+
+# The `compile` method shared by the CLI, Node and browser APIs.
+universalCompile = CoffeeScript.compile
+# The `compile` method particular to the Node API.
+CoffeeScript.compile = (code, options) ->
+  # Pass a reference to Babel into the compiler, so that the transpile option
+  # is available in the Node API. We need to do this so that tools like Webpack
+  # can `require('coffeescript')` and build correctly, without trying to
+  # require Babel.
+  if options?.transpile
+    options.transpile.transpile = CoffeeScript.transpile
+  universalCompile.call CoffeeScript, code, options

 # Compile and execute a string of CoffeeScript (on the server), correctly
 # setting `__filename`, `__dirname`, and relative `require()`.
@@ -28,7 +48,7 @@ CoffeeScript.run = (code, options = {}) ->

  # Compile.
  if not helpers.isCoffee(mainModule.filename) or require.extensions
-    answer = compile code, options
+    answer = CoffeeScript.compile code, options
    code = answer.js ? answer

  mainModule._compile code, mainModule.filename
@@ -68,7 +88,7 @@ CoffeeScript.eval = (code, options = {}) ->
  o = {}
  o[k] = v for own k, v of options
  o.bare = on # ensure return value
-  js = compile code, o
+  js = CoffeeScript.compile code, o
  if sandbox is global
    vm.runInThisContext js
  else
@@ -90,7 +110,7 @@ CoffeeScript._compileFile = (filename, sourceMap = no, inlineMap = no) ->
  stripped = if raw.charCodeAt(0) is 0xFEFF then raw.substring 1 else raw

  try
-    answer = compile stripped, {
+    answer = CoffeeScript.compile stripped, {
      filename, sourceMap, inlineMap
      sourceFiles: [filename]
      literate: helpers.isLiterate filename
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -1427,8 +1427,8 @@ exports.Obj = class Obj extends Base

  # Check if object contains splat.
  hasSplat: ->
-    splat = yes for prop in @properties when prop instanceof Splat
-    splat ? no
+    return yes for prop in @properties when prop instanceof Splat
+    no

  compileNode: (o) ->
    props = @properties
@@ -1510,7 +1510,7 @@ exports.Obj = class Obj extends Base
      prop.eachName iterator if prop.eachName?

  # Object spread properties. https://github.com/tc39/proposal-object-rest-spread/blob/master/Spread.md
-  # `obj2 = {a: 1, obj..., c: 3, d: 4}` → `obj2 = Object.assign({}, {a: 1}, obj, {c: 3, d: 4})`
+  # `obj2 = {a: 1, obj..., c: 3, d: 4}` → `obj2 = _extends({}, {a: 1}, obj, {c: 3, d: 4})`
  compileSpread: (o) ->
    props = @properties
    # Store object spreads.
@@ -2144,6 +2144,12 @@ exports.Assign = class Assign extends Base
        @checkAssignability o, name
        if @moduleDeclaration
          o.scope.add name.value, @moduleDeclaration
+        else if @param
+          o.scope.add name.value,
+            if @param is 'alwaysDeclare'
+              'var'
+            else
+              'param'
        else
          o.scope.find name.value

@@ -2167,7 +2173,7 @@ exports.Assign = class Assign extends Base
    answer = compiledName.concat @makeCode(" #{ @context or '=' } "), val
    # Per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment#Assignment_without_declaration,
    # if we’re destructuring without declaring, the destructuring assignment must be wrapped in parentheses.
-    if o.level > LEVEL_LIST or (o.level is LEVEL_TOP and isValue and @variable.base instanceof Obj and not @nestedLhs and not @param)
+    if o.level > LEVEL_LIST or o.level is LEVEL_TOP and isValue and @variable.base instanceof Obj and not @nestedLhs and not (@param is yes)
      @wrapInParentheses answer
    else
      answer
@@ -2175,23 +2181,6 @@ exports.Assign = class Assign extends Base
  # Check object destructuring variable for rest elements;
  # can be removed once ES proposal hits Stage 4.
  compileObjectDestruct: (o) ->
-    # Per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment#Assignment_without_declaration,
-    # if we’re destructuring without declaring, the destructuring assignment
-    # must be wrapped in parentheses: `({a, b} = obj)`. Helper function
-    # `setScopeVar()` declares variables `a` and `b` at the top of the
-    # current scope.
-    setScopeVar = (prop) ->
-      newVar = false
-      return if prop instanceof Assign and prop.value.base instanceof Obj
-      if prop instanceof Assign
-        if prop.value.base instanceof IdentifierLiteral
-          newVar = prop.value.base.compileWithoutComments o
-        else
-          newVar = prop.variable.base.compileWithoutComments o
-      else
-        newVar = prop.compileWithoutComments o
-      o.scope.add(newVar, 'var', true) if newVar
-
    # Returns a safe (cached) reference to the key for a given property
    getPropKey = (prop) ->
      if prop instanceof Assign
@@ -2220,7 +2209,6 @@ exports.Assign = class Assign extends Base

      for prop, index in properties
        nestedSourceDefault = nestedSource = nestedProperties = null
-        setScopeVar prop.unwrap()
        if prop instanceof Assign
          # prop is `k: expr`, we need to check `expr` for nested splats
          if prop.value.isObject?()
@@ -2252,10 +2240,11 @@ exports.Assign = class Assign extends Base
      restElements

    # Cache the value for reuse with rest elements.
-    if @value.shouldCache()
-      valueRefTemp = new IdentifierLiteral o.scope.freeVariable 'ref', reserve: false
-    else
-      valueRefTemp = @value.base
+    valueRefTemp =
+      if @value.shouldCache()
+        new IdentifierLiteral o.scope.freeVariable 'ref', reserve: false
+      else
+        @value.base

    # Find all rest elements.
    restElements = traverseRest @variable.base.properties, valueRefTemp
@@ -2266,7 +2255,7 @@ exports.Assign = class Assign extends Base

    for restElement in restElements
      value = new Call new Value(new Literal utility 'objectWithoutKeys', o), [restElement.source, restElement.excludeProps]
-      result.push new Assign restElement.name, value
+      result.push new Assign new Value(restElement.name), value, null, param: if @param then 'alwaysDeclare' else null

    fragments = result.compileToFragments o
    if o.level is LEVEL_TOP
@@ -2600,7 +2589,7 @@ exports.Code = class Code extends Base
            ifTrue = new Assign new Value(param.name), param.value
            exprs.push new If condition, ifTrue
          else
-            exprs.push new Assign new Value(param.name), param.asReference(o)
+            exprs.push new Assign new Value(param.name), param.asReference(o), null, param: 'alwaysDeclare'

        # If this parameter comes before the splat or expansion, it will go
        # in the function definition parameter list.
@@ -2620,18 +2609,19 @@ exports.Code = class Code extends Base
          if param.name instanceof Arr or param.name instanceof Obj
            # This parameter is destructured.
            param.name.lhs = yes
-            param.name.eachName (prop) ->
-              o.scope.parameter prop.value
            # Compile `foo({a, b...}) ->` to `foo(arg) -> {a, b...} = arg`.
            # Can be removed once ES proposal hits Stage 4.
            if param.name instanceof Obj and param.name.hasSplat()
              splatParamName = o.scope.freeVariable 'arg'
              o.scope.parameter splatParamName
              ref = new Value new IdentifierLiteral splatParamName
-              exprs.push new Assign new Value(param.name), ref
+              exprs.push new Assign new Value(param.name), ref, null, param: 'alwaysDeclare'
              # Compile `foo({a, b...} = {}) ->` to `foo(arg = {}) -> {a, b...} = arg`.
-              if param.value?  and not param.assignedInBody
+              if param.value? and not param.assignedInBody
                ref = new Assign ref, param.value, null, param: yes
+            else unless param.shouldCache()
+              param.name.eachName (prop) ->
+                o.scope.parameter prop.value
          else
            # This compilation of the parameter is only to get its name to add
            # to the scope name tracking; since the compilation output here
@@ -3413,7 +3403,7 @@ exports.StringWithInterpolations = class StringWithInterpolations extends Base
      else
        fragments.push @makeCode '$' unless @csx
        code = element.compileToFragments(o, LEVEL_PAREN)
-        unless @isNestedTag element
+        if not @isNestedTag(element) or code.some((fragment) -> fragment.comments?)
          code = @wrapInBraces code
          # Flag the `{` and `}` fragments as having been generated by this
          # `StringWithInterpolations` node, so that `compileComments` knows
--- a/src/sourcemap.litcoffee
+++ b/src/sourcemap.litcoffee
@@ -133,7 +133,7 @@ Produce the canonical JSON object format for a "v3" source map.
          names:      []
          mappings:   buffer

-        v3.sourcesContent = [code] if options.inlineMap
+        v3.sourcesContent = [code] if options.sourceMap or options.inlineMap

        v3

--- a/test/argument_parsing.coffee
+++ b/test/argument_parsing.coffee
@@ -135,7 +135,8 @@ If called without options, `coffee` will run your script.
  -r, --require      require the given module before eval or REPL
  -s, --stdio        listen for and compile scripts over stdio
  -l, --literate     treat stdio as literate style coffeescript
-  -t, --tokens       print out the tokens that the lexer/rewriter produce
+  -t, --transpile    pipe generated JavaScript through Babel
+      --tokens       print out the tokens that the lexer/rewriter produce
  -v, --version      display the version number
  -w, --watch        watch scripts for changes and rerun commands

--- a/test/assignment.coffee
+++ b/test/assignment.coffee
@@ -915,3 +915,15 @@ test "#4674: _extends utility for object spreads 2", ->
  e = {a..., c...}
  eq e.b, 1
  eq e.d, 2
+
+test "#4673: complex destructured object spread variables", ->
+  b = c: 1
+  {{a...}...} = b
+  eq a.c, 1
+
+  d = {}
+  {d.e...} = f: 1
+  eq d.e.f, 1
+
+  {{g}...} = g: 1
+  eq g, 1
--- a/test/compilation.coffee
+++ b/test/compilation.coffee
@@ -1,10 +1,19 @@
 # Compilation
 # -----------

-# helper to assert that a string should fail compilation
+# Helper to assert that a string should fail compilation.
 cantCompile = (code) ->
  throws -> CoffeeScript.compile code

+# Helper to pipe the CoffeeScript compiler’s output through a transpiler.
+transpile = (method, code, options = {}) ->
+  # `method` should be 'compile' or 'eval' or 'run'
+  options.bare = yes
+  options.transpile =
+    # Target Internet Explorer 6, which supports no ES2015+ features.
+    presets: [['env', {targets: browsers: ['ie 6']}]]
+  CoffeeScript[method] code, options
+

 test "ensure that carriage returns don't break compilation on Windows", ->
  doesNotThrow -> CoffeeScript.compile 'one\r\ntwo', bare: on
@@ -123,3 +132,37 @@ test "#3001: `own` shouldn't be allowed in a `for`-`in` loop", ->

 test "#2994: single-line `if` requires `then`", ->
  cantCompile "if b else x"
+
+test "transpile option, for Node API CoffeeScript.compile", ->
+  return if global.testingBrowser
+  ok transpile('compile', "import fs from 'fs'").includes 'require'
+
+test "transpile option, for Node API CoffeeScript.eval", ->
+  return if global.testingBrowser
+  ok transpile 'eval', "import path from 'path'; path.sep in ['/', '\\\\']"
+
+test "transpile option, for Node API CoffeeScript.run", ->
+  return if global.testingBrowser
+  doesNotThrow -> transpile 'run', "import fs from 'fs'"
+
+test "transpile option has merged source maps", ->
+  return if global.testingBrowser
+  untranspiledOutput = CoffeeScript.compile "import path from 'path'\nconsole.log path.sep", sourceMap: yes
+  transpiledOutput   = transpile 'compile', "import path from 'path'\nconsole.log path.sep", sourceMap: yes
+  untranspiledOutput.v3SourceMap = JSON.parse untranspiledOutput.v3SourceMap
+  transpiledOutput.v3SourceMap   = JSON.parse transpiledOutput.v3SourceMap
+  ok untranspiledOutput.v3SourceMap.mappings isnt transpiledOutput.v3SourceMap.mappings
+  # Babel adds `'use strict';` to the top of files with the modules transform.
+  eq transpiledOutput.js.indexOf('use strict'), 1
+  # The `'use strict';` followed by two newlines results in the first two lines
+  # of the source map mappings being two blank/skipped lines.
+  eq transpiledOutput.v3SourceMap.mappings.indexOf(';;'), 0
+  # The number of lines in the transpiled code should match the number of lines
+  # in the source map.
+  eq transpiledOutput.js.split('\n').length, transpiledOutput.v3SourceMap.mappings.split(';').length
+
+test "using transpile from the Node API requires an object", ->
+  try
+    CoffeeScript.compile '', transpile: yes
+  catch exception
+    eq exception.message, 'The transpile option must be given an object with options to pass to Babel'
--- a/test/csx.coffee
+++ b/test/csx.coffee
@@ -711,3 +711,34 @@ test 'unspaced less than after CSX works but is not encouraged', ->

      res = 2 < div;
    '''
+
+test '#4686: comments inside interpolations that also contain CSX tags', ->
+  eqJS '''
+    <div>
+      {
+        # comment
+        <div />
+      }
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div />}
+    </div>;
+  '''
+
+test '#4686: comments inside interpolations that also contain CSX attributes', ->
+  eqJS '''
+    <div>
+      <div anAttr={
+        # comment
+        "value"
+      } />
+    </div>
+  ''', '''
+    <div>
+      {  // comment
+    <div anAttr={"value"} />}
+    </div>;
+  '''
+
--- a/test/functions.coffee
+++ b/test/functions.coffee
@@ -549,3 +549,26 @@ test "#4413: expressions in function parameters that create generated variables
  g = (a = foo() ? bar()) -> a + 1
  eq f(), 33
  eq g(), 34
+
+test "#4673: complex destructured object spread variables", ->
+  f = ({{a...}...}) ->
+    a
+  eq f(c: 1).c, 1
+
+  g = ({@y...}) ->
+    eq @y.b, 1
+  g b: 1
+
+test "#4657: destructured array param declarations", ->
+  a = 1
+  b = 2
+  f = ([a..., b]) ->
+  f [3, 4, 5]
+  eq a, 1
+  eq b, 2
+
+test "#4657: destructured array parameters", ->
+  f = ([a..., b]) -> {a, b}
+  result = f [1, 2, 3, 4]
+  arrayEq result.a, [1, 2, 3]
+  eq result.b, 4
Author	SHA1	Message	Date
Geoffrey Booth	a2a2e769c3	Update docs output for 2.0.0	2017-09-18 08:31:07 -07:00
Geoffrey Booth	19231dbcad	2.0.0 (#4701 ) * Bump version to 2.0.0; bump dependencies versions * Make v2 docs the primary docs; jettison the v1 docs’ source: whenever the v1 docs need to be rebuild in the future, that can be done on the `1` branch and copied over; simplify folder tree * Updated v1 docs that reflect that v2 is out and have updated paths to reflect that the v2 docs are now the primary docs, and the v1 docs only live under /v1/ * Add Google Analytics; track navigation, editing code and running code * 2.0.0 changelog * Fix link to root docs * No more @next; installing local copy should be --save-dev * Analytics on the browser-based tests page should prove fascinating . . . * Update annotated source * Add note to changelog clarifying scope	2017-09-18 08:19:19 -07:00
Geoffrey Booth	aecc115c79	Fix #4686 : if a CSX interpolation contains comments, not just inner CSX (JSX) tags, it needs to be wrapped in braces (#4689 )	2017-09-16 12:03:33 -07:00
Geoffrey Booth	4c41831474	CoffeeScript 2 announcement (#4695 ) * CoffeeScript 2 announcement, first draft * Lydell's notes * Jeremy’s notes; Rollup is not a transpiler * Revise “unsupported features” section * Fix links, invalid HTML * Announcing CoffeeScript 2 HTML page * Link to the announcement * Add some references * Fix anchors * Better example	2017-09-16 11:57:18 -07:00
Geoffrey Booth	659f1b3c4c	Update transpilation docs (#4700 )	2017-09-16 09:32:48 -07:00
Geoffrey Booth	f51c1a150b	Option to transpile with Babel (#4697 ) * Upgrade Babeli (now babel-minify) which fixes the bug that was forcing us to run Babel twice for transpilation * Add --transpile option (WIP) * Node API always compiles a string, so it doesn’t need the option to pass a path to an options file, it can always just pass an object to `transpile`; get `transpile` working with `eval` * Not allowing argument to `--transpile` so don’t need to cover so many cases * Don’t need to worry about `sourceMaps` option to pass to Babel, `inputSourceMap` overrides it * Rewrite Webpack test to use Node API * Make the compiler safe again for browsers and Webpack/Browserify * Node version of CoffeeScript.compile passes reference to Babel if transpile is requested * Test Node API for transpile option * Test for merged source maps * Test for Node API error message * Only stop searching for Babel options if a package.json has a truthy "babel" key * Update docs	2017-09-15 06:58:18 -07:00
Geoffrey Booth	970f31c292	Fix #4342 : Always output `sourcesContent` property as part of source map, whether inline map or written-to-disk map (#4698 )	2017-09-11 22:38:48 -07:00
Geoffrey Booth	d172405244	First pass at using Travis CI (#4690 )	2017-09-08 22:01:11 -07:00
Geoffrey Booth	44ebfdb764	Merge branch '2' # Conflicts: # lib/coffee-script/nodes.js # src/nodes.coffee # test/arrays.coffee	2017-09-07 21:08:04 -07:00
Julian Rosse	1b8f1af287	[CS2] Fix destructuring bugs #4673 and #4657 (#4683 ) * destructuring fixes [Fixes #4673] [Fixes #4657] * test for destructured @prop * Add another test to cover #4657 cases * don't declare actual params	2017-09-07 10:06:35 -07:00
Geoffrey Booth	e7073bc5d9	Update CS2 docs per #4688	2017-09-07 08:05:04 -07:00
Geoffrey Booth	63d3b699d7	[CS2] Fix CS2 docs mobile issues, improve performance (#4688 ) * Get rid of offcanvas slide-in; fix sidebar * We need to transpile docs.coffee, since Safari 9 throws an error on it and that’s too new a browser not to support; but this should also speed things up * Fix some tabs * Fix scrollbar * Use Highlight.js to format placeholder code (during compilation, not rendering) before CodeMirror loads; match Highlight.js styles to CodeMirror styles as best we can * Improve hash management * Initialize CodeMirror on demand, on mouseover a particular code example, rather than all examples on startup * Replace highlight.js with Prism for placeholder syntax highlighting * Scratch Prism, use CodeMirror itself to do Node-based syntax highlighting, so that on CodeMirror initialization there’s no flash from mismatched highlighting * Update packages; there’s a new version of Jison! (doesn’t change much) * Fix mobile issues: use SVG play button icon, to avoid iOS blue square play button; make the code editor text 16px size explicit, to avoid unwanted mobile zoom; make the ‘code play’ buttons work even if the code examples are in placeholder (non-editable) mode, in case a user hasn’t moused over/tapped them * Update docs output * Whoops, CodeMirror is only a devDependency	2017-09-07 08:01:12 -07:00
Geoffrey Booth	458440e57b	2.0.0-beta5 docs	2017-09-02 12:55:56 -07:00
zdenko	6cea181ff1	[CS1] fix #4260 and #1349 : splat error with soak properties or expressions (#4643 ) * fix splat error with soak properties or expressions * Add test based on #4260 * Add test based on #1349 * remove 'void 0' replacement; add Splat::compileNode	2017-08-27 16:25:13 -07:00
Geoffrey Booth	e3c2c0397a	2.0.0-beta4 docs	2017-08-03 18:18:31 -07:00