diff --git a/scripts/lib/env.sh b/scripts/lib/env.sh index 92d5f30..aa19815 100644 --- a/scripts/lib/env.sh +++ b/scripts/lib/env.sh @@ -34,7 +34,7 @@ env_apply() { shift 3 local -a conf=() [ -n "$CROSSCODE_CONFIG" ] && conf=(--config "$CROSSCODE_CONFIG") - node "$CROSSCODE_HOME/lib/envtpl.js" --template "$(env_template "$app" "$product")" --dir "$app" \ + node "$CROSSCODE_HOME/lib/envtpl.cjs" --template "$(env_template "$app" "$product")" --dir "$app" \ --product "$product" --release "$release" "${conf[@]+"${conf[@]}"}" "$@" } @@ -45,7 +45,7 @@ env_apply_template() { shift 4 local -a conf=() [ -n "$CROSSCODE_CONFIG" ] && conf=(--config "$CROSSCODE_CONFIG") - node "$CROSSCODE_HOME/lib/envtpl.js" --template "$tpl" --dir "$app" \ + node "$CROSSCODE_HOME/lib/envtpl.cjs" --template "$tpl" --dir "$app" \ --product "$product" --release "$release" "${conf[@]+"${conf[@]}"}" "$@" } diff --git a/scripts/lib/envtpl.js b/scripts/lib/envtpl.cjs similarity index 98% rename from scripts/lib/envtpl.js rename to scripts/lib/envtpl.cjs index 718aac4..5b70a82 100644 --- a/scripts/lib/envtpl.js +++ b/scripts/lib/envtpl.cjs @@ -4,7 +4,7 @@ // and `crosscode deploy` (files exist: only variables they don't have are appended, with a // comment; existing lines are never changed or removed). // -// node envtpl.js --template --dir [--config ] +// node envtpl.cjs --template --dir [--config ] // [--product events] [--var domain=… --var apiPort=…] [--fallback NAME=value] // [--release events@x.y.z] [--check] // diff --git a/scripts/products/events.sh b/scripts/products/events.sh index fa11507..c944051 100644 --- a/scripts/products/events.sh +++ b/scripts/products/events.sh @@ -110,7 +110,7 @@ events_keep() { chmod -R go-rwx "$dest" } -# --var arguments for the env template (envtpl.js), from church.env. +# --var arguments for the env template (envtpl.cjs), from church.env. events_env_vars() { printf '%s\n' --var "domain=$(pvar events DOMAIN)" --var "apiPort=$(events_api_port)" --var "webPort=$(events_web_port)" --var "church=$(cenv CHURCH)" } diff --git a/scripts/tests/envtpl.bats b/scripts/tests/envtpl.bats index 853e5dd..64265fe 100644 --- a/scripts/tests/envtpl.bats +++ b/scripts/tests/envtpl.bats @@ -1,10 +1,10 @@ #!/usr/bin/env bats -# .env files from a product's env template (lib/envtpl.js, AGENT-1.0-PLAN §5): written whole on +# .env files from a product's env template (lib/envtpl.cjs, AGENT-1.0-PLAN §5): written whole on # install, only appended to on deploy, nothing written when a required value is missing. setup() { TMP="$BATS_TEST_TMPDIR" - TPL_JS="$BATS_TEST_DIRNAME/../lib/envtpl.js" + TPL_JS="$BATS_TEST_DIRNAME/../lib/envtpl.cjs" APP="$TMP/app" mkdir -p "$APP/backend" "$APP/frontend" cat > "$TMP/template.json" <<'EOF'