scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/common-package-fix (pull request #2355)

Browse Source 
fix: Tiny fixes in common package

* Fix self-referencing and circular imports

* Fix env isServer


Approved-by: Joakim Jäderberg
This commit is contained in:
Anton Gunnarsson
2025-06-13 11:36:40 +00:00
parent e3d6437af2
commit e1ede52014
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/common/dataCache/DistributedCache/client.ts
View File

@@ -1,4 +1,3 @@
import { env } from "../../env/server"
import { cacheOrGet } from "./cacheOrGet" import { cacheOrGet } from "./cacheOrGet"
import { deleteKey } from "./deleteKey" import { deleteKey } from "./deleteKey"
import { get } from "./get" import { get } from "./get"
@@ -6,7 +5,6 @@ import { set } from "./set"
import type { DataCache } from "../Cache" import type { DataCache } from "../Cache"
export const API_KEY = env.REDIS_API_KEY ?? ""
export async function createDistributedCache(): Promise<DataCache> { export async function createDistributedCache(): Promise<DataCache> {
return { return {
type: "redis", type: "redis",

6
packages/common/dataCache/DistributedCache/deleteKey.ts
View File

@@ -1,11 +1,11 @@
import * as Sentry from "@sentry/nextjs" import * as Sentry from "@sentry/nextjs"
import { safeTry } from "@scandic-hotels/common/utils/safeTry" import { env } from "../../env/server"
import { safeTry } from "../../utils/safeTry"
import { cacheLogger } from "../logger" import { cacheLogger } from "../logger"
import { API_KEY } from "./client"
import { getCacheEndpoint } from "./endpoints" import { getCacheEndpoint } from "./endpoints"
const API_KEY = env.REDIS_API_KEY ?? ""
export async function deleteKey(key: string, opts?: { fuzzy?: boolean }) { export async function deleteKey(key: string, opts?: { fuzzy?: boolean }) {
const perf = performance.now() const perf = performance.now()
const endpoint = getCacheEndpoint(key) const endpoint = getCacheEndpoint(key)

6
packages/common/dataCache/DistributedCache/get.ts
View File

@@ -1,12 +1,12 @@
import * as Sentry from "@sentry/nextjs" import * as Sentry from "@sentry/nextjs"
import { safeTry } from "@scandic-hotels/common/utils/safeTry" import { env } from "../../env/server"
import { safeTry } from "../../utils/safeTry"
import { cacheLogger } from "../logger" import { cacheLogger } from "../logger"
import { API_KEY } from "./client"
import { deleteKey } from "./deleteKey" import { deleteKey } from "./deleteKey"
import { getCacheEndpoint } from "./endpoints" import { getCacheEndpoint } from "./endpoints"
const API_KEY = env.REDIS_API_KEY ?? ""
export async function get<T>(key: string) { export async function get<T>(key: string) {
const perf = performance.now() const perf = performance.now()

6
packages/common/dataCache/DistributedCache/set.ts
View File

@@ -1,11 +1,11 @@
import * as Sentry from "@sentry/nextjs" import * as Sentry from "@sentry/nextjs"
import { safeTry } from "@scandic-hotels/common/utils/safeTry" import { env } from "../../env/server"
import { safeTry } from "../../utils/safeTry"
import { type CacheTime, getCacheTimeInSeconds } from "../Cache" import { type CacheTime, getCacheTimeInSeconds } from "../Cache"
import { API_KEY } from "./client"
import { getCacheEndpoint } from "./endpoints" import { getCacheEndpoint } from "./endpoints"
const API_KEY = env.REDIS_API_KEY ?? ""
export async function set<T>(key: string, value: T, ttl: CacheTime) { export async function set<T>(key: string, value: T, ttl: CacheTime) {
const [response, error] = await safeTry( const [response, error] = await safeTry(
fetch(getCacheEndpoint(key), { fetch(getCacheEndpoint(key), {

2
packages/common/env/server.ts vendored
View File

@@ -7,7 +7,7 @@ export const env = createEnv({
* and Netlify running Deno, window is never "undefined" * and Netlify running Deno, window is never "undefined"
* https://github.com/t3-oss/t3-env/issues/154 * https://github.com/t3-oss/t3-env/issues/154
*/ */
isServer: true, isServer: typeof window === "undefined" || "Deno" in window,
server: { server: {
NODE_ENV: z.enum(["development", "test", "production"]), NODE_ENV: z.enum(["development", "test", "production"]),
REDIS_API_HOST: z.string().optional(), REDIS_API_HOST: z.string().optional(),