From 777f4da9c966d8e2ee0e027d23d1fd762c978bb5 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 11 Dec 2020 07:17:05 -0500 Subject: [PATCH] use npm run instead of webpack --- bin/prep_bubble_jar | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/prep_bubble_jar b/bin/prep_bubble_jar index f531cc47..78f287b2 100755 --- a/bin/prep_bubble_jar +++ b/bin/prep_bubble_jar @@ -46,11 +46,11 @@ if [[ -n "${BUBBLE_PRODUCTION}" || ( -n "${INSTALL_WEB}" && "${INSTALL_WEB}" == mkdir -p "${CLASSES_DIR}/site" BUBBLE_WEB="$(cd "${SCRIPT_DIR}/../bubble-web" && pwd)" if [[ -n "${BUBBLE_PRODUCTION}" ]] ; then - WEBPACK_OPTIONS="--mode=production" + NPM_CMD="build" else - WEBPACK_OPTIONS="" + NPM_CMD="dev-build" fi - cd "${BUBBLE_WEB}" && npm install && rm -rf dist/ && webpack "${WEBPACK_OPTIONS}" || die "Error building bubble-web" + cd "${BUBBLE_WEB}" && npm install && rm -rf dist/ && npm run "${NPM_CMD}" || die "Error building bubble-web" cp -R "${BUBBLE_WEB}/dist"/* "${CLASSES_DIR}/site"/ || die "Error copying ${BUBBLE_WEB}/dist/* -> ${CLASSES_DIR}/site/" cd "${CLASSES_DIR}" && zip -u -r "${BUBBLE_JAR}" site || die "Error updating ${BUBBLE_JAR} with site" echo "Installed bubble-web to ${CLASSES_DIR}/site/"