Browse Source

added coffeescript and moved admin require to bottom of file

Henry Oswald 9 years ago
parent
commit
3e13565a84
3 changed files with 7 additions and 2 deletions
  1. 5 1
      server-ce/Gruntfile.coffee
  2. 1 1
      server-ce/config/services.js
  3. 1 0
      server-ce/package.json

+ 5 - 1
server-ce/Gruntfile.coffee

@@ -1,3 +1,4 @@
+coffee = require("coffee-script")
 fs = require "fs"
 spawn = require("child_process").spawn
 exec = require("child_process").exec
@@ -20,7 +21,6 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-concurrent'
 	grunt.loadNpmTasks "grunt-contrib-coffee"
 	grunt.loadNpmTasks "grunt-shell"
-	require('load-grunt-config')(grunt)
 
 
 	execute = {}
@@ -240,3 +240,7 @@ module.exports = (grunt) ->
 				throw new Error("Can not connect to redis")
 				return callback(err)
 			rclient.on 'error', errorHandler
+
+
+	require('load-grunt-config')(grunt)
+

+ 1 - 1
server-ce/config/services.js

@@ -3,7 +3,7 @@ module.exports =
 [{
 	name: "web",
 	repo: "https://github.com/sharelatex/web-sharelatex.git",
-	version: "master"
+	version: "ha-docker"
 }, {
 	name: "real-time",
 	repo: "https://github.com/sharelatex/real-time-sharelatex.git",

+ 1 - 0
server-ce/package.json

@@ -4,6 +4,7 @@
   "description": "An online collaborative LaTeX editor",
   "dependencies": {
     "async": "^0.9.0",
+    "coffee-script": "^1.11.1",
     "east": "0.5.1",
     "east-mongo": "^0.1.2",
     "grunt-shell": "^1.1.1",