diff --git a/astro.config.mjs b/astro.config.mjs index 11d0eede..154105a4 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -2,7 +2,7 @@ import mdx from '@astrojs/mdx' import sitemap from '@astrojs/sitemap' import expressiveCode from 'astro-expressive-code' import typesafeRoutes from 'astro-typesafe-routes' -import { defineConfig } from 'astro/config' +import { defineConfig, envField } from 'astro/config' import { SITE_METADATA } from './src/utils/constants' @@ -14,6 +14,18 @@ export default defineConfig({ }, trailingSlash: 'always', + env: { + schema: { + // The deployed environment, set in Jenkins script + SITE_ENV: envField.enum({ + context: 'client', + access: 'public', + values: ['test', 'staging', 'prod'], + default: 'prod', + }), + }, + }, + markdown: { remarkRehype: { footnoteLabelProperties: { diff --git a/ops/Jenkinsfile.cbc-build-deploy-akamai b/ops/Jenkinsfile.cbc-build-deploy-akamai index dd861376..166a4517 100644 --- a/ops/Jenkinsfile.cbc-build-deploy-akamai +++ b/ops/Jenkinsfile.cbc-build-deploy-akamai @@ -87,6 +87,9 @@ pipeline { } stage("Run Build script") { + environment { + SITE_ENV = "${params.SITE_ENV}" + } steps { sh """ npm run build diff --git a/ops/Jenkinsfile.cbc-build-deploy-prod-akamai b/ops/Jenkinsfile.cbc-build-deploy-prod-akamai index 857c7fa7..917ae02c 100644 --- a/ops/Jenkinsfile.cbc-build-deploy-prod-akamai +++ b/ops/Jenkinsfile.cbc-build-deploy-prod-akamai @@ -105,6 +105,9 @@ pipeline { } stage("Run Build script") { + environment { + SITE_ENV = "${params.SITE_ENV}" + } steps { sh """ npm run build diff --git a/src/components/icon.astro b/src/components/icon.astro index 3aec152b..9e4c1606 100644 --- a/src/components/icon.astro +++ b/src/components/icon.astro @@ -4,9 +4,10 @@ import type { VariantProps } from 'cva' import { cva } from 'cva' const iconStyles = cva({ - base: 'usa-icon', + base: 'usa-icon text-middle', variants: { size: { + 2: 'usa-icon--size-2', 3: 'usa-icon--size-3', 4: 'usa-icon--size-4', 5: 'usa-icon--size-5', @@ -20,10 +21,11 @@ const iconStyles = cva({ }) type Props = VariantProps & { - icon: SvgComponent + icon: SvgComponent, + class?: string } -const { icon: Component, color, size, ...props } = Astro.props +const { icon: Component, color, size, class: className, ...props } = Astro.props --- -