Skip to content

Commit

Permalink
1.12.6 changelog; update NPM module in documentation to be `coffeescr…
Browse files Browse the repository at this point in the history
…ipt` instead of `coffee-script`; update installation to add note about global vs local `coffee` command
  • Loading branch information
GeoffreyBooth committed May 14, 2017
1 parent d0288c7 commit 8ec10fa
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ CoffeeScript is a little language that compiles into JavaScript.

## Installation

If you have the node package manager, npm, installed:
Once you have Node.js installed:

```shell
npm install --global coffee-script
npm install --global coffeescript
```

Leave off the `--global` if you don’t wish to install globally.
Expand Down
2 changes: 1 addition & 1 deletion documentation/examples/modules.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'local-file.coffee'
import 'coffee-script'
import 'coffeescript'

import _ from 'underscore'
import * as underscore from 'underscore'
Expand Down
13 changes: 13 additions & 0 deletions documentation/sections/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
## Change Log

```
releaseHeader('2017-05-15', '1.12.6', '1.12.5')
```

* The `return` and `export` keywords can now accept implicit objects (defined by indentation, without needing braces).
* Support Unicode code point escapes (e.g. `\u{1F4A9}`).
* The `coffee` command now first looks to see if CoffeeScript is installed under `node_modules` in the current folder, and executes the `coffee` binary there if so; or otherwise it runs the globally installed one. This allows you to have one version of CoffeeScript installed globally and a different one installed locally for a particular project. (Likewise for the `cake` command.)
* Bugfixes for chained function calls not closing implicit objects or ternaries.
* Bugfixes for incorrect code generated by the `?` operator within a termary `if` statement.
* Now `cake build:browser` just creates the browser build, without also running tests on it. New task `cake build:browser:full` creates the browser build and then tests it.
* Failing tests now result in a nonzero exit code.
* Fixed a too-permissive “reserved words” test, and fixed a REPL test that was broken in Node < 6.

```
releaseHeader('2017-04-10', '1.12.5', '1.12.4')
```
Expand Down
8 changes: 6 additions & 2 deletions documentation/sections/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ 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 coffee-script
npm install --global coffeescript
```

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 coffee-script
npm install --save 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.
2 changes: 1 addition & 1 deletion documentation/sections/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The CoffeeScript compiler goes to great lengths to generate output JavaScript th
**Latest Version:** [<%= fullVersion %>](https://github.com/jashkenas/coffeescript/tarball/<%= fullVersion %>)

```bash
npm install -g coffee-script
npm install -g coffeescript
```

**CoffeeScript 2 is coming!** It adds support for [ES2015 classes](/v2/#classes), [`async`/`await`](/v2/#fat-arrow), and generates JavaScript using ES2015+ syntax. <a href="/v2/">Learn more</a>.</p>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"compiler"
],
"author": "Jeremy Ashkenas",
"version": "1.12.5",
"version": "1.12.6",
"license": "MIT",
"engines": {
"node": ">=0.8.0"
Expand Down

0 comments on commit 8ec10fa

Please sign in to comment.