Skip to content

Commit 30f9985

Browse files
committed
fix(stage-tamagotchi,stage-shared): added isUrlMode define check
1 parent 13c1447 commit 30f9985

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

apps/stage-tamagotchi/electron.vite.config.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,19 @@ export default defineConfig({
7373

7474
plugins: [
7575
{
76-
name: 'proj-airi:define-runtime-environment',
77-
config() {
78-
return {
79-
define: {
80-
'import.meta.env.RUNTIME_ENVIRONMENT': '\'electron\'',
81-
},
76+
name: 'proj-airi:defines',
77+
config(ctx) {
78+
const define: Record<string, any> = {
79+
'import.meta.env.RUNTIME_ENVIRONMENT': '\'electron\'',
8280
}
81+
if (ctx.mode === 'development') {
82+
define['import.meta.env.URL_MODE'] = '\'server\''
83+
}
84+
if (ctx.mode === 'production') {
85+
define['import.meta.env.URL_MODE'] = '\'file\''
86+
}
87+
88+
return { define }
8389
},
8490
},
8591

packages/stage-shared/src/environment.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ export function isStageWeb(): boolean {
55
export function isStageTamagotchi(): boolean {
66
return import.meta.env.RUNTIME_ENVIRONMENT === 'electron'
77
}
8+
9+
export function isUrlMode(mode: 'file' | 'server'): boolean {
10+
if (!import.meta.env.URL_MODE) {
11+
return mode === 'server'
12+
}
13+
14+
return import.meta.env.URL_MODE === mode
15+
}

packages/stage-shared/src/url.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isStageTamagotchi, isStageWeb } from './environment'
1+
import { isUrlMode } from './environment'
22

33
export function isUrl(url: string) {
44
try {
@@ -12,16 +12,13 @@ export function isUrl(url: string) {
1212
}
1313

1414
export function withBase(url: string) {
15-
if (isStageWeb()) {
15+
if (isUrlMode('server')) {
1616
return url
1717
}
18-
if (isStageTamagotchi()) {
19-
return url.startsWith('/')
20-
? `.${url}`
21-
: url.startsWith('./')
22-
? url
23-
: `./${url}`
24-
}
2518

26-
throw new Error('Unknown environment')
19+
return url.startsWith('/')
20+
? `.${url}`
21+
: url.startsWith('./')
22+
? url
23+
: `./${url}`
2724
}

0 commit comments

Comments
 (0)