From 32cbdc9008785e0e1d97666a2858db1e464abae2 Mon Sep 17 00:00:00 2001 From: Vivian Phung Date: Mon, 22 Jul 2024 14:38:45 +0100 Subject: [PATCH] format --- .../cerc-nextjs-base/scripts/build-app.sh | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh index 4e769224..d2c5e8f7 100755 --- a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh +++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh @@ -26,12 +26,15 @@ WORK_DIR="${1:-/app}" cd "${WORK_DIR}" || exit 1 # If this file doesn't exist at all, we'll get errors below. -if [ ! -f "next.config.js" ]; then - touch next.config.js +NEXTJS_CONFIG_FILE="next.config.js" +if [ -f "next.config.mjs" ]; then + CONFIG_FILE_TO_BEAUTIFY="next.config.mjs" +elif [ ! -f "$NEXTJS_CONFIG_FILE" ]; then + touch "$NEXTJS_CONFIG_FILE" fi if [ ! -f "next.config.dist" ]; then - cp next.config.js next.config.dist + cp "$NEXTJS_CONFIG_FILE" next.config.dist fi which js-beautify >/dev/null @@ -39,17 +42,17 @@ if [ $? -ne 0 ]; then npm i -g js-beautify fi -js-beautify next.config.dist > next.config.js -echo "" >> next.config.js +js-beautify next.config.dist > "$NEXTJS_CONFIG_FILE" +echo "" >> "$NEXTJS_CONFIG_FILE" -WEBPACK_REQ_LINE=$(grep -n "require([\'\"]webpack[\'\"])" next.config.js | cut -d':' -f1) +WEBPACK_REQ_LINE=$(grep -n "require([\'\"]webpack[\'\"])" "$NEXTJS_CONFIG_FILE" | cut -d':' -f1) if [ -z "$WEBPACK_REQ_LINE" ]; then - cat > next.config.js.0 < "$NEXTJS_CONFIG_FILE".0 < next.config.js.1 < "$NEXTJS_CONFIG_FILE".1 < next.config.js.2 - cat > next.config.js.3 < "$NEXTJS_CONFIG_FILE".2 + cat > "$NEXTJS_CONFIG_FILE".3 < next.config.js.2 - cat > next.config.js.3 < "$NEXTJS_CONFIG_FILE".2 + cat > "$NEXTJS_CONFIG_FILE".3 < { config.plugins.push(new webpack.DefinePlugin(envMap)); return config; @@ -91,15 +94,15 @@ EOF NEXT_SECTION_ADJUSTMENT=1 NEXT_SECTION_LINE=$ENV_LINE else - echo "WARNING: Cannot find location to insert environment variable map in next.config.js" 1>&2 - rm -f next.config.js.* + echo "WARNING: Cannot find location to insert environment variable map in "$NEXTJS_CONFIG_FILE"" 1>&2 + rm -f "$NEXTJS_CONFIG_FILE".* NEXT_SECTION_LINE=0 fi -tail -$(( ${CONFIG_LINES} - ${NEXT_SECTION_LINE} + ${NEXT_SECTION_ADJUSTMENT} )) next.config.js > next.config.js.5 +tail -$(( ${CONFIG_LINES} - ${NEXT_SECTION_LINE} + ${NEXT_SECTION_ADJUSTMENT} )) "$NEXTJS_CONFIG_FILE" > "$NEXTJS_CONFIG_FILE".5 -cat next.config.js.* | sed 's/^ *//g' | js-beautify | grep -v 'process\.\env\.' | js-beautify > next.config.js -rm next.config.js.* +cat "$NEXTJS_CONFIG_FILE".* | sed 's/^ *//g' | js-beautify | grep -v 'process\.\env\.' | js-beautify > "$NEXTJS_CONFIG_FILE" +rm "$NEXTJS_CONFIG_FILE".* "${SCRIPT_DIR}/find-env.sh" "$(pwd)" > .env-list.json