1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00

Use '.js.map' as file extension for created map files

Addresses jashkenas/coffeescript#3297
This commit is contained in:
Joe Lee-Moyet 2014-07-29 14:46:19 +01:00
parent fbbda3f85f
commit 2ec6e7e944
3 changed files with 11 additions and 11 deletions

View file

@ -192,7 +192,7 @@ useWinPathSep = path.sep <span class="hljs-keyword">is</span> <span class="hljs
[<span class="hljs-string">'-h'</span>, <span class="hljs-string">'--help'</span>, <span class="hljs-string">'display this help message'</span>] [<span class="hljs-string">'-h'</span>, <span class="hljs-string">'--help'</span>, <span class="hljs-string">'display this help message'</span>]
[<span class="hljs-string">'-i'</span>, <span class="hljs-string">'--interactive'</span>, <span class="hljs-string">'run an interactive CoffeeScript REPL'</span>] [<span class="hljs-string">'-i'</span>, <span class="hljs-string">'--interactive'</span>, <span class="hljs-string">'run an interactive CoffeeScript REPL'</span>]
[<span class="hljs-string">'-j'</span>, <span class="hljs-string">'--join [FILE]'</span>, <span class="hljs-string">'concatenate the source CoffeeScript before compiling'</span>] [<span class="hljs-string">'-j'</span>, <span class="hljs-string">'--join [FILE]'</span>, <span class="hljs-string">'concatenate the source CoffeeScript before compiling'</span>]
[<span class="hljs-string">'-m'</span>, <span class="hljs-string">'--map'</span>, <span class="hljs-string">'generate source map and save as .map files'</span>] [<span class="hljs-string">'-m'</span>, <span class="hljs-string">'--map'</span>, <span class="hljs-string">'generate source map and save as .js.map files'</span>]
[<span class="hljs-string">'-n'</span>, <span class="hljs-string">'--nodes'</span>, <span class="hljs-string">'print out the parse tree that the parser produces'</span>] [<span class="hljs-string">'-n'</span>, <span class="hljs-string">'--nodes'</span>, <span class="hljs-string">'print out the parse tree that the parser produces'</span>]
[ <span class="hljs-string">'--nodejs [ARGS]'</span>, <span class="hljs-string">'pass options directly to the "node" binary'</span>] [ <span class="hljs-string">'--nodejs [ARGS]'</span>, <span class="hljs-string">'pass options directly to the "node" binary'</span>]
[ <span class="hljs-string">'--no-header'</span>, <span class="hljs-string">'suppress the "Generated by" header'</span>] [ <span class="hljs-string">'--no-header'</span>, <span class="hljs-string">'suppress the "Generated by" header'</span>]
@ -568,7 +568,7 @@ the compiled JS version as well.</p>
sourceCode.splice index, <span class="hljs-number">1</span> sourceCode.splice index, <span class="hljs-number">1</span>
<span class="hljs-keyword">unless</span> opts.join <span class="hljs-keyword">unless</span> opts.join
silentUnlink outputPath source, base silentUnlink outputPath source, base
silentUnlink outputPath source, base, <span class="hljs-string">'.map'</span> silentUnlink outputPath source, base, <span class="hljs-string">'.js.map'</span>
timeLog <span class="hljs-string">"removed <span class="hljs-subst">#{source}</span>"</span> timeLog <span class="hljs-string">"removed <span class="hljs-subst">#{source}</span>"</span>
<span class="hljs-function"><span class="hljs-title">silentUnlink</span> = <span class="hljs-params">(path)</span> -&gt;</span> <span class="hljs-function"><span class="hljs-title">silentUnlink</span> = <span class="hljs-params">(path)</span> -&gt;</span>
@ -613,13 +613,13 @@ the compiled JS version as well.</p>
<p>Write out a JavaScript source file with the compiled code. By default, files <p>Write out a JavaScript source file with the compiled code. By default, files
are written out in <code>cwd</code> as <code>.js</code> files with the same name, but the output are written out in <code>cwd</code> as <code>.js</code> files with the same name, but the output
directory can be customized with <code>--output</code>.</p> directory can be customized with <code>--output</code>.</p>
<p>If <code>generatedSourceMap</code> is provided, this will write a <code>.map</code> file into the <p>If <code>generatedSourceMap</code> is provided, this will write a <code>.js.map</code> file into the
same directory as the <code>.js</code> file.</p> same directory as the <code>.js</code> file.</p>
</div> </div>
<div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">writeJs</span> = <span class="hljs-params">(base, sourcePath, js, jsPath, generatedSourceMap = <span class="hljs-literal">null</span>)</span> -&gt;</span> <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">writeJs</span> = <span class="hljs-params">(base, sourcePath, js, jsPath, generatedSourceMap = <span class="hljs-literal">null</span>)</span> -&gt;</span>
sourceMapPath = outputPath sourcePath, base, <span class="hljs-string">".map"</span> sourceMapPath = outputPath sourcePath, base, <span class="hljs-string">".js.map"</span>
jsDir = path.dirname jsPath jsDir = path.dirname jsPath
<span class="hljs-function"><span class="hljs-title">compile</span> = -&gt;</span> <span class="hljs-function"><span class="hljs-title">compile</span> = -&gt;</span>
<span class="hljs-keyword">if</span> opts.compile <span class="hljs-keyword">if</span> opts.compile

View file

@ -37,7 +37,7 @@
BANNER = 'Usage: coffee [options] path/to/script.coffee -- [args]\n\nIf called without options, `coffee` will run your script.'; BANNER = 'Usage: coffee [options] path/to/script.coffee -- [args]\n\nIf called without options, `coffee` will run your script.';
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 .map files'], ['-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 [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffee-script'], ['-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'], ['-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 [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffee-script'], ['-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']];
opts = {}; opts = {};
@ -406,7 +406,7 @@
sourceCode.splice(index, 1); sourceCode.splice(index, 1);
if (!opts.join) { if (!opts.join) {
silentUnlink(outputPath(source, base)); silentUnlink(outputPath(source, base));
silentUnlink(outputPath(source, base, '.map')); silentUnlink(outputPath(source, base, '.js.map'));
return timeLog("removed " + source); return timeLog("removed " + source);
} }
}; };
@ -445,7 +445,7 @@
if (generatedSourceMap == null) { if (generatedSourceMap == null) {
generatedSourceMap = null; generatedSourceMap = null;
} }
sourceMapPath = outputPath(sourcePath, base, ".map"); sourceMapPath = outputPath(sourcePath, base, ".js.map");
jsDir = path.dirname(jsPath); jsDir = path.dirname(jsPath);
compile = function() { compile = function() {
if (opts.compile) { if (opts.compile) {

View file

@ -39,7 +39,7 @@ SWITCHES = [
['-h', '--help', 'display this help message'] ['-h', '--help', 'display this help message']
['-i', '--interactive', 'run an interactive CoffeeScript REPL'] ['-i', '--interactive', 'run an interactive CoffeeScript REPL']
['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'] ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling']
['-m', '--map', 'generate source map and save as .map files'] ['-m', '--map', 'generate source map and save as .js.map files']
['-n', '--nodes', 'print out the parse tree that the parser produces'] ['-n', '--nodes', 'print out the parse tree that the parser produces']
[ '--nodejs [ARGS]', 'pass options directly to the "node" binary'] [ '--nodejs [ARGS]', 'pass options directly to the "node" binary']
[ '--no-header', 'suppress the "Generated by" header'] [ '--no-header', 'suppress the "Generated by" header']
@ -309,7 +309,7 @@ removeSource = (source, base) ->
sourceCode.splice index, 1 sourceCode.splice index, 1
unless opts.join unless opts.join
silentUnlink outputPath source, base silentUnlink outputPath source, base
silentUnlink outputPath source, base, '.map' silentUnlink outputPath source, base, '.js.map'
timeLog "removed #{source}" timeLog "removed #{source}"
silentUnlink = (path) -> silentUnlink = (path) ->
@ -334,10 +334,10 @@ outputPath = (source, base, extension=".js") ->
# are written out in `cwd` as `.js` files with the same name, but the output # are written out in `cwd` as `.js` files with the same name, but the output
# directory can be customized with `--output`. # directory can be customized with `--output`.
# #
# If `generatedSourceMap` is provided, this will write a `.map` file into the # If `generatedSourceMap` is provided, this will write a `.js.map` file into the
# same directory as the `.js` file. # same directory as the `.js` file.
writeJs = (base, sourcePath, js, jsPath, generatedSourceMap = null) -> writeJs = (base, sourcePath, js, jsPath, generatedSourceMap = null) ->
sourceMapPath = outputPath sourcePath, base, ".map" sourceMapPath = outputPath sourcePath, base, ".js.map"
jsDir = path.dirname jsPath jsDir = path.dirname jsPath
compile = -> compile = ->
if opts.compile if opts.compile