Update overleaf

.eslintrc

@@ -0,0 +1,17 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "standard",
+    "prettier"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
+  "env": {
+    "node": true
+  },
+  "rules": {
+    // Do not allow importing of implicit dependencies.
+    "import/no-extraneous-dependencies": "error"
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+    pull-request-branch-name:
+      # Separate sections of the branch name with a hyphen
+      # Docker images use the branch name and do not support slashes in tags
+      # https://github.com/overleaf/google-ops/issues/822
+      # https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#pull-request-branch-nameseparator
+      separator: "-"
+
+    # Block informal upgrades -- security upgrades use a separate queue.
+    # https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit
+    open-pull-requests-limit: 0

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "arrowParens": "avoid",
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "useTabs": false
+}

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Contributing to ShareLaTeX
 Thank you for reading this! If you'd like to report a bug or join in the development
 of ShareLaTeX, then here are some notes on how to do that.
 
-*Note that ShareLaTeX is actually made up of many seperate repositories (a list is available
+*Note that ShareLaTeX is actually made up of many separate repositories (a list is available
 [here](https://github.com/sharelatex/sharelatex/blob/master/README.md#other-repositories)).* 
 
 Reporting bugs and opening issues

Dockerfile

@@ -5,60 +5,34 @@
 ARG SHARELATEX_BASE_TAG=sharelatex/sharelatex-base:latest
 FROM $SHARELATEX_BASE_TAG
 
-ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
-
+WORKDIR /var/www/sharelatex
 
 # Add required source files
 # -------------------------
-ADD ${baseDir}/bin /var/www/sharelatex/bin
-ADD ${baseDir}/doc /var/www/sharelatex/doc
-ADD ${baseDir}/migrations /var/www/sharelatex/migrations
-ADD ${baseDir}/tasks /var/www/sharelatex/tasks
-ADD ${baseDir}/Gruntfile.coffee /var/www/sharelatex/Gruntfile.coffee
-ADD ${baseDir}/package.json /var/www/sharelatex/package.json
-ADD ${baseDir}/npm-shrinkwrap.json /var/www/sharelatex/npm-shrinkwrap.json
-ADD ${baseDir}/services.js /var/www/sharelatex/config/services.js
-
-
-# Copy build dependencies
-# -----------------------
-ADD ${baseDir}/git-revision.sh /var/www/git-revision.sh
-ADD ${baseDir}/services.js /var/www/sharelatex/config/services.js
-
+ADD ${baseDir}/genScript.js /var/www/sharelatex/genScript.js
+ADD ${baseDir}/services.js /var/www/sharelatex/services.js
 
 # Checkout services
 # -----------------
-RUN cd /var/www/sharelatex \
-&&    npm install \
-&&    grunt install \
+RUN node genScript checkout | bash \
   \
-# Cleanup not needed artifacts
-# ----------------------------
-&&  rm -rf /root/.cache /root/.npm $(find /tmp/ -mindepth 1 -maxdepth 1) \
-# Stores the version installed for each service
+# Store the revision for each service
 # ---------------------------------------------
-&&  cd /var/www \
-&&    ./git-revision.sh > revisions.txt \
+&&  node genScript revisions | bash > /var/www/revisions.txt \
   \
 # Cleanup the git history
 # -------------------
-&&  rm -rf $(find /var/www/sharelatex -name .git)
+&&  node genScript cleanup-git | bash
 
 # Install npm dependencies
 # ------------------------
-RUN cd /var/www/sharelatex \
-&&    bash ./bin/install-services \
-  \
-# Cleanup not needed artifacts
-# ----------------------------
-&&  rm -rf /root/.cache /root/.npm $(find /tmp/ -mindepth 1 -maxdepth 1)
+RUN node genScript install | bash
 
-# Compile CoffeeScript
+# Compile
 # --------------------
-RUN cd /var/www/sharelatex \
-&&    bash ./bin/compile-services
+RUN node genScript compile | bash
 
-# Links CLSI sycntex to its default location
+# Links CLSI synctex to its default location
 # ------------------------------------------
 RUN ln -s /var/www/sharelatex/clsi/bin/synctex /opt/synctex
 
@@ -70,13 +44,14 @@ ADD ${baseDir}/runit /etc/service
 
 # Configure nginx
 # ---------------
-ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf
+ADD ${baseDir}/nginx/nginx.conf.template /etc/nginx/templates/nginx.conf.template
 ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
 
 
 # Configure log rotation
 # ----------------------
 ADD ${baseDir}/logrotate/sharelatex /etc/logrotate.d/sharelatex
+RUN chmod 644 /etc/logrotate.d/sharelatex
 
 
 # Copy Phusion Image startup scripts to its location
@@ -85,10 +60,17 @@ COPY ${baseDir}/init_scripts/ /etc/my_init.d/
 
 # Copy app settings files
 # -----------------------
-COPY ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee
+COPY ${baseDir}/settings.js /etc/sharelatex/settings.js
+
+# Copy grunt thin wrapper
+# -----------------------
+ADD ${baseDir}/bin/grunt /usr/local/bin/grunt
+RUN chmod +x /usr/local/bin/grunt
 
 # Set Environment Variables
 # --------------------------------
+ENV SHARELATEX_CONFIG /etc/sharelatex/settings.js
+
 ENV WEB_API_USER "sharelatex"
 
 ENV SHARELATEX_APP_NAME "Overleaf Community Edition"

Dockerfile-base

@@ -20,8 +20,8 @@ RUN apt-get update \
       qpdf \
       aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns  aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu \
     \
-# install Node.JS 10
-&&  curl -sSL https://deb.nodesource.com/setup_10.x | bash - \
+# install Node.JS 12
+&&  curl -sSL https://deb.nodesource.com/setup_12.x | bash - \
 &&  apt-get install -y nodejs \
     \
 &&  rm -rf \
@@ -30,11 +30,10 @@ RUN apt-get update \
       /etc/nginx/sites-enabled/default \
       /var/lib/apt/lists/*
 
-# Install Grunt
+# Add envsubst
 # ------------
-RUN npm install -g \
-      grunt-cli \
-&&  rm -rf /root/.npm
+ADD ./vendor/envsubst /usr/bin/envsubst
+RUN chmod +x /usr/bin/envsubst
 
 # Install TexLive
 # ---------------
@@ -46,7 +45,7 @@ RUN npm install -g \
 #     -f Dockerfile-base -t sharelatex/sharelatex-base .
 ARG TEXLIVE_MIRROR=http://mirror.ctan.org/systems/texlive/tlnet
 
-ENV PATH "${PATH}:/usr/local/texlive/2020/bin/x86_64-linux"
+ENV PATH "${PATH}:/usr/local/texlive/2021/bin/x86_64-linux"
 
 RUN mkdir /install-tl-unx \
 &&  curl -sSL \