Skip to content

Commit 962797a

Browse files
committed
Update for new output names
1 parent 6561bf4 commit 962797a

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

Makefile

+8-22
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,13 @@ endif
1414

1515
cat /dev/null > static/js/vue-permissions.js
1616

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+
2019

2120
# Add new line so app*.js doesn't get commented out
2221
echo >> static/js/vue-permissions.js
2322

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
2924

3025
cat static/js/lib/jquery.min.js > static/js/cdr-admin.js
3126
echo "define('jquery-ui', ['jquery'], function ($$) {" >> static/js/cdr-admin.js
@@ -56,7 +51,7 @@ endif
5651
> static/css/cdr_admin.css
5752

5853
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
6055
endif
6156

6257
ifneq ($(VERSION), "")
@@ -67,7 +62,7 @@ ifneq ($(VERSION), "")
6762
endif
6863

6964
build-access:
70-
# Build vue application(s) files
65+
# Build vue application(s) files
7166
npm --prefix static/js/vue-cdr-access install
7267

7368
ifeq ($(DEPLOY_TYPE), prod)
@@ -88,20 +83,11 @@ endif
8883
cat static/js/lib/jquery-ui-access.min.js >> static/js/cdr-access.js
8984
echo "});" >> static/js/cdr-access.js
9085

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
9687

9788
# Add new line so app*.js doesn't get commented out
9889
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
10591

10692
cat \
10793
static/js/public/src/*.js \
@@ -118,7 +104,7 @@ endif
118104
> static/css/cdr_access.css
119105

120106
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
122108
endif
123109
SUSPEND = "n"
124110

0 commit comments

Comments
 (0)