Skip to content

Commit 9a80ab9

Browse files
committed
fix: better localStorage fix
1 parent 36c74ee commit 9a80ab9

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@
7171
"devDependencies": {
7272
"@antfu/eslint-config": "^3.8",
7373
"@antfu/ni": "^0.23.0",
74-
"@types/node": "^22.8.1",
74+
"@types/node": "^22.9.0",
7575
"@vitejs/plugin-vue": "^5.1.4",
76-
"@vitest/browser": "^2.1.3",
77-
"@vitest/coverage-v8": "^2.1.3",
76+
"@vitest/browser": "^2.1.4",
77+
"@vitest/coverage-v8": "^2.1.4",
7878
"esbuild": "^0.24.0",
7979
"eslint": "^9",
8080
"playwright": "^1.48.2",
8181
"tsup": "^8.3.5",
8282
"typescript": "^5.6.3",
8383
"vite": "^5.4.10",
84-
"vitest": "^2.1.3"
84+
"vitest": "^2.1.4"
8585
},
8686
"pnpm": {
8787
"overrides": {

src/browser/log/log-browser-factory.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { LogLevelAll, LogLevelDebug, LogLevelError, LogLevelFatal, LogLevelInfo,
33
import { browserSelectColorByName } from '../../common/log/log-colors'
44
import { getGlobalConsole } from '../../common/log/log-console-original'
55
import { parseLogLevel, useNamespaceFilter } from '../../common/log/log-filter'
6-
import { getLocalStorage } from '../../common/platform'
76
import { browserSupportsColors } from './log-colors'
87

98
/**
@@ -12,8 +11,11 @@ import { browserSupportsColors } from './log-colors'
1211
* loggers will not work any more.
1312
*/
1413
export function LoggerBrowserSetupDebugFactory(opt: LogHandlerOptions = {}) {
15-
const localStorage = getLocalStorage()
16-
const filter = opt.filter ?? localStorage?.zeed ?? localStorage?.debug
14+
const filter = opt.filter ?? (
15+
typeof localStorage !== 'undefined'
16+
? (localStorage.zeed ?? localStorage.debug)
17+
: undefined)
18+
1719
const styleFont = 'font-family: "JetBrains Mono", Menlo; font-size: 11px;'
1820
const styleDefault = `${styleFont}`
1921
const styleBold = `font-weight: 600; ${styleFont}`

src/browser/log/log-context-browser.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import type { LogConfig } from '../../common/log/log-config'
33
import { isEmpty } from '../../common/data/is'
44
import { getGlobalLogger } from '../../common/log/log'
55
import { _LoggerFromConfig } from '../../common/log/log-config'
6-
import { getLocalStorage, isBrowser } from '../../common/platform'
6+
import { isBrowser } from '../../common/platform'
77
import { LoggerBrowserHandler } from './log-browser'
88
import { LoggerBrowserSetupDebugFactory } from './log-browser-factory'
99

1010
export function Logger(name?: string, level?: LogLevelAliasType): LoggerInterface {
1111
return getGlobalLogger((context) => {
12-
const localStorage = getLocalStorage()
13-
if (isBrowser() && !isEmpty(localStorage?.getItem('zeed'))) {
12+
if (isBrowser() && (typeof localStorage !== 'undefined' ? !isEmpty(localStorage?.getItem('zeed')) : false)) {
1413
context.setHandlers([LoggerBrowserHandler()]) // Fallback for previously registered Loggers
1514
context.setFactory(LoggerBrowserSetupDebugFactory({}))
1615
}

0 commit comments

Comments
 (0)