فهرست منبع

Rename webpack prod compile to minify_es and run as part of minify step

Fixes issue where webpack prod files were wiped after running minify on CI
Alasdair Smith 8 سال پیش
والد
کامیت
4d79c68f41
1فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 5 4
      services/web/Makefile

+ 5 - 4
services/web/Makefile

@@ -96,14 +96,16 @@ $(CSS_FILES): $(LESS_FILES)
 
 
 minify: $(CSS_FILES) $(JS_FILES)
 minify: $(CSS_FILES) $(JS_FILES)
 	$(GRUNT) compile:minify
 	$(GRUNT) compile:minify
+	$(MAKE) minify_es
+
+minify_es:
+	npm -q run webpack:production
+
 css: $(CSS_FILES)
 css: $(CSS_FILES)
 
 
 compile: $(JS_FILES) css public/js/libs/sharejs.js public/js/main.js public/js/ide.js
 compile: $(JS_FILES) css public/js/libs/sharejs.js public/js/main.js public/js/ide.js
 	@$(MAKE) compile_modules
 	@$(MAKE) compile_modules
 
 
-compile_es:
-	npm -q run webpack:production
-
 compile_full:
 compile_full:
 	$(COFFEE) -c -p app.coffee > app.js
 	$(COFFEE) -c -p app.coffee > app.js
 	$(COFFEE) -o app/js -c app/coffee
 	$(COFFEE) -o app/js -c app/coffee
@@ -116,7 +118,6 @@ compile_full:
 	$(MAKE) $(CSS_FILES)
 	$(MAKE) $(CSS_FILES)
 	$(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, share.js, and anything missed
-	$(MAKE) compile_es
 
 
 compile_modules: $(MODULE_MAKEFILES)
 compile_modules: $(MODULE_MAKEFILES)
 	@set -e; \
 	@set -e; \