github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2026 from overleaf/ta-build-main-recurly

Browse source 
Add build steps for main-recurly.js

GitOrigin-RevId: 25231c62854b75904b1b5288b3a5157e10220f9d
This commit is contained in:
Timothée Alby 2019-07-31 11:38:26 +02:00 committed by sharelatex
parent ef9b487a60
commit 8fb6835f8a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/Makefile
View file

@ -101,16 +101,16 @@ minify_css: $(CSS_FILES)
minify_es: minify_es:
npm -q run webpack:production 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 @$(MAKE) compile_modules
compile_full: compile_full:
$(BABEL) public/src --out-dir public/js $(BABEL) public/src --out-dir public/js
$(BABEL) test/unit_frontend/src --out-dir test/unit_frontend/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) css_full
$(MAKE) compile_modules_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: compile_css_full:
$(MAKE) css_full $(MAKE) css_full
@ -150,7 +150,7 @@ $(MODULE_MAKEFILES): Makefile.module
clean: clean_frontend clean_css clean_tests clean: clean_frontend clean_css clean_tests
clean_frontend: 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} rm -f public/js/*.{js,map}
clean_css: clean_css:

1
services/web/app/src/infrastructure/ExpressLocals.js
View file

@ -61,6 +61,7 @@ const pathList = [
`${jsPath}libs/require.js`, `${jsPath}libs/require.js`,
`${jsPath}ide.js`, `${jsPath}ide.js`,
`${jsPath}main.js`, `${jsPath}main.js`,
`${jsPath}main-recurly.js`,
`${jsPath}libraries.js`, `${jsPath}libraries.js`,
'/stylesheets/style.css', '/stylesheets/style.css',
'/stylesheets/light-style.css', '/stylesheets/light-style.css',