Skip to content

Commit 7608a93

Browse files
ekraffmillerekraffmiller
committed
fix the Cypress/dev Vite config
1 parent 28e9330 commit 7608a93

6 files changed

Lines changed: 62 additions & 21 deletions

File tree

‎dev-env/shib-dev-env/vite.config.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { defineConfig } from 'vite'
33
import react from '@vitejs/plugin-react'
44
import istanbul from 'vite-plugin-istanbul'
55
import * as path from 'path'
6+
7+
const nodeEnv = (globalThis as { process?: { env?: Record<string, string | undefined> } }).process
8+
?.env
9+
610
function readTextFile(filePath: string): string | undefined {
711
try {
812
return readFileSync(filePath, 'utf8').trim() || undefined
@@ -122,16 +126,15 @@ function readGitHeadInfo(projectRoot: string): { commitSha?: string; exactTag?:
122126
const projectRoot = resolveProjectRoot(__dirname)
123127
const packageVersion = readPackageVersion(projectRoot)
124128
const gitHeadInfo = readGitHeadInfo(projectRoot)
125-
const shortCommitSha = process.env.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
129+
const shortCommitSha = nodeEnv?.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
126130
const exactTag =
127-
(process.env.GITHUB_REF_TYPE === 'tag' ? process.env.GITHUB_REF_NAME : undefined) ??
128-
gitHeadInfo.exactTag
131+
(nodeEnv?.GITHUB_REF_TYPE === 'tag' ? nodeEnv.GITHUB_REF_NAME : undefined) ?? gitHeadInfo.exactTag
129132
const spaDisplayVersion = resolveSpaVersionDisplay({
130133
packageVersion,
131134
commitSha: shortCommitSha,
132135
exactTag,
133-
refName: process.env.GITHUB_REF_NAME,
134-
refType: process.env.GITHUB_REF_TYPE
136+
refName: nodeEnv?.GITHUB_REF_NAME,
137+
refType: nodeEnv?.GITHUB_REF_TYPE
135138
})
136139

137140
export default defineConfig({
@@ -140,8 +143,8 @@ export default defineConfig({
140143
'import.meta.env.VITE_APP_VERSION': JSON.stringify(packageVersion),
141144
'import.meta.env.VITE_COMMIT_SHA_SHORT': JSON.stringify(shortCommitSha),
142145
'import.meta.env.VITE_GIT_EXACT_TAG': JSON.stringify(exactTag),
143-
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(process.env.GITHUB_REF_NAME),
144-
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(process.env.GITHUB_REF_TYPE),
146+
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(nodeEnv?.GITHUB_REF_NAME),
147+
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(nodeEnv?.GITHUB_REF_TYPE),
145148
'import.meta.env.VITE_SPA_DISPLAY_VERSION': JSON.stringify(spaDisplayVersion)
146149
},
147150
plugins: [

‎dev-env/vite.config.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { defineConfig } from 'vite'
33
import react from '@vitejs/plugin-react'
44
import istanbul from 'vite-plugin-istanbul'
55
import * as path from 'path'
6+
7+
const nodeEnv = (globalThis as { process?: { env?: Record<string, string | undefined> } }).process
8+
?.env
9+
610
function readTextFile(filePath: string): string | undefined {
711
try {
812
return readFileSync(filePath, 'utf8').trim() || undefined
@@ -122,16 +126,15 @@ function readGitHeadInfo(projectRoot: string): { commitSha?: string; exactTag?:
122126
const projectRoot = resolveProjectRoot(__dirname)
123127
const packageVersion = readPackageVersion(projectRoot)
124128
const gitHeadInfo = readGitHeadInfo(projectRoot)
125-
const shortCommitSha = process.env.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
129+
const shortCommitSha = nodeEnv?.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
126130
const exactTag =
127-
(process.env.GITHUB_REF_TYPE === 'tag' ? process.env.GITHUB_REF_NAME : undefined) ??
128-
gitHeadInfo.exactTag
131+
(nodeEnv?.GITHUB_REF_TYPE === 'tag' ? nodeEnv.GITHUB_REF_NAME : undefined) ?? gitHeadInfo.exactTag
129132
const spaDisplayVersion = resolveSpaVersionDisplay({
130133
packageVersion,
131134
commitSha: shortCommitSha,
132135
exactTag,
133-
refName: process.env.GITHUB_REF_NAME,
134-
refType: process.env.GITHUB_REF_TYPE
136+
refName: nodeEnv?.GITHUB_REF_NAME,
137+
refType: nodeEnv?.GITHUB_REF_TYPE
135138
})
136139

137140
export default defineConfig({
@@ -141,8 +144,8 @@ export default defineConfig({
141144
'import.meta.env.VITE_APP_VERSION': JSON.stringify(packageVersion),
142145
'import.meta.env.VITE_COMMIT_SHA_SHORT': JSON.stringify(shortCommitSha),
143146
'import.meta.env.VITE_GIT_EXACT_TAG': JSON.stringify(exactTag),
144-
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(process.env.GITHUB_REF_NAME),
145-
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(process.env.GITHUB_REF_TYPE),
147+
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(nodeEnv?.GITHUB_REF_NAME),
148+
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(nodeEnv?.GITHUB_REF_TYPE),
146149
'import.meta.env.VITE_SPA_DISPLAY_VERSION': JSON.stringify(spaDisplayVersion)
147150
},
148151
plugins: [

‎tests/support/component.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// https://on.cypress.io/configuration
1414
// ***********************************************************
1515

16+
import './processShim'
17+
1618
import './bootstrapAppConfig' // Initialize test runtime config before any commands/modules
1719
import './commands'
1820
import '@cypress/code-coverage/support'

‎tests/support/e2e.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// https://on.cypress.io/configuration
1414
// ***********************************************************
1515

16+
import './processShim'
17+
1618
// Initialize test runtime config before any commands/modules use requireAppConfig
1719
import './bootstrapAppConfig'
1820

‎tests/support/processShim.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
type ProcessShim = {
2+
env: Record<string, string | undefined>
3+
nextTick: (callback: (...args: unknown[]) => void, ...args: unknown[]) => void
4+
binding: () => Record<string, never>
5+
}
6+
7+
const globalWithProcess = globalThis as unknown as {
8+
process?: Partial<ProcessShim>
9+
}
10+
11+
if (!globalWithProcess.process) {
12+
globalWithProcess.process = {}
13+
}
14+
15+
if (!globalWithProcess.process.env) {
16+
globalWithProcess.process.env = {}
17+
}
18+
19+
if (!globalWithProcess.process.nextTick) {
20+
globalWithProcess.process.nextTick = (callback, ...args) => {
21+
queueMicrotask(() => {
22+
callback(...args)
23+
})
24+
}
25+
}
26+
27+
if (!globalWithProcess.process.binding) {
28+
globalWithProcess.process.binding = () => ({})
29+
}

‎vite.config.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import { keycloakify } from 'keycloakify/vite-plugin'
66
import * as path from 'path'
77
import { resolveSpaVersionDisplay } from './src/version/resolveSpaVersionDisplay'
88

9+
const nodeEnv = (globalThis as { process?: { env?: Record<string, string | undefined> } }).process
10+
?.env
11+
912
function readTextFile(filePath: string): string | undefined {
1013
try {
1114
return readFileSync(filePath, 'utf8').trim() || undefined
@@ -88,16 +91,15 @@ function readGitHeadInfo(projectRoot: string): { commitSha?: string; exactTag?:
8891
const projectRoot = path.resolve(__dirname)
8992
const packageVersion = readPackageVersion(projectRoot)
9093
const gitHeadInfo = readGitHeadInfo(projectRoot)
91-
const shortCommitSha = process.env.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
94+
const shortCommitSha = nodeEnv?.GITHUB_SHA?.slice(0, 9) ?? gitHeadInfo.commitSha
9295
const exactTag =
93-
(process.env.GITHUB_REF_TYPE === 'tag' ? process.env.GITHUB_REF_NAME : undefined) ??
94-
gitHeadInfo.exactTag
96+
(nodeEnv?.GITHUB_REF_TYPE === 'tag' ? nodeEnv.GITHUB_REF_NAME : undefined) ?? gitHeadInfo.exactTag
9597
const spaDisplayVersion = resolveSpaVersionDisplay({
9698
packageVersion,
9799
commitSha: shortCommitSha,
98100
exactTag,
99-
refName: process.env.GITHUB_REF_NAME,
100-
refType: process.env.GITHUB_REF_TYPE
101+
refName: nodeEnv?.GITHUB_REF_NAME,
102+
refType: nodeEnv?.GITHUB_REF_TYPE
101103
})
102104

103105
export default defineConfig({
@@ -106,8 +108,8 @@ export default defineConfig({
106108
'import.meta.env.VITE_APP_VERSION': JSON.stringify(packageVersion),
107109
'import.meta.env.VITE_COMMIT_SHA_SHORT': JSON.stringify(shortCommitSha),
108110
'import.meta.env.VITE_GIT_EXACT_TAG': JSON.stringify(exactTag),
109-
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(process.env.GITHUB_REF_NAME),
110-
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(process.env.GITHUB_REF_TYPE),
111+
'import.meta.env.VITE_GITHUB_REF_NAME': JSON.stringify(nodeEnv?.GITHUB_REF_NAME),
112+
'import.meta.env.VITE_GITHUB_REF_TYPE': JSON.stringify(nodeEnv?.GITHUB_REF_TYPE),
111113
'import.meta.env.VITE_SPA_DISPLAY_VERSION': JSON.stringify(spaDisplayVersion)
112114
},
113115
plugins: [

0 commit comments

Comments
 (0)
⚡