From 0312b00150dc919fd0ac555dff14a8e97e186cee Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Mon, 2 Mar 2020 16:31:35 +0000 Subject: [PATCH 1/3] Fix prettier task --- services/filestore/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/filestore/package.json b/services/filestore/package.json index 4a5d72abb5..920347c50d 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -14,8 +14,8 @@ "start": "node $NODE_APP_OPTIONS app.js", "nodemon": "nodemon --config nodemon.json", "lint": "node_modules/.bin/eslint .", - "format": "node_modules/.bin/prettier-eslint '**/*.js' --list-different", - "format:fix": "node_modules/.bin/prettier-eslint '**/*.js' --write", + "format": "node_modules/.bin/prettier-eslint $PWD'/**/*.js' --list-different", + "format:fix": "node_modules/.bin/prettier-eslint $PWD'/**/*.js' --write", "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js" }, From 1276fb426af6a3cd2b0a873cda6f5fbbb44f22a7 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 2 Mar 2020 17:50:45 +0100 Subject: [PATCH 2/3] [misc] bump buildscript version to 1.3.6 --- services/filestore/.eslintrc | 2 +- services/filestore/.prettierrc | 2 +- services/filestore/Dockerfile | 2 +- services/filestore/Makefile | 2 +- services/filestore/buildscript.txt | 2 +- services/filestore/docker-compose.ci.yml | 2 +- services/filestore/docker-compose.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/filestore/.eslintrc b/services/filestore/.eslintrc index 73103de7f6..50dd4050bf 100644 --- a/services/filestore/.eslintrc +++ b/services/filestore/.eslintrc @@ -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.3.5 +// Version: 1.3.6 { "extends": [ "standard", diff --git a/services/filestore/.prettierrc b/services/filestore/.prettierrc index 5845b82113..b5f22cc658 100644 --- a/services/filestore/.prettierrc +++ b/services/filestore/.prettierrc @@ -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.3.5 +# Version: 1.3.6 { "semi": false, "singleQuote": true diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index c4a7b37f9a..91ec6303ec 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -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.3.5 +# Version: 1.3.6 FROM node:10.19.0 as base diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 86514a2121..ec1324e9a8 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -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.3.5 +# Version: 1.3.6 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 75478ce00e..cad06f2700 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -8,4 +8,4 @@ filestore --docker-repos=gcr.io/overleaf-ops --env-pass-through= --data-dirs=uploads,user_files,template_files ---script-version=1.3.5 +--script-version=1.3.6 diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml index 38ee4d81f4..824ba815c0 100644 --- a/services/filestore/docker-compose.ci.yml +++ b/services/filestore/docker-compose.ci.yml @@ -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.3.5 +# Version: 1.3.6 version: "2.3" diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml index 40984ea078..c2634432ba 100644 --- a/services/filestore/docker-compose.yml +++ b/services/filestore/docker-compose.yml @@ -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.3.5 +# Version: 1.3.6 version: "2.3" From ada6ac0764dd13d732901ed69fea734f5ffa42ac Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 2 Mar 2020 18:12:55 +0100 Subject: [PATCH 3/3] [misc] revert eslint rules --- services/filestore/.eslintrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/filestore/.eslintrc b/services/filestore/.eslintrc index 50dd4050bf..7cc2ffbf8a 100644 --- a/services/filestore/.eslintrc +++ b/services/filestore/.eslintrc @@ -23,8 +23,7 @@ "rules": { // Swap the no-unused-expressions rule with a more chai-friendly one "no-unused-expressions": 0, - "chai-friendly/no-unused-expressions": "error", - "no-console": "error" + "chai-friendly/no-unused-expressions": "error" }, "overrides": [ {