From 8fb6835f8a4c30848eff4b3c189c1be0efad98f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Wed, 31 Jul 2019 11:38:26 +0200 Subject: [PATCH] Merge pull request #2026 from overleaf/ta-build-main-recurly Add build steps for main-recurly.js GitOrigin-RevId: 25231c62854b75904b1b5288b3a5157e10220f9d --- services/web/Makefile | 8 ++++---- services/web/app/src/infrastructure/ExpressLocals.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/web/Makefile b/services/web/Makefile index ccf5894cb1..ae9eafeb70 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -101,16 +101,16 @@ minify_css: $(CSS_FILES) minify_es: npm -q run webpack:production -compile: $(DIST_FILES) css public/js/main.js public/js/ide.js +compile: $(DIST_FILES) css public/js/main.js public/js/main-recurly.js public/js/ide.js @$(MAKE) compile_modules compile_full: $(BABEL) public/src --out-dir public/js $(BABEL) test/unit_frontend/src --out-dir test/unit_frontend/js - rm -f public/js/ide.js public/js/main.js # We need to generate ide.js, main.js manually later + rm -f public/js/ide.js public/js/main.js public/js/main-recurly.js # We need to generate ide.js, main.js, main-recurly.js manually later $(MAKE) css_full $(MAKE) compile_modules_full - $(MAKE) compile # ide.js, main.js, share.js, and anything missed + $(MAKE) compile # ide.js, main.js, main-recurly.js, share.js, and anything missed compile_css_full: $(MAKE) css_full @@ -150,7 +150,7 @@ $(MODULE_MAKEFILES): Makefile.module clean: clean_frontend clean_css clean_tests clean_frontend: - rm -rf public/js/{analytics,directives,es,filters,ide,main,modules,services,utils} + rm -rf public/js/{analytics,directives,es,filters,ide,main,main-recurly,modules,services,utils} rm -f public/js/*.{js,map} clean_css: diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js index 1f7d4ff8b4..bf3b03fdf9 100644 --- a/services/web/app/src/infrastructure/ExpressLocals.js +++ b/services/web/app/src/infrastructure/ExpressLocals.js @@ -61,6 +61,7 @@ const pathList = [ `${jsPath}libs/require.js`, `${jsPath}ide.js`, `${jsPath}main.js`, + `${jsPath}main-recurly.js`, `${jsPath}libraries.js`, '/stylesheets/style.css', '/stylesheets/light-style.css',