diff --git a/.eslintrc.json b/.eslintrc.json index d8304880e2937..3f2fe3c3120e9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -222,6 +222,7 @@ "@vscode/iconv-lite-umd", "@vscode/policy-watcher", "@vscode/proxy-agent", + "@vscode/spdlog", "assert", "child_process", "console", @@ -241,7 +242,6 @@ "os", "path", "perf_hooks", - "spdlog", "stream", "string_decoder", "tas-client-umd", diff --git a/build/.moduleignore b/build/.moduleignore index 2aa99ddc29512..25cbfb4db8cc4 100644 --- a/build/.moduleignore +++ b/build/.moduleignore @@ -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/** diff --git a/package.json b/package.json index 779f5cad41967..113fef43e884e 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/remote/package.json b/remote/package.json index 0cb6f759e6669..1d6a8e69a2241 100644 --- a/remote/package.json +++ b/remote/package.json @@ -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", @@ -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", diff --git a/remote/yarn.lock b/remote/yarn.lock index 7d32b74dcca86..5c3c0db097665 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -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" @@ -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" diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts index 03572dd0c3591..0b3b8d73b35ce 100644 --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts @@ -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 () => { diff --git a/src/vs/platform/log/node/spdlogLog.ts b/src/vs/platform/log/node/spdlogLog.ts index 92ba9e7efc8db..4f5f1bf8a8c3f 100644 --- a/src/vs/platform/log/node/spdlogLog.ts +++ b/src/vs/platform/log/node/spdlogLog.ts @@ -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'; @@ -20,7 +20,7 @@ enum SpdLogLevel { async function createSpdLogLogger(name: string, logfilePath: string, filesize: number, filecount: number, donotUseFormatters: boolean): Promise { // 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) { diff --git a/yarn.lock b/yarn.lock index 1aaaf59ce8c5c..1629464fc8620 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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"