Merge pull request #1502 from Dignifiedquire/no-more-coffeescript

[WIP] No more coffeescript
karma-runner · Aug 4, 2015 · 4673116 · 4673116
2 parents 69cd909 + 1e8ac83
commit 4673116
Show file tree

Hide file tree

Showing 72 changed files with 6,316 additions and 6,016 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,3 +1,4 @@
 {
-  "extends": "standard"
+  "extends": "standard",
+  "parser": "babel-eslint"
 }
diff --git a/client/karma.js b/client/karma.js
@@ -113,7 +113,13 @@ var Karma = function (socket, iframe, opener, navigator, location) {
   // we are not going to execute at all
   this.error = function (msg, url, line) {
     hasError = true
-    socket.emit('karma_error', url ? msg + '\nat ' + url + (line ? ':' + line : '') : msg)
+    var message = msg
+
+    if (url) {
+      message = msg + '\nat ' + url + (line ? ':' + line : '')
+    }
+
+    socket.emit('karma_error', message)
     this.complete()
     return false
   }

diff --git a/gruntfile.js b/gruntfile.js
@@ -28,15 +28,18 @@ module.exports = function (grunt) {
     },
     mochaTest: {
       options: {
-        ui: 'bdd',
+        require: [
+          'babel/register'
+        ],
         reporter: 'dot',
-        quite: false,
+        ui: 'bdd',
+        quiet: false,
         colors: true
       },
       unit: {
         src: [
-          'test/unit/mocha-globals.coffee',
-          'test/unit/**/*.coffee'
+          'test/unit/mocha-globals.js',
+          'test/unit/**/*.spec.js'
         ]
       }
     },
@@ -64,6 +67,9 @@ module.exports = function (grunt) {
       }
     },
     eslint: {
+      options: {
+        quiet: true
+      },
       target: [
         '<%= files.server %>',
         '<%= files.grunt %>',
@@ -72,23 +78,6 @@ module.exports = function (grunt) {
         'test/**/*.js'
       ]
     },
-    coffeelint: {
-      unittests: {
-        files: {
-          src: ['test/unit/**/*.coffee']
-        }
-      },
-      taskstests: {
-        files: {
-          src: ['test/tasks/**/*.coffee']
-        }
-      },
-      options: {
-        max_line_length: {
-          value: 100
-        }
-      }
-    },
     'npm-publish': {
       options: {
         requires: ['build'],
@@ -127,7 +116,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('build', ['browserify:client'])
   grunt.registerTask('default', ['build', 'test', 'lint'])
-  grunt.registerTask('lint', ['eslint', 'coffeelint'])
+  grunt.registerTask('lint', ['eslint'])
 
   grunt.registerTask('release', 'Build, bump and publish to NPM.', function (type) {
     grunt.task.run([

diff --git a/package.json b/package.json
@@ -215,7 +215,7 @@
     "chokidar": "^1.0.1",
     "colors": "^1.1.0",
     "connect": "^3.3.5",
-    "core-js": "^0.9.17",
+    "core-js": "^1.0.1",
     "di": "^0.0.1",
     "dom-serialize": "^2.2.0",
     "expand-braces": "^0.1.1",
@@ -235,24 +235,24 @@
   },
   "devDependencies": {
     "LiveScript": "^1.3.0",
+    "babel": "^5.6.23",
+    "babel-eslint": "^4.0.5",
     "chai": "^2.3.0",
     "chai-as-promised": "^5.0.0",
     "chai-subset": "^1.0.1",
-    "coffee-errors": "^0.8.6",
     "coffee-script": "^1.9.2",
     "cucumber": "^0.5.2",
-    "eslint": "^0.24.1",
-    "eslint-config-standard": "^3.4.1",
-    "eslint-plugin-react": "^2.5.0",
+    "eslint": "^1.0.0",
+    "eslint-config-standard": "^4.0.0",
+    "eslint-plugin-react": "^3.2.0",
     "grunt": "^0.4",
     "grunt-auto-release": "^0.0.6",
     "grunt-browserify": "^3.8.0",
     "grunt-bump": "^0.3.1",
-    "grunt-coffeelint": "^0.0.13",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-conventional-changelog": "^1.2.2",
     "grunt-cucumberjs": "^0.7.0",
-    "grunt-eslint": "^16.0.0",
+    "grunt-eslint": "^17.0.0",
     "grunt-mocha-test": "^0.12.7",
     "grunt-npm": "0.0.2",
     "karma-browserify": "^4.1.2",

diff --git a/test/.eslintrc b/test/.eslintrc
@@ -3,6 +3,8 @@
     "mocha": true
   },
   "globals": {
-    "expect": true
+    "expect": true,
+    "sinon": true,
+    "scheduleNextTick": true
   }
 }