Skip to content

Commit d70e6bc

Browse files
author
Template Bot
committed
Apply template update: pass arguments through to build scripts
Source: mockdeep/Rails-Template#1360
1 parent d64c103 commit d70e6bc

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

bin/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ esbuild app/javascript/*.ts \
88
--format=iife \
99
--outdir=app/assets/builds \
1010
--public-path=/assets \
11+
<<<<<<< HEAD
1112
--alias:jquery=./node_modules/jquery/jquery.js \
1213
--alias:bootstrap=./node_modules/bootstrap/dist/js/bootstrap.js \
1314
--alias:jquery-visible=./node_modules/jquery-visible/jquery.visible.min.js
15+
=======
16+
"$@"
17+
>>>>>>> 8298af6 (pass arguments through to build scripts (#1360))

bin/build_css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ esbuild app/assets/stylesheets/application.css \
66
--bundle \
77
--outdir=app/assets/builds \
88
--public-path=/assets \
9+
<<<<<<< HEAD
910
--asset-names=[name]-[hash].digested \
1011
--external:/img/* \
1112
--loader:.woff=file \
1213
--loader:.woff2=file \
1314
--loader:.eot=file \
1415
--loader:.ttf=file \
1516
--loader:.svg=file
17+
=======
18+
"$@"
19+
>>>>>>> 8298af6 (pass arguments through to build scripts (#1360))

0 commit comments

Comments
 (0)