Merge pull request meteor#9107 from GeoffreyBooth/coffeescript-2

benjamn · web-flow · commit 4bbe849b3540 · 2017-11-01T10:49:20.000-04:00
CoffeeScript 2.0.2
diff --git a/packages/non-core/coffeescript-compiler/.npm/package/npm-shrinkwrap.json b/packages/non-core/coffeescript-compiler/.npm/package/npm-shrinkwrap.json
diff --git a/packages/non-core/coffeescript-compiler/coffeescript-compiler.js b/packages/non-core/coffeescript-compiler/coffeescript-compiler.js
@@ -22,7 +22,10 @@ export class CoffeeScriptCompiler {
       // prevents CoffeeScript projects from using the modules package and
       // putting require or import statements within backticks; it just
       // won't happen automatically because of Babel.
-      runtime: false
+      runtime: false,
+      // CoffeeScript 2 supports for JSX, which Meteor supports only for React,
+      // per packages/ecmascript/plugin.js.
+      react: true
     });
   }
 
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
@@ -1,13 +1,23 @@
+// The NPM `coffeescript` module requires Node 6+; but instead of checking for
+// a Node runtime version, detect support for async functions, which were
+// added in Node 7.6.
+try {
+  new Function('async () => {}')();
+} catch (exception) {
+  throw new Error('Your runtime does not support this version of CoffeeScript. Please upgrade to Meteor 1.6 or later, or use a 1.x version of CoffeeScript.');
+}
+
+
 Package.describe({
   name: 'coffeescript-compiler',
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '1.12.7_3'
+  version: '2.0.2_1'
 });
 
 Npm.depends({
-  'coffeescript': '1.12.7',
+  'coffeescript': '2.0.2',
   'source-map': '0.5.7'
 });
 
diff --git a/packages/non-core/coffeescript-test-helper/exporting.coffee b/packages/non-core/coffeescript-test-helper/exporting.coffee
@@ -1,15 +1,8 @@
 COFFEESCRIPT_EXPORTED = 123
 COFFEESCRIPT_EXPORTED_ONE_MORE = 234
 
-# Having backticks in the code is required to trigger Babel processing
-# the file and re-wrapping the list of defined variables.
 `COFFEESCRIPT_EXPORTED_WITH_BACKTICKS = 345`
 
-# Defining a class which extends a new class forces CoffeeScript
-# to define an "extend" function, which then in turn forces Babel
-# to re-wrap the list of defined variables so that each is defined
-# in its own line.
-
 class TestClass
 
 class ClassExtending extends TestClass
diff --git a/packages/non-core/coffeescript-test-helper/package.js b/packages/non-core/coffeescript-test-helper/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.10-beta.30"
+  version: "1.1.0"
 });
 
 Package.onUse(function (api) {
-  api.use('coffeescript@1.12.7-2-beta.30', ['client', 'server']);
+  api.use('coffeescript@2.0.2_1', ['client', 'server']);
   api.export('COFFEESCRIPT_EXPORTED');
   api.export('COFFEESCRIPT_EXPORTED_ONE_MORE');
   api.export('COFFEESCRIPT_EXPORTED_WITH_BACKTICKS');
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
@@ -6,12 +6,12 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '1.12.7_3'
+  version: '2.0.2_1'
 });
 
 Package.registerBuildPlugin({
   name: 'compile-coffeescript',
-  use: ['caching-compiler@1.1.9', 'ecmascript@0.8.3', 'coffeescript-compiler@=1.12.7_3'],
+  use: ['caching-compiler@1.1.9', 'ecmascript@0.8.3', 'coffeescript-compiler@=2.0.2_1'],
   sources: ['compile-coffeescript.js']
 });
 
diff --git a/packages/non-core/coffeescript/tests/coffeescript_tests.coffee b/packages/non-core/coffeescript/tests/coffeescript_tests.coffee
@@ -28,3 +28,17 @@ Tinytest.add "coffeescript - import local module via native import statement", (
 import { testingForNativeImportedModule123456789 } from "./coffeescript_module.coffee";
 Tinytest.add "coffeescript - import local module exported by a CoffeeScript native export statement, via native import statement", (test) ->
   test.isTrue testingForNativeImportedModule123456789?
+
+
+# CoffeeScript 2 is active, with its conforming-to-ES2015 breaking changes
+Tinytest.add "coffeescript - ES2015 conformity", (test) ->
+  f = (a = 1) -> a
+  test.isTrue f(null) is null # `f(null)` would be 1 in CoffeeScript 1.x
+
+# JSX
+Tinytest.add "coffeescript - JSX", (test) ->
+  # Mock React
+  React =
+    createElement: (tag, attributes, body) ->
+      "<#{tag}>#{body}</#{tag}>"
+  test.isTrue <div>Hello from JSX!</div> is '<div>Hello from JSX!</div>'
diff --git a/tools/tests/command-line.js b/tools/tests/command-line.js
@@ -367,8 +367,8 @@ selftest.define("argument parsing", function () {
   });
   s.cd("app-with-extra-packages", function () {
     run = s.run("test",
-      "--extra-packages", "practicalmeteor:mocha, extra-package-1, extra-package-2@=0.0.2",
-      "--driver-package", "practicalmeteor:mocha");
+      "--extra-packages", "tmeasday:acceptance-test-driver, extra-package-1, extra-package-2@=0.0.2",
+      "--driver-package", "tmeasday:acceptance-test-driver");
     run.waitSecs(60);
     run.match("extra-package-1: foobar");
     run.match("extra-package-2: barfoo");
diff --git a/tools/tests/test-modes.js b/tools/tests/test-modes.js
@@ -7,23 +7,24 @@ selftest.define("'meteor test --port' accepts/rejects proper values", function (
 
   s.createApp("myapp", "standard-app");
   s.cd("myapp");
+  s.set("")
 
-  var runAddPackage = s.run("add", "practicalmeteor:mocha");
+  var runAddPackage = s.run("add", "tmeasday:acceptance-test-driver");
   runAddPackage.waitSecs(30);
-  runAddPackage.match(/practicalmeteor:mocha\b.*?added/)
+  runAddPackage.match(/tmeasday:acceptance-test-driver\b.*?added/)
   runAddPackage.expectExit(0);
 
-  run = s.run("test", "--port", "3700", "--driver-package", "practicalmeteor:mocha");
+  run = s.run("test", "--port", "3700", "--driver-package", "tmeasday:acceptance-test-driver");
   run.waitSecs(120);
   run.match('App running at: http://localhost:3700/');
   run.stop();
 
-  run = s.run("test", "--port", "127.0.0.1:3700", "--driver-package", "practicalmeteor:mocha");
+  run = s.run("test", "--port", "127.0.0.1:3700", "--driver-package", "tmeasday:acceptance-test-driver");
   run.waitSecs(120);
   run.match('App running at: http://127.0.0.1:3700/');
   run.stop();
-  
-  run = s.run("test", "--port", "[::]:3700", "--driver-package", "practicalmeteor:mocha");
+
+  run = s.run("test", "--port", "[::]:3700", "--driver-package", "tmeasday:acceptance-test-driver");
   run.waitSecs(120);
   run.match('App running at: http://[::]:3700/');
   run.stop();
