Skip to content

Commit

Permalink
Merge branch 'release/v0.20.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
holtwick committed Jun 21, 2024
2 parents a114629 + ad213c3 commit 3857fe9
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22
registry-url: 'https://registry.npmjs.org'
- run: npm version
- run: npm install
Expand Down
4 changes: 2 additions & 2 deletions _sandbox/using.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// try {
// // @ts-expect-error just a polyfill
// Symbol.dispose ??= Symbol("Symbol.dispose")
// Symbol.dispose ??= Symbol("Symbol.dispose")
// // @ts-expect-error just a polyfill
// Symbol.asyncDispose ??= Symbol("Symbol.asyncDispose")
// } finally { }
Expand All @@ -17,7 +17,7 @@ function useTempFile(path: string) {
path,
[Symbol.dispose]() {
console.log('4 dispose')
}
},
}
}

Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zeed",
"type": "module",
"version": "0.20.9",
"version": "0.20.10",
"description": "🌱 Simple foundation library",
"author": {
"name": "Dirk Holtwick",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"scripts": {
"build": "nr clean && NODE_ENV=production tsup",
"build:docs": "typedoc --skipErrorChecking ./src/index.all.ts",
"build:docs": "nlx typedoc --skipErrorChecking ./src/index.all.ts",
"check": "tsc --noEmit --skipLibCheck",
"credits": "nlx credits-cli",
"circles": "nlx madge --circular --summary --orphans --leaves --warning --extensions ts src",
Expand All @@ -72,7 +72,6 @@
"esbuild": "^0.21.5",
"eslint": "<9",
"tsup": "^8.1.0",
"typedoc": "^0.25.13",
"typescript": "^5.5.2",
"vite": "^5.3.1",
"vitest": "^1.6.0"
Expand Down
6 changes: 4 additions & 2 deletions src/browser/log/log-colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ export function browserSupportsColors(): boolean {
&& window.process
// @ts-expect-error xxx
&& (window.process.type === 'renderer' || window.process.__nwjs)
)
) {
return true
}

// Internet Explorer and Edge do not support colors.
if (
typeof navigator !== 'undefined'
&& navigator.userAgent
&& navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)
)
) {
return false
}

// Is webkit? http://stackoverflow.com/a/16459606/376773
// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
Expand Down
3 changes: 2 additions & 1 deletion src/common/exec/pool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ export function usePool<T = any>(config: PoolConfig = {}) {
&& tt.id !== t.id
&& tt.group === t.group,
)
)
) {
continue
}

// fifo
if (taskInfo == null || t.priority < taskInfo.priority)
Expand Down
9 changes: 6 additions & 3 deletions src/common/log/log-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ export function getNamespaceFilterString(defaultNamespaceFilter: any): string {
|| defaultNamespaceFilter === 'true'
|| defaultNamespaceFilter === '1'
|| (typeof defaultNamespaceFilter === 'number' && defaultNamespaceFilter !== 0)
)
) {
defaultNamespaceFilter = '*'
}
else if (
defaultNamespaceFilter === false
|| defaultNamespaceFilter === 'false'
Expand All @@ -28,10 +29,12 @@ export function getNamespaceFilterString(defaultNamespaceFilter: any): string {
|| defaultNamespaceFilter == null
|| defaultNamespaceFilter === 'null'
|| defaultNamespaceFilter === 'undefined'
)
) {
defaultNamespaceFilter = ''
else
}
else {
defaultNamespaceFilter = String(defaultNamespaceFilter)
}

return defaultNamespaceFilter
}
Expand Down

0 comments on commit 3857fe9

Please sign in to comment.