diff --git a/.gitignore b/.gitignore index a99e8751f..9678d9bd0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,9 @@ node_modules .cache .output .env +.dev.vars dist +.wrangler/ generated/ !.gitkeep diff --git a/nuxt.config.ts b/nuxt.config.ts index b18a5baf9..ba7798de6 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -258,8 +258,10 @@ export default defineNuxtConfig({ }, }, runtimeConfig: { - apiBaseUrl: process.env.BASE_URL ?? getApiUrl(), - rateLimitKey: process.env.RATE_LIMIT_IGNORE_KEY, + // @ts-ignore + apiBaseUrl: process.env.BASE_URL ?? globalThis.BASE_URL ?? getApiUrl(), + // @ts-ignore + rateLimitKey: process.env.RATE_LIMIT_IGNORE_KEY ?? globalThis.RATE_LIMIT_IGNORE_KEY, public: { apiBaseUrl: getApiUrl(), ariadneBaseUrl: getAriadneUrl(), @@ -294,11 +296,13 @@ export default defineNuxtConfig({ }) function getApiUrl() { - return process.env.BROWSER_BASE_URL ?? STAGING_API_URL + // @ts-ignore + return process.env.BROWSER_BASE_URL ?? globalThis.BROWSER_BASE_URL ?? STAGING_API_URL } function getAriadneUrl() { - return process.env.BROWSER_ARIADNE_URL ?? STAGING_ARIADNE_URL + // @ts-ignore + return process.env.BROWSER_ARIADNE_URL ?? globalThis.BROWSER_ARIADNE_URL ?? STAGING_ARIADNE_URL } function getDomain() { diff --git a/package.json b/package.json index 2782cc218..a93afc24b 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev": "nuxi dev", "generate": "nuxi generate", "preview": "nuxi preview", - "postinstall": "nuxi prepare", + "postinstall": "nuxi prepare && patch-package", "lint:js": "eslint . --ext .js,.vue,.ts", "lint": "npm run lint:js && prettier --check .", "fix": "eslint . --fix --ext .js,.vue,.ts && prettier --write .", @@ -33,7 +33,8 @@ "typescript": "^5.0.4", "vite-plugin-eslint": "^1.8.1", "vite-svg-loader": "^4.0.0", - "vue-tsc": "^1.6.5" + "vue-tsc": "^1.6.5", + "patch-package": "^7.0.0" }, "dependencies": { "@ltd/j-toml": "^1.38.0", diff --git a/pages/search/[searchProjectType].vue b/pages/search/[searchProjectType].vue index aeb334f75..adb2b0ad1 100644 --- a/pages/search/[searchProjectType].vue +++ b/pages/search/[searchProjectType].vue @@ -341,7 +341,7 @@ -