Permalink
Browse files

fix auto and manual require.extensions registration; ref #3141

You can now `require('coffee-script/register')` to manually register,
and the compiler auto-registers when directly running a coffee file.
  • Loading branch information...
1 parent 94e22ab commit ba4743cc834784a1af70f98564960158dfbf9e82 @michaelficarra michaelficarra committed Dec 8, 2013
View
@@ -161,7 +161,7 @@ task 'bench', 'quick benchmark of compilation time', ->
# Run the CoffeeScript test suite.
runTests = (CoffeeScript) ->
- require './lib/coffee-script/extensions'
+ require './lib/coffee-script/register'
startTime = Date.now()
currentFile = null
passedTests = 0

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
File renamed without changes.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -0,0 +1 @@
+require('./lib/coffee-script/register');
View
@@ -133,9 +133,13 @@ compileScript = (file, input, base = null) ->
try
t = task = {file, input, options}
CoffeeScript.emit 'compile', task
- if o.tokens then printTokens CoffeeScript.tokens t.input, t.options
- else if o.nodes then printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
- else if o.run then CoffeeScript.run t.input, t.options
+ if o.tokens
+ printTokens CoffeeScript.tokens t.input, t.options
+ else if o.nodes
+ printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
+ else if o.run
+ require './register'
+ CoffeeScript.run t.input, t.options
else if o.join and t.file isnt o.join
t.input = helpers.invertLiterate t.input if helpers.isLiterate file
sourceCode[sources.indexOf(t.file)] = t.input
File renamed without changes.
View
@@ -131,7 +131,7 @@ module.exports =
console.warn "Node 0.8.0+ required for CoffeeScript REPL"
process.exit 1
- require './extensions'
+ require './register'
process.argv = ['coffee'].concat process.argv[2..]
opts = merge replDefaults, opts
repl = nodeREPL.start opts

0 comments on commit ba4743c

Please sign in to comment.