diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000000..002b4aa0d5
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": ["env"]
+}
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..875c15324f
--- /dev/null
+++ 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
diff --git a/Cakefile b/Cakefile
index a43239a5f7..025815c64c 100644
--- a/Cakefile
+++ b/Cakefile
@@ -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) ->
"""
- 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
-
- builtCompiler = path.join tmpdir, 'coffeescript.js'
- CoffeeScript = require builtCompiler
- global.testingBrowser = yes
- testResults = runTests CoffeeScript
- fs.unlinkSync builtCompiler
- process.exit 1 unless testResults
+ 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
diff --git a/docs/annotated-source b/docs/annotated-source
new file mode 120000
index 0000000000..4b204a0203
--- /dev/null
+++ b/docs/annotated-source
@@ -0,0 +1 @@
+v2/annotated-source
\ No newline at end of file
diff --git a/docs/announcing-coffeescript-2 b/docs/announcing-coffeescript-2
new file mode 120000
index 0000000000..231601c4fc
--- /dev/null
+++ b/docs/announcing-coffeescript-2
@@ -0,0 +1 @@
+v2/announcing-coffeescript-2
\ No newline at end of file
diff --git a/docs/browser-compiler b/docs/browser-compiler
new file mode 120000
index 0000000000..02cc348fa8
--- /dev/null
+++ b/docs/browser-compiler
@@ -0,0 +1 @@
+v2/browser-compiler
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index 23a0e59b46..9ef703f05f 120000
--- a/docs/index.html
+++ b/docs/index.html
@@ -1 +1 @@
-v1/index.html
\ No newline at end of file
+v2/index.html
\ No newline at end of file
diff --git a/docs/manifest.json b/docs/manifest.json
index 80c5526659..82b7fc4a7d 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1,5 +1,6 @@
{
- "name": "",
+ "name": "CoffeeScript",
+ "description": "Unfancy JavaScript",
"icons": [
{
"src": "\/android-chrome-192x192.png",
diff --git a/docs/test.html b/docs/test.html
new file mode 120000
index 0000000000..010a9134d7
--- /dev/null
+++ b/docs/test.html
@@ -0,0 +1 @@
+v2/test.html
\ No newline at end of file
diff --git a/docs/v1/index.html b/docs/v1/index.html
index 440014b230..b682451556 100644
--- a/docs/v1/index.html
+++ b/docs/v1/index.html
@@ -594,18 +594,18 @@
Annotated Source
@@ -615,10 +615,10 @@
CoffeeScript is a little language that compiles into JavaScript. 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.
The golden rule of CoffeeScript is: “It’s just JavaScript”. 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.
The CoffeeScript compiler goes to great lengths to generate output JavaScript that runs in every JavaScript runtime, but there are exceptions. Use generator functions, for…from, or tagged template literals only if you know that your target runtimes can support them. If you use modules, you will need to use an additional tool to resolve them.
-Latest Version: 1.12.7
+Latest 1.x Version: 1.12.7
npm install -g coffeescript
-
CoffeeScript 2 is coming! It adds support for ES2015 classes, async/await, JSX, object rest/spread syntax, and JavaScript generated using ES2015+ syntax. Learn more.
+Upgrade to CoffeeScript 2! It adds support for ES2015 classes, async/await, JSX, object rest/spread syntax, and JavaScript generated using modern syntax. Learn more.
Overview
CoffeeScript on the left, compiled JavaScript output on the right.
@@ -741,7 +741,7 @@ Overview
;alert(cubes);">run: cubes
Installation
-The command-line version of coffee is available as a Node.js utility. The core compiler however, does not depend on Node, and can be run in any JavaScript environment, or in the browser (see Try CoffeeScript).
+The command-line version of coffee is available as a Node.js utility. The core compiler however, does not depend on Node, and can be run in any JavaScript environment, or in the browser (see Try CoffeeScript).
To install, first make sure you have a working copy of the latest stable version of Node.js. You can then install CoffeeScript globally with npm:
npm install --global coffeescript
@@ -2441,7 +2441,7 @@ Cake, and Cakefiles
dir = options.output || 'lib';
return fs.writeFile(dir + "/parser.js", code);
});
-load
If you need to invoke one task before another — for example, running build before test, you can use the invoke function: invoke 'build'. Cake tasks are a minimal way to expose your CoffeeScript functions to the command line, so don’t expect any fanciness built-in. If you need dependencies, or async callbacks, it’s best to put them in your code itself — not the cake task.
+load
If you need to invoke one task before another — for example, running build before test, you can use the invoke function: invoke 'build'. Cake tasks are a minimal way to expose your CoffeeScript functions to the command line, so don’t expect any fanciness built-in. If you need dependencies, or async callbacks, it’s best to put them in your code itself — not the cake task.
Source Maps
@@ -2450,7 +2450,7 @@ Source Maps
“text/coffeescript” Script Tags
-While it’s not recommended for serious use, CoffeeScripts may be included directly within the browser using <script type="text/coffeescript"> tags. The source includes a compressed and minified version of the compiler (Download current version here, 51k when gzipped) as v1/browser-compiler/coffee-script.js. Include this file on a page with inline CoffeeScript tags, and it will compile and evaluate them in order.
+While it’s not recommended for serious use, CoffeeScripts may be included directly within the browser using <script type="text/coffeescript"> tags. The source includes a compressed and minified version of the compiler (Download current version here, 51k when gzipped) as docs/v1/browser-compiler/coffee-script.js. Include this file on a page with inline CoffeeScript tags, and it will compile and evaluate them in order.
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 CoffeeScript.compile() so you can pop open Firebug and try compiling some strings.
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 window object.
@@ -2501,7 +2501,7 @@ Resources
git checkout lib && bin/cake build:full is a good command to run when you’re working on the core language. It’ll refresh the lib 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.
-Browser Tests
+
Browser Tests
Run CoffeeScript’s test suite in your current browser.
@@ -2592,7 +2592,7 @@ The browser compiler can once again be built unminified via MINIFY=false cake build:browser.
The error-prone patched version of Error.prepareStackTrace has been removed.
Command completion in the REPL (pressing tab to get suggestions) has been fixed for Node 6.9.1+.
-The browser-based tests now include all the tests as the Node-based version.
+The browser-based tests now include all the tests as the Node-based version.
CoffeeScript now provides a for…from syntax for outputting ES2015 for…of. (Sorry they couldn’t match, but we came up with for…of first for something else.) This allows iterating over generators or any other iterable object. Note that using for…from in your code makes you responsible for ensuring that either your runtime supports for…of or that you transpile the output JavaScript further to a version your target runtime(s) support.
Triple backticks (```) 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.
Within single-backtick embedded JavaScript, backticks can now be escaped via \`.
-The browser tests now run in the browser again, and are accessible here if you would like to test your browser.
+The browser tests now run in the browser again, and are accessible here if you would like to test your browser.
CoffeeScript-only keywords in ES2015 imports and exports are now ignored.
The compiler now throws an error on trying to export an anonymous class.
Bugfixes related to tokens and location data, for better source maps and improved compatibility with downstream tools.
@@ -3016,7 +3016,7 @@ Added a compressed version of the compiler for inclusion in web pages as
-/v1/browser-compiler/coffee-script.js. It’ll automatically run any script tags with type text/coffeescript for you. Added a --stdio option to the coffee command, for piped-in compiles.
+browser-compiler/coffee-script.js. It’ll automatically run any script tags with type text/coffeescript for you. Added a --stdio option to the coffee command, for piped-in compiles.