development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump spdlog (#179035)

Browse source
This commit is contained in:
Raymond Zhao 2023-04-03 11:18:47 -07:00 committed by GitHub
parent 4126b98d1b
commit 4cc7f76f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.json
View file

@ -221,6 +221,7 @@
"@vscode/ripgrep",
"@vscode/iconv-lite-umd",
"@vscode/policy-watcher",
"@vscode/spdlog",
"assert",
"child_process",
"console",
@ -240,7 +241,6 @@
"os",
"path",
"perf_hooks",
"spdlog",
"stream",
"string_decoder",
"tas-client-umd",

16
build/.moduleignore
View file

@ -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/**
@ -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/**

2
package.json
View file

@ -67,6 +67,7 @@
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/policy-watcher": "^1.1.4",
"@vscode/ripgrep": "^1.15.0",
"@vscode/spdlog": "^0.13.8",
"@vscode/sqlite3": "5.1.2-vscode",
"@vscode/sudo-prompt": "9.3.1",
"@vscode/vscode-languagedetection": "1.0.21",
@ -80,7 +81,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",

2
remote/package.json
View file

@ -7,6 +7,7 @@
"@microsoft/1ds-post-js": "^3.2.2",
"@parcel/watcher": "2.1.0",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/spdlog": "^0.13.8",
"@vscode/ripgrep": "^1.15.0",
"@vscode/vscode-languagedetection": "1.0.21",
"cookie": "^0.4.0",
@ -18,7 +19,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-proxy-agent": "^0.12.0",

18
remote/yarn.lock
View file

@ -66,6 +66,15 @@
https-proxy-agent "^5.0.0"
proxy-from-env "^1.1.0"
"@vscode/spdlog@^0.13.8":
version "0.13.8"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.8.tgz#6136438e149f90eeb9d493d7b396866a542e1229"
integrity sha512-yYgiAF2eOFJJRvDGdB3b7LNNS+CTdIkmHmAYUr8RaAu+aJlCsRkfCdMS/jisnyHzVLYlE4bZYn/gkAbROtEeYw==
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"
@ -676,15 +685,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"

8
src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
View file

@ -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 () => {

6
src/vs/platform/log/node/spdlogLog.ts
View file

@ -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';
@ -18,9 +18,9 @@ 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
// Do not crash if @vscode/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) {

18
yarn.lock
View file

@ -1311,6 +1311,15 @@
https-proxy-agent "^5.0.0"
proxy-from-env "^1.1.0"
"@vscode/spdlog@^0.13.8":
version "0.13.8"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.8.tgz#6136438e149f90eeb9d493d7b396866a542e1229"
integrity sha512-yYgiAF2eOFJJRvDGdB3b7LNNS+CTdIkmHmAYUr8RaAu+aJlCsRkfCdMS/jisnyHzVLYlE4bZYn/gkAbROtEeYw==
dependencies:
bindings "^1.5.0"
mkdirp "^0.5.5"
nan "^2.17.0"
"@vscode/sqlite3@5.1.2-vscode":
version "5.1.2-vscode"
resolved "https://registry.yarnpkg.com/@vscode/sqlite3/-/sqlite3-5.1.2-vscode.tgz#ba15962d23ad784a43ecbaaa22c93f17f93b2400"
@ -9349,15 +9358,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"