Просмотр исходного кода

Merge pull request #100 from overleaf/spd-prettierfix

Fix prettier task
Simon Detheridge 6 лет назад
Родитель
Сommit
2e9dd5ccf5

+ 2 - 3
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",
@@ -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": [
     {

+ 1 - 1
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

+ 1 - 1
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
 

+ 1 - 1
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)

+ 1 - 1
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

+ 1 - 1
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"
 

+ 1 - 1
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"
 

+ 2 - 2
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"
   },