Merge pull request #14 from sharelatex/csh-ho-docker-issue-1338-grunt

Additional issue 1338 for spelling
This commit is contained in:
Henry Oswald 2019-01-11 14:31:03 +00:00 committed by GitHub
commit 72fdadf84c
10 changed files with 1755 additions and 1398 deletions

View file

@ -5,4 +5,5 @@ app.js
test/UnitTests/js/*
node_modules/*
test/unit/js/
cache/spell.cache
cache/spell.cache
**/*.map

View file

@ -20,4 +20,4 @@ WORKDIR /app
RUN chmod 0755 ./install_deps.sh && ./install_deps.sh
USER node
CMD ["node","app.js"]
CMD ["node", "--expose-gc", "app.js"]

View file

@ -1,54 +0,0 @@
module.exports = (grunt) ->
grunt.initConfig
coffee:
app_src:
expand: true,
cwd: "app/coffee"
src: ['**/*.coffee'],
dest: 'app/js/',
ext: '.js'
app:
src: "app.coffee"
dest: "app.js"
unit_tests:
expand: true
cwd: "test/unit/coffee"
src: ["**/*.coffee"]
dest: "test/unit/js/"
ext: ".js"
clean:
app: ["app/js/"]
unit_tests: ["test/unit/js"]
execute:
app:
src: "app.js"
mochaTest:
unit:
options:
reporter: grunt.option('reporter') or 'spec'
grep: grunt.option("grep")
timeout: grunt.option("timeout")
src: ["test/unit/js/**/*.js"]
grunt.loadNpmTasks 'grunt-contrib-coffee'
grunt.loadNpmTasks 'grunt-contrib-clean'
grunt.loadNpmTasks 'grunt-mocha-test'
grunt.loadNpmTasks 'grunt-execute'
grunt.loadNpmTasks 'grunt-bunyan'
grunt.registerTask 'compile:app', ['clean:app', 'coffee:app', 'coffee:app_src']
grunt.registerTask 'run', ['compile:app', 'bunyan', 'execute']
grunt.registerTask 'compile:unit_tests', ['clean:unit_tests', 'coffee:unit_tests']
grunt.registerTask 'test:unit', ['compile:app', 'compile:unit_tests', 'mochaTest:unit']
grunt.registerTask 'install', 'compile:app'
grunt.registerTask 'default', ['run']

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.9
# Version: 1.1.10
BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)

View file

@ -1,17 +1,20 @@
metrics = require("metrics-sharelatex")
metrics.initialize("spelling")
Settings = require 'settings-sharelatex'
logger = require 'logger-sharelatex'
logger.initialize("spelling-sharelatex")
if Settings.sentry?.dsn?
logger.initializeErrorReporting(Settings.sentry.dsn)
metrics.memory.monitor(logger)
SpellingAPIController = require './app/js/SpellingAPIController'
express = require('express')
Path = require("path")
server = express()
metrics.injectMetricsRoute(server)
bodyParser = require('body-parser')
metrics = require("metrics-sharelatex")
metrics.initialize("spelling")
metrics.memory.monitor(logger)
HealthCheckController = require("./app/js/HealthCheckController")

View file

@ -1,4 +1,4 @@
--script-version=1.1.9
--script-version=1.1.10
spelling
--node-version=6.9.5
--acceptance-creds=None

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.9
# Version: 1.1.10
version: "2"

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.9
# Version: 1.1.10
version: "2"

File diff suppressed because it is too large Load diff

View file

@ -7,7 +7,7 @@
"url": "https://github.com/sharelatex/spelling-sharelatex.git"
},
"scripts": {
"compile:app": "([ -e app/coffee ] && coffee $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')",
"compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')",
"start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
"test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js",
"test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
@ -25,26 +25,21 @@
"body-parser": "^1.12.0",
"coffee-script": "^1.9.1",
"express": "^4.12.1",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
"lru-cache": "^4.0.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
"mongojs": "2.4.0",
"node-statsd": "0.0.3",
"redis": "~0.8.4",
"request": "^2.53.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
"underscore": "1.4.4",
"v8-profiler": "^5.2.4"
},
"devDependencies": {
"bunyan": "^1.0.0",
"mocha": "^4.1.0",
"chai": "",
"grunt": "^0.4.5",
"grunt-bunyan": "^0.5.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-coffee": "^0.11.0",
"grunt-execute": "^0.2.2",
"mocha": "^4.1.0",
"sandboxed-module": "",
"sinon": "^1.17.0"
}