diff --git a/modules/cloudflare-vars.ts b/modules/cloudflare-vars.ts index c4c5581d..ea0b5ba3 100644 --- a/modules/cloudflare-vars.ts +++ b/modules/cloudflare-vars.ts @@ -1,5 +1,4 @@ import { useRuntimeConfig, defineNuxtModule, useNuxt } from 'nuxt/kit' -import { kebabCase } from 'scule' export default defineNuxtModule({ meta: { @@ -9,31 +8,7 @@ export default defineNuxtModule({ const nuxt = useNuxt() nuxt.hook('nitro:config', config => { - const runtimeConfig = useRuntimeConfig() - const vars: Record = {} - - function walkConfig (obj: Record, prefix = '') { - for (const [key, value] of Object.entries(obj)) { - if (typeof value === 'object' && value !== null) { - walkConfig(value, `${prefix}${key}.`) - } - else if (typeof value !== 'object' && value) { - const varKey = kebabCase(`${prefix}${key}`).toUpperCase().replace(/-/g, '_') - vars[varKey] = value - } - } - } - - walkConfig(runtimeConfig) - - console.log(vars) - - config.cloudflare ||= {} - config.cloudflare.wrangler ||= {} - config.cloudflare.wrangler.vars = { - ...vars, - ...config.cloudflare.wrangler.vars, - } + config.runtimeConfig = useRuntimeConfig() }) }, }) diff --git a/package.json b/package.json index 7c335c71..b57d6779 100644 --- a/package.json +++ b/package.json @@ -111,8 +111,7 @@ "patchedDependencies": { "@nuxt/image": "patches/@nuxt__image.patch", "@nuxtjs/sanity": "patches/@nuxtjs__sanity.patch", - "@nuxt/content": "patches/@nuxt__content.patch", - "nitropack": "patches/nitropack.patch" + "@nuxt/content": "patches/@nuxt__content.patch" } } } diff --git a/patches/nitropack.patch b/patches/nitropack.patch deleted file mode 100644 index 1c19c3bb..00000000 --- a/patches/nitropack.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/dist/runtime/internal/config.mjs b/dist/runtime/internal/config.mjs -index 8a81bda77e1009c7e9c152c6205894da68851031..9afeee0deff76ea92d8fabb998121074d3d0c720 100644 ---- a/dist/runtime/internal/config.mjs -+++ b/dist/runtime/internal/config.mjs -@@ -2,6 +2,7 @@ import { klona } from "klona"; - import { appConfig as _inlineAppConfig } from "#nitro-internal-virtual/app-config"; - import { applyEnv } from "./utils.env.mjs"; - const _inlineRuntimeConfig = process.env.RUNTIME_CONFIG; -+console.log('inlined runtime config', _inlineRuntimeConfig) - const envOptions = { - prefix: "NITRO_", - altPrefix: _inlineRuntimeConfig.nitro.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_", -@@ -20,6 +21,7 @@ export function useRuntimeConfig(event) { - const runtimeConfig = klona(_inlineRuntimeConfig); - applyEnv(runtimeConfig, envOptions); - event.context.nitro.runtimeConfig = runtimeConfig; -+ console.log('resolved runtime config', runtimeConfig) - return runtimeConfig; - } - const _sharedAppConfig = _deepFreeze(klona(_inlineAppConfig)); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b5e6ecff..9a4ab0e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,9 +20,6 @@ patchedDependencies: '@nuxtjs/sanity': hash: cdee2d630d64c71602ffb4f987198ee7fdae06d54141c2e06c46529e5362c3ae path: patches/@nuxtjs__sanity.patch - nitropack: - hash: c2f62c0a126aa2e1d24abbedfd7cb562d06be3d629e02898aeb3144b6244e79b - path: patches/nitropack.patch importers: @@ -13605,7 +13602,7 @@ snapshots: magic-string: 0.30.17 mlly: 1.7.4 mocked-exports: 0.1.1 - nitropack: 2.11.12(patch_hash=c2f62c0a126aa2e1d24abbedfd7cb562d06be3d629e02898aeb3144b6244e79b)(better-sqlite3@11.10.0) + nitropack: 2.11.12(better-sqlite3@11.10.0) pathe: 2.0.3 pkg-types: 2.1.0 postcss: 8.5.4 @@ -20351,7 +20348,7 @@ snapshots: p-wait-for: 5.0.2 qs: 6.14.0 - nitropack@2.11.12(patch_hash=c2f62c0a126aa2e1d24abbedfd7cb562d06be3d629e02898aeb3144b6244e79b)(better-sqlite3@11.10.0): + nitropack@2.11.12(better-sqlite3@11.10.0): dependencies: '@cloudflare/kv-asset-handler': 0.4.0 '@netlify/functions': 3.1.9(rollup@4.42.0) @@ -20690,7 +20687,7 @@ snapshots: mlly: 1.7.4 mocked-exports: 0.1.1 nanotar: 0.2.0 - nitropack: 2.11.12(patch_hash=c2f62c0a126aa2e1d24abbedfd7cb562d06be3d629e02898aeb3144b6244e79b)(better-sqlite3@11.10.0) + nitropack: 2.11.12(better-sqlite3@11.10.0) nypm: 0.6.0 ofetch: 1.4.1 ohash: 2.0.11