Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump spdlog #179642

Merged
merged 1 commit into from Apr 11, 2023
Merged

Bump spdlog #179642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.json
View file
Open in desktop
Expand Up @@ -222,6 +222,7 @@
"@vscode/iconv-lite-umd",
"@vscode/policy-watcher",
"@vscode/proxy-agent",
"@vscode/spdlog",
"assert",
"child_process",
"console",
Expand All @@ -241,7 +242,6 @@
"os",
"path",
"perf_hooks",
"spdlog",
"stream",
"string_decoder",
"tas-client-umd",
Expand Down
16 changes: 8 additions & 8 deletions build/.moduleignore
View file
Open in desktop
Expand Up @@ -12,6 +12,14 @@ fsevents/src/**
fsevents/test/**
!fsevents/**/*.node

@vscode/spdlog/binding.gyp
@vscode/spdlog/build/**
@vscode/spdlog/deps/**
@vscode/spdlog/src/**
@vscode/spdlog/test/**
@vscode/spdlog/*.yml
!@vscode/spdlog/build/Release/*.node

@vscode/sqlite3/binding.gyp
@vscode/sqlite3/benchmark/**
@vscode/sqlite3/cloudformation/**
Expand Down Expand Up @@ -53,14 +61,6 @@ node-vsce-sign/**
!node-vsce-sign/package.json
!node-vsce-sign/bin/**

spdlog/binding.gyp
spdlog/build/**
spdlog/deps/**
spdlog/src/**
spdlog/test/**
spdlog/*.yml
!spdlog/build/Release/*.node

windows-foreground-love/binding.gyp
windows-foreground-love/build/**
windows-foreground-love/src/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -68,6 +68,7 @@
"@vscode/policy-watcher": "^1.1.4",
"@vscode/proxy-agent": "^0.13.1",
"@vscode/ripgrep": "^1.15.2",
"@vscode/spdlog": "^0.13.10",
"@vscode/sqlite3": "5.1.3-vscode",
"@vscode/sudo-prompt": "9.3.1",
"@vscode/vscode-languagedetection": "1.0.21",
Expand All @@ -81,7 +82,6 @@
"native-keymap": "^3.3.2",
"native-watchdog": "^1.4.1",
"node-pty": "0.11.0-beta32",
"spdlog": "^0.13.0",
"tas-client-umd": "0.1.6",
"v8-inspect-profiler": "^0.1.0",
"vscode-oniguruma": "1.7.0",
Expand Down
2 changes: 1 addition & 1 deletion remote/package.json
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/proxy-agent": "^0.13.1",
"@vscode/ripgrep": "^1.15.2",
"@vscode/spdlog": "^0.13.10",
"@vscode/vscode-languagedetection": "1.0.21",
"cookie": "^0.4.0",
"graceful-fs": "4.2.8",
Expand All @@ -19,7 +20,6 @@
"minimist": "^1.2.6",
"native-watchdog": "^1.4.1",
"node-pty": "0.11.0-beta32",
"spdlog": "^0.13.0",
"tas-client-umd": "0.1.6",
"vscode-oniguruma": "1.7.0",
"vscode-regexpp": "^3.1.0",
Expand Down
18 changes: 9 additions & 9 deletions remote/yarn.lock
View file
Open in desktop
Expand Up @@ -80,6 +80,15 @@
https-proxy-agent "^5.0.0"
proxy-from-env "^1.1.0"

"@vscode/spdlog@^0.13.10":
version "0.13.10"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.10.tgz#5476853b968a1bcc389b92175d11e636464858e8"
integrity sha512-BHJN/r2XurLDR0doBhyQ5b+DUjFjqwnOcD4ZjW/7MkuShO+Wn5KVKOl6x/xQLCAlOlQqVVe42n2A7FwuIFpkWw==
dependencies:
bindings "^1.5.0"
mkdirp "^0.5.5"
nan "^2.17.0"

"@vscode/vscode-languagedetection@1.0.21":
version "1.0.21"
resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
Expand Down Expand Up @@ -697,15 +706,6 @@ socks@^2.3.3:
ip "^1.1.5"
smart-buffer "^4.1.0"

spdlog@^0.13.0:
version "0.13.7"
resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.13.7.tgz#719a972be103e473770202e37dca1c9d80502180"
integrity sha512-DiWxvyHuDJKfNuanSnizY2pmqZGaSHej3xpOD4LQ+kkT3oLWpCXI6VRFDnziyXBQKCl8kmyaYnOu9QBhf1WEXQ==
dependencies:
bindings "^1.5.0"
mkdirp "^0.5.5"
nan "^2.17.0"

string-width@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
Expand Down
8 changes: 4 additions & 4 deletions src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
View file
Open in desktop
Expand Up @@ -40,10 +40,10 @@ flakySuite('Native Modules (all platforms)', () => {
assert.ok(typeof nodePty.spawn === 'function', testErrorMessage('node-pty'));
});

(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('spdlog', async () => {
const spdlog = await import('spdlog');
assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('spdlog'));
assert.ok(typeof spdlog.version === 'number', testErrorMessage('spdlog'));
(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('@vscode/spdlog', async () => {
const spdlog = await import('@vscode/spdlog');
assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('@vscode/spdlog'));
assert.ok(typeof spdlog.version === 'number', testErrorMessage('@vscode/spdlog'));
});

test('@parcel/watcher', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/log/node/spdlogLog.ts
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import * as spdlog from 'spdlog';
import * as spdlog from '@vscode/spdlog';
import { ByteSize } from 'vs/platform/files/common/files';
import { AbstractMessageLogger, ILogger, LogLevel } from 'vs/platform/log/common/log';

Expand All @@ -20,7 +20,7 @@ enum SpdLogLevel {
async function createSpdLogLogger(name: string, logfilePath: string, filesize: number, filecount: number, donotUseFormatters: boolean): Promise<spdlog.Logger | null> {
// Do not crash if spdlog cannot be loaded
try {
const _spdlog = await import('spdlog');
const _spdlog = await import('@vscode/spdlog');
_spdlog.setFlushOn(SpdLogLevel.Trace);
const logger = await _spdlog.createAsyncRotatingLogger(name, logfilePath, filesize, filecount);
if (donotUseFormatters) {
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1328,6 +1328,15 @@
https-proxy-agent "^5.0.0"
proxy-from-env "^1.1.0"

"@vscode/spdlog@^0.13.10":
version "0.13.10"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.10.tgz#5476853b968a1bcc389b92175d11e636464858e8"
integrity sha512-BHJN/r2XurLDR0doBhyQ5b+DUjFjqwnOcD4ZjW/7MkuShO+Wn5KVKOl6x/xQLCAlOlQqVVe42n2A7FwuIFpkWw==
dependencies:
bindings "^1.5.0"
mkdirp "^0.5.5"
nan "^2.17.0"

"@vscode/sqlite3@5.1.3-vscode":
version "5.1.3-vscode"
resolved "https://registry.yarnpkg.com/@vscode/sqlite3/-/sqlite3-5.1.3-vscode.tgz#4fe81eb2422edef7b13869fe9d66663f4d925e93"
Expand Down Expand Up @@ -9197,15 +9206,6 @@ sparkles@^1.0.0:
resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==

spdlog@^0.13.0:
version "0.13.7"
resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.13.7.tgz#719a972be103e473770202e37dca1c9d80502180"
integrity sha512-DiWxvyHuDJKfNuanSnizY2pmqZGaSHej3xpOD4LQ+kkT3oLWpCXI6VRFDnziyXBQKCl8kmyaYnOu9QBhf1WEXQ==
dependencies:
bindings "^1.5.0"
mkdirp "^0.5.5"
nan "^2.17.0"

spdx-correct@^3.0.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
Expand Down