From 1d31ec9abedb4eced7869f9df8f0f9b7cd75d457 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Thu, 7 Apr 2022 02:16:40 +0200 Subject: [PATCH] refactor: rename `useConfig` to `useRuntimeConfig` --- src/imports.ts | 2 +- src/runtime/app.ts | 4 ++-- src/runtime/config.ts | 2 +- src/runtime/entries/cloudflare.ts | 4 ++-- src/runtime/entries/node-server.ts | 4 ++-- src/runtime/index.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/imports.ts b/src/imports.ts index 257708d886..a0e47bb746 100644 --- a/src/imports.ts +++ b/src/imports.ts @@ -6,7 +6,7 @@ export const nitroImports: Preset[] = [ imports: [ 'defineCachedFunction', 'defineCachedEventHandler', - 'useConfig', + 'useRuntimeConfig', 'useStorage', 'useNitroApp', 'defineNitroPlugin', diff --git a/src/runtime/app.ts b/src/runtime/app.ts index b97efdf8dd..8c08d5bb53 100644 --- a/src/runtime/app.ts +++ b/src/runtime/app.ts @@ -4,7 +4,7 @@ import destr from 'destr' import { createRouter as createMatcher } from 'radix3' import { createCall, createFetch as createLocalFetch } from 'unenv/runtime/fetch/index' import { createHooks, Hookable } from 'hookable' -import { useConfig } from './config' +import { useRuntimeConfig } from './config' import { timingMiddleware } from './timing' import { cachedEventHandler } from './cache' import { plugins } from '#nitro/virtual/plugins' @@ -19,7 +19,7 @@ export interface NitroApp { } function createNitroApp (): NitroApp { - const config = useConfig() + const config = useRuntimeConfig() const hooks = createHooks() diff --git a/src/runtime/config.ts b/src/runtime/config.ts index 8d82a25620..9f6442321a 100644 --- a/src/runtime/config.ts +++ b/src/runtime/config.ts @@ -25,7 +25,7 @@ for (const key in _runtimeConfig) { // Named exports const config = deepFreeze(_runtimeConfig) -export const useConfig = () => config +export const useRuntimeConfig = () => config export default config // Utils diff --git a/src/runtime/entries/cloudflare.ts b/src/runtime/entries/cloudflare.ts index 52faf4fe03..2810cab6eb 100644 --- a/src/runtime/entries/cloudflare.ts +++ b/src/runtime/entries/cloudflare.ts @@ -3,7 +3,7 @@ import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler' import { withoutBase } from 'ufo' import { requestHasBody, useRequestBody } from '../utils' import { nitroApp } from '../app' -import { useConfig } from '#nitro' +import { useRuntimeConfig } from '#nitro' addEventListener('fetch', (event: any) => { event.respondWith(handleEvent(event)) @@ -53,6 +53,6 @@ function assetsCacheControl (_request) { } const baseURLModifier = (request: Request) => { - const url = withoutBase(request.url, useConfig().app.baseURL) + const url = withoutBase(request.url, useRuntimeConfig().app.baseURL) return mapRequestToAsset(new Request(url, request)) } diff --git a/src/runtime/entries/node-server.ts b/src/runtime/entries/node-server.ts index d597e6e49e..7d0042ed35 100644 --- a/src/runtime/entries/node-server.ts +++ b/src/runtime/entries/node-server.ts @@ -3,7 +3,7 @@ import { Server as HttpServer } from 'http' import { Server as HttpsServer } from 'https' import destr from 'destr' import { nitroApp } from '../app' -import { useConfig } from '#nitro' +import { useRuntimeConfig } from '#nitro' const cert = process.env.NITRO_SSL_CERT const key = process.env.NITRO_SSL_KEY @@ -20,7 +20,7 @@ server.listen(port, hostname, (err) => { process.exit(1) } const protocol = cert && key ? 'https' : 'http' - console.log(`Listening on ${protocol}://${hostname}:${port}${useConfig().app.baseURL}`) + console.log(`Listening on ${protocol}://${hostname}:${port}${useRuntimeConfig().app.baseURL}`) }) export default {} diff --git a/src/runtime/index.ts b/src/runtime/index.ts index 7e3b07e3c6..56612e493f 100644 --- a/src/runtime/index.ts +++ b/src/runtime/index.ts @@ -1,5 +1,5 @@ export { useStorage } from '#nitro/virtual/storage' -export { useConfig } from './config' +export { useRuntimeConfig } from './config' export { defineCachedFunction, defineCachedEventHandler } from './cache' export { useNitroApp } from './app' export * from './plugin'