Merge pull request #1426 from sharelatex/as-cleanup-grunt

Cleanup grunt config & dependencies

GitOrigin-RevId: e44445e727e8cf56d03bf33a8741b9a47418a620
This commit is contained in:
James Allen
2019-01-29 10:12:10 +00:00
committed by sharelatex
parent abb259a98b
commit b85595b8ca
4 changed files with 47 additions and 1026 deletions
+8
View File
@@ -1,6 +1,7 @@
DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
GIT_SHA ?= $(shell git rev-parse HEAD)
PROJECT_NAME = web
MODULE_DIRS := $(shell find modules -mindepth 1 -maxdepth 1 -type d -not -name '.git' )
@@ -36,6 +37,8 @@ CSS_OL_IEEE_FILE := public/stylesheets/ol-ieee-style.css
CSS_FILES := $(CSS_SL_FILE) $(CSS_OL_FILE) $(CSS_OL_LIGHT_FILE) $(CSS_OL_IEEE_FILE)
SENTRY_TEMPLATE := app/views/sentry.pug
# The automatic variable $(@D) is the target directory name
app.js: app.coffee
$(COFFEE) --compile -o $(@D) $<
@@ -249,6 +252,11 @@ format_fix:
lint:
npm -q run lint
version:
sed -i.original -e "s/@@COMMIT@@/${GIT_SHA}/g" $(SENTRY_TEMPLATE)
sed -i.original -e "s/@@RELEASE@@/${BUILD_NUMBER}/g" $(SENTRY_TEMPLATE)
rm $(SENTRY_TEMPLATE).original
.PHONY:
all add install update test test_unit test_frontend test_acceptance \
test_acceptance_start_service test_acceptance_stop_service \