From a21f0d2e582a9cdbde61b67345dd36cd4b1527a7 Mon Sep 17 00:00:00 2001 From: Mitar Date: Sat, 7 Dec 2013 23:46:13 -0800 Subject: [PATCH 1/3] Pass "bare" option when using CoffeeScript as well. --- packages/coffeescript/plugin/compile-coffeescript.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js index b0c94ce870..bb96c681be 100644 --- a/packages/coffeescript/plugin/compile-coffeescript.js +++ b/packages/coffeescript/plugin/compile-coffeescript.js @@ -149,7 +149,10 @@ var handler = function (compileStep, isLiterate) { path: outputFile, sourcePath: compileStep.inputPath, data: sourceWithMap.source, - sourceMap: sourceWithMap.sourceMap + sourceMap: sourceWithMap.sourceMap, + // XXX eventually get rid of backward-compatibility "raw" name + // XXX COMPAT WITH 0.6.4 + bare: compileStep.fileOptions.bare || compileStep.fileOptions.raw }); }; From 6844cb2615b0020c5bcb445bc50a1c04e9ae9460 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 19 Dec 2013 17:00:38 -0800 Subject: [PATCH 2/3] Add test for #1668 --- packages/coffeescript/bare_test_setup.coffee | 4 ++++ packages/coffeescript/bare_tests.js | 3 +++ packages/coffeescript/package.js | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 packages/coffeescript/bare_test_setup.coffee create mode 100644 packages/coffeescript/bare_tests.js diff --git a/packages/coffeescript/bare_test_setup.coffee b/packages/coffeescript/bare_test_setup.coffee new file mode 100644 index 0000000000..4e6a84eb02 --- /dev/null +++ b/packages/coffeescript/bare_test_setup.coffee @@ -0,0 +1,4 @@ +# Normally, variables should be file-local, but this file is loaded with {bare: +# true}, so it should be readable by bare_tests.js + +VariableSetByCoffeeBareTestSetup = 5678 diff --git a/packages/coffeescript/bare_tests.js b/packages/coffeescript/bare_tests.js new file mode 100644 index 0000000000..9a5e21f4fa --- /dev/null +++ b/packages/coffeescript/bare_tests.js @@ -0,0 +1,3 @@ +Tinytest.add("coffeescript - bare", function (test) { + test.equal(VariableSetByCoffeeBareTestSetup, 5678); +}); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index e31e47b9db..2091a9daae 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -14,6 +14,8 @@ Package._transitional_registerBuildPlugin({ Package.on_test(function (api) { api.use(['coffeescript', 'tinytest']); api.use(['coffeescript-test-helper'], ['client', 'server']); + api.add_files('bare_test_setup.coffee', ['client'], {bare: true}); + api.add_files('bare_tests.js', ['client']); api.add_files([ 'coffeescript_test_setup.js', 'tests/coffeescript_tests.coffee', From f65b1cd2ae88fde77be6ec64d363971d38acf0c0 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 19 Dec 2013 17:00:58 -0800 Subject: [PATCH 3/3] Remove backwards-compatibility code There's no need to be backwards-compatible here with something that has never worked (or at least hasn't worked since 0.6.5). --- packages/coffeescript/plugin/compile-coffeescript.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js index bb96c681be..dd712b634f 100644 --- a/packages/coffeescript/plugin/compile-coffeescript.js +++ b/packages/coffeescript/plugin/compile-coffeescript.js @@ -150,9 +150,7 @@ var handler = function (compileStep, isLiterate) { sourcePath: compileStep.inputPath, data: sourceWithMap.source, sourceMap: sourceWithMap.sourceMap, - // XXX eventually get rid of backward-compatibility "raw" name - // XXX COMPAT WITH 0.6.4 - bare: compileStep.fileOptions.bare || compileStep.fileOptions.raw + bare: compileStep.fileOptions.bare }); };