@@ -14,18 +14,13 @@ endif
14
14
15
15
cat /dev/null > static/js/vue-permissions.js
16
16
17
- ifeq ($(DEPLOY_TYPE ) , prod)
18
- cat static/js/admin/vue-permissions-editor/dist/js/chunk-vendors*.js > static/js/vue-permissions.js
19
- endif
17
+ cat static/js/admin/vue-permissions-editor/dist/js/chunk-vendors*js > static/js/vue-permissions.js
18
+
20
19
21
20
# Add new line so app*.js doesn't get commented out
22
21
echo >> static/js/vue-permissions.js
23
22
24
- ifeq ($(DEPLOY_TYPE ) , prod)
25
- cat static/js/admin/vue-permissions-editor/dist/js/app*.js >> static/js/vue-permissions.js
26
- else
27
- cat static/js/admin/vue-permissions-editor/dist/app.js >> static/js/vue-permissions.js
28
- endif
23
+ cat static/js/admin/vue-permissions-editor/dist/js/app*js >> static/js/vue-permissions.js
29
24
30
25
cat static/js/lib/jquery.min.js > static/js/cdr-admin.js
31
26
echo "define('jquery-ui', ['jquery'], function ($$) {" >> static/js/cdr-admin.js
56
51
> static/css/cdr_admin.css
57
52
58
53
ifeq ($(DEPLOY_TYPE ) , prod)
59
- cat static/js/admin/vue-permissions-editor/dist/css/app*. css >> static/css/cdr_admin.css
54
+ cat static/js/admin/vue-permissions-editor/dist/css/app*css >> static/css/cdr_admin.css
60
55
endif
61
56
62
57
ifneq ($(VERSION ) , "")
@@ -67,7 +62,7 @@ ifneq ($(VERSION), "")
67
62
endif
68
63
69
64
build-access :
70
- # Build vue application(s) files
65
+ # Build vue application(s) files
71
66
npm --prefix static/js/vue-cdr-access install
72
67
73
68
ifeq ($(DEPLOY_TYPE ) , prod)
@@ -88,20 +83,11 @@ endif
88
83
cat static/js/lib/jquery-ui-access.min.js >> static/js/cdr-access.js
89
84
echo "});" >> static/js/cdr-access.js
90
85
91
- cat /dev/null > static/js/vue-access.js
92
-
93
- ifeq ($(DEPLOY_TYPE ) , prod)
94
- cat static/js/vue-cdr-access/dist/js/chunk-vendors*.js >> static/js/vue-access.js
95
- endif
86
+ cat static/js/vue-cdr-access/dist/js/chunk-vendors*js >> static/js/vue-access.js
96
87
97
88
# Add new line so app*.js doesn't get commented out
98
89
echo >> static/js/vue-access.js
99
-
100
- ifeq ($(DEPLOY_TYPE ) , prod)
101
- cat static/js/vue-cdr-access/dist/js/app*.js >> static/js/vue-access.js
102
- else
103
- cat static/js/vue-cdr-access/dist/app.js >> static/js/vue-access.js
104
- endif
90
+ cat static/js/vue-cdr-access/dist/js/app*js >> static/js/vue-access.js
105
91
106
92
cat \
107
93
static/js/public/src/*.js \
@@ -118,7 +104,7 @@ endif
118
104
> static/css/cdr_access.css
119
105
120
106
ifeq ($(DEPLOY_TYPE ) , prod)
121
- cat static/js/vue-cdr-access/dist/css/app*. css >> static/css/cdr_access.css
107
+ cat static/js/vue-cdr-access/dist/css/app*css >> static/css/cdr_access.css
122
108
endif
123
109
SUSPEND = "n"
124
110
0 commit comments