Merge branch 'master' of github.com:jashkenas/coffeescript into 2
# Conflicts: # package.json
This commit is contained in:
commit
6685771255
8
Cakefile
8
Cakefile
|
@ -177,10 +177,14 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
|
|||
}(this));
|
||||
"""
|
||||
unless process.env.MINIFY is 'false'
|
||||
{code} = require('uglify-js').minify code, fromString: true
|
||||
{compiledCode} = require('google-closure-compiler-js').compile
|
||||
jsCode: [
|
||||
src: code
|
||||
languageOut: if majorVersion is 1 then 'ES5' else 'ES6'
|
||||
]
|
||||
outputFolder = "docs/v#{majorVersion}/browser-compiler"
|
||||
fs.mkdirSync outputFolder unless fs.existsSync outputFolder
|
||||
fs.writeFileSync "#{outputFolder}/coffee-script.js", header + '\n' + code
|
||||
fs.writeFileSync "#{outputFolder}/coffee-script.js", header + '\n' + compiledCode
|
||||
console.log "built ... running browser tests:"
|
||||
invoke 'test:browser'
|
||||
|
||||
|
|
10
package.json
10
package.json
|
@ -29,7 +29,7 @@
|
|||
],
|
||||
"preferGlobal": true,
|
||||
"scripts": {
|
||||
"test": "node ./bin/cake test",
|
||||
"test": "node ./bin/cake test",
|
||||
"test-harmony": "node --harmony ./bin/cake test"
|
||||
},
|
||||
"homepage": "http://coffeescript.org",
|
||||
|
@ -39,11 +39,11 @@
|
|||
"url": "git://github.com/jashkenas/coffeescript.git"
|
||||
},
|
||||
"devDependencies": {
|
||||
"uglify-js": "~2.7",
|
||||
"jison": ">=0.4.17",
|
||||
"docco": "~0.7.0",
|
||||
"google-closure-compiler-js": "^20161024.0.0",
|
||||
"highlight.js": "~9.8.0",
|
||||
"underscore": "~1.8.3",
|
||||
"docco": "~0.7.0"
|
||||
"jison": ">=0.4.17",
|
||||
"underscore": "~1.8.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"marked": "~0.3.6"
|
||||
|
|
Loading…
Reference in New Issue