From 4c8c35a25ad0067f87d01bd868b5de11634ac2a9 Mon Sep 17 00:00:00 2001 From: Geometrically <18202329+Geometrically@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:23:19 -0700 Subject: [PATCH] move to cloudflare workers (#1229) * move to cloudflare workers * remove junk --- .gitignore | 2 + nuxt.config.ts | 12 +- package.json | 5 +- pages/search/[searchProjectType].vue | 868 ++++++++--------- patches/markdown-it+13.0.1.patch | 482 ++++++++++ pnpm-lock.yaml | 1335 +++++++++++++++++--------- wrangler.toml | 9 + 7 files changed, 1771 insertions(+), 942 deletions(-) create mode 100644 patches/markdown-it+13.0.1.patch create mode 100644 wrangler.toml diff --git a/.gitignore b/.gitignore index a99e8751..9678d9bd 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 b18a5baf..ba7798de 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 2782cc21..a93afc24 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 aeb334f7..adb2b0ad 100644 --- a/pages/search/[searchProjectType].vue +++ b/pages/search/[searchProjectType].vue @@ -341,7 +341,7 @@ -