Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/polyglot-validation/Dockerfile.typescript
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ RUN case "$NODE_VERSION" in 22|24) ;; *) echo "Unsupported NODE_VERSION: $NODE_V
&& node --version | grep -E "^v${NODE_VERSION}\\." \
&& rm -rf /var/lib/apt/lists/*

# TypeScript validation fixtures intentionally cover npm, pnpm, Yarn 4+, and Bun
# package-manager markers, so make all selected tools available in the image.
RUN corepack enable && \
corepack prepare pnpm@10.0.0 --activate && \
corepack prepare yarn@4.14.1 --activate && \
npm install --global bun@1.2.0 && \
pnpm --version && \
yarn --version && \
bun --version

# Pre-configure Aspire CLI path
ENV PATH="/root/.aspire/bin:${PATH}"
ENV ASPIRE_CLI_TELEMETRY_OPTOUT=1
Expand Down
178 changes: 169 additions & 9 deletions .github/workflows/polyglot-validation/test-typescript-playground.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,158 @@ if ! command -v aspire &> /dev/null; then
exit 1
fi

if ! command -v node &> /dev/null; then
echo "❌ node not found in PATH (Node.js required)"
exit 1
fi

if ! command -v npx &> /dev/null; then
echo "❌ npx not found in PATH (Node.js required)"
echo "❌ npx not found in PATH (Node.js required for npm TypeScript validation)"
exit 1
fi

echo "Aspire CLI version:"
aspire --version

export COREPACK_ENABLE_DOWNLOAD_PROMPT=0

SELECTED_PACKAGE_MANAGER=""
SELECTED_PACKAGE_MANAGER_REASON=""

resolve_package_manager() {
local app_dir="$1"
local package_json="$app_dir/package.json"
local package_manager=""
local package_manager_name=""

if [ -f "$package_json" ]; then
# Parse packageManager values such as "pnpm@10.0.0" or "yarn@4.14.1".
package_manager=$(node -e '
const fs = require("fs");
const packageJsonPath = process.argv[1];
try {
const value = JSON.parse(fs.readFileSync(packageJsonPath, "utf8")).packageManager;
if (typeof value === "string" && value.trim().length > 0) {
process.stdout.write(value.trim());
}
} catch {
}
' "$package_json")

if [ -n "$package_manager" ]; then
package_manager_name=$(printf '%s' "${package_manager%%@*}" | tr '[:upper:]' '[:lower:]')
case "$package_manager_name" in
npm|pnpm|bun)
SELECTED_PACKAGE_MANAGER="$package_manager_name"
SELECTED_PACKAGE_MANAGER_REASON="packageManager '$package_manager' found in $package_json"
return 0
;;
yarn)
if [[ "$package_manager" =~ ^[Yy][Aa][Rr][Nn]@1([^0-9]|$) ]]; then
echo " ❌ Yarn Classic is not supported for TypeScript AppHosts. Upgrade '$package_manager' in $package_json to Yarn 4 or later, or use npm, pnpm, or Bun."
return 1
fi

SELECTED_PACKAGE_MANAGER="yarn"
SELECTED_PACKAGE_MANAGER_REASON="packageManager '$package_manager' found in $package_json"
return 0
;;
esac
fi
fi

if [ -f "$app_dir/bun.lock" ]; then
SELECTED_PACKAGE_MANAGER="bun"
SELECTED_PACKAGE_MANAGER_REASON="bun.lock found in $app_dir"
return 0
fi

if [ -f "$app_dir/bun.lockb" ]; then
SELECTED_PACKAGE_MANAGER="bun"
SELECTED_PACKAGE_MANAGER_REASON="bun.lockb found in $app_dir"
return 0
fi

if [ -f "$app_dir/pnpm-lock.yaml" ]; then
SELECTED_PACKAGE_MANAGER="pnpm"
SELECTED_PACKAGE_MANAGER_REASON="pnpm-lock.yaml found in $app_dir"
return 0
fi

if [ -f "$app_dir/yarn.lock" ]; then
if head -n 5 "$app_dir/yarn.lock" | grep -qi '^# yarn lockfile v1$'; then
echo " ❌ Yarn Classic is not supported for TypeScript AppHosts. Upgrade the Yarn lockfile at $app_dir/yarn.lock to Yarn 4 or later, or use npm, pnpm, or Bun."
return 1
fi

SELECTED_PACKAGE_MANAGER="yarn"
SELECTED_PACKAGE_MANAGER_REASON="yarn.lock found in $app_dir"
return 0
fi

if [ -f "$app_dir/.yarnrc.yml" ]; then
SELECTED_PACKAGE_MANAGER="yarn"
SELECTED_PACKAGE_MANAGER_REASON=".yarnrc.yml found in $app_dir"
return 0
fi

if [ -f "$app_dir/package-lock.json" ]; then
SELECTED_PACKAGE_MANAGER="npm"
SELECTED_PACKAGE_MANAGER_REASON="package-lock.json found in $app_dir"
return 0
fi

SELECTED_PACKAGE_MANAGER="npm"
SELECTED_PACKAGE_MANAGER_REASON="no package manager marker found in $app_dir"
return 0
}

install_command_text() {
case "$1" in
npm) echo "npm install --ignore-scripts --no-audit --no-fund" ;;
pnpm) echo "pnpm install --ignore-workspace" ;;
yarn) echo "yarn install" ;;
bun) echo "bun install" ;;
esac
}

typecheck_command_text() {
case "$1" in
npm) echo "npx --no-install tsc --noEmit --project tsconfig.json" ;;
pnpm) echo "pnpm exec tsc --noEmit --project tsconfig.json" ;;
yarn) echo "yarn run tsc --noEmit --project tsconfig.json" ;;
bun) echo "bun run tsc --noEmit --project tsconfig.json" ;;
esac
}

run_install() {
case "$1" in
npm) npm install --ignore-scripts --no-audit --no-fund ;;
pnpm) pnpm install --ignore-workspace ;;
yarn) yarn install ;;
bun) bun install ;;
esac
}

run_typecheck() {
case "$1" in
npm) npx --no-install tsc --noEmit --project tsconfig.json ;;
pnpm) pnpm exec tsc --noEmit --project tsconfig.json ;;
yarn) yarn run tsc --noEmit --project tsconfig.json ;;
bun) bun run tsc --noEmit --project tsconfig.json ;;
esac
}

ensure_package_manager_available() {
local package_manager="$1"
local required_command="$package_manager"

if ! command -v "$required_command" &> /dev/null; then
echo " ❌ $required_command not found in PATH (required for $(typecheck_command_text "$package_manager"))"
return 1
fi
}

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
if [ -d "/workspace/tests/PolyglotAppHosts" ]; then
VALIDATION_ROOT="/workspace/tests/PolyglotAppHosts"
Expand Down Expand Up @@ -60,15 +204,30 @@ for app_dir in "${APP_DIRS[@]}"; do

cd "$app_dir"

echo " → npm install..."
npm_output=$(npm install --ignore-scripts --no-audit --no-fund 2>&1) || {
echo "$npm_output" | tail -5
echo " ❌ npm install failed for $integration_name"
FAILED+=("$integration_name (npm install)")
if ! resolve_package_manager "$app_dir"; then
FAILED+=("$integration_name (package manager resolution)")
echo ""
continue
fi

echo " → package manager: $SELECTED_PACKAGE_MANAGER ($SELECTED_PACKAGE_MANAGER_REASON)"

if ! ensure_package_manager_available "$SELECTED_PACKAGE_MANAGER"; then
FAILED+=("$integration_name ($SELECTED_PACKAGE_MANAGER unavailable)")
echo ""
continue
fi

install_command=$(install_command_text "$SELECTED_PACKAGE_MANAGER")
echo " → $install_command..."
install_output=$(run_install "$SELECTED_PACKAGE_MANAGER" 2>&1) || {
echo "$install_output" | tail -5
echo " ❌ $install_command failed for $integration_name"
FAILED+=("$integration_name ($install_command)")
echo ""
continue
}
echo "$npm_output" | tail -3
echo "$install_output" | tail -3

echo " → aspire restore --apphost apphost.mts..."
if ! aspire restore --non-interactive --apphost apphost.mts 2>&1; then
Expand All @@ -78,8 +237,9 @@ for app_dir in "${APP_DIRS[@]}"; do
continue
fi

echo " → tsc --noEmit --project tsconfig.json..."
if ! npx tsc --noEmit --project tsconfig.json 2>&1; then
typecheck_command=$(typecheck_command_text "$SELECTED_PACKAGE_MANAGER")
echo " → $typecheck_command..."
if ! run_typecheck "$SELECTED_PACKAGE_MANAGER" 2>&1; then
echo " ❌ tsc compilation failed for $integration_name"
FAILED+=("$integration_name (tsc)")
echo ""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createBuilder } from './.aspire/modules/aspire.mjs';

const builder = await createBuilder();

const container = await builder.addContainer("bun-marker", "busybox");
await container.withArgs(["sh", "-c", "echo bun"]);

await builder.build().run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"appHost": {
"path": "apphost.mts",
"language": "typescript/nodejs"
},
"packages": {
"Aspire.Hosting": ""
}
}
Loading
Loading