chore: revert @vscode/spdlog bump (microsoft#179103)

* Revert "chore: update [email protected] (microsoft#179087)"

This reverts commit 9eba21c.

* Revert "Bump spdlog (microsoft#179035)"

This reverts commit 4cc7f76.

Author: deepak1556

.eslintrc.json

@@ -222,7 +222,6 @@
 							"@vscode/iconv-lite-umd",
 							"@vscode/policy-watcher",
 							"@vscode/proxy-agent",
-							"@vscode/spdlog",
 							"assert",
 							"child_process",
 							"console",
@@ -242,6 +241,7 @@
 							"os",
 							"path",
 							"perf_hooks",
+							"spdlog",
 							"stream",
 							"string_decoder",
 							"tas-client-umd",

build/.moduleignore

@@ -12,14 +12,6 @@ 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/**
@@ -61,6 +53,14 @@ 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/**

package.json

@@ -68,7 +68,6 @@
     "@vscode/policy-watcher": "^1.1.4",
     "@vscode/proxy-agent": "^0.13.1",
     "@vscode/ripgrep": "^1.15.0",
-    "@vscode/spdlog": "^0.13.9",
     "@vscode/sqlite3": "5.1.2-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/vscode-languagedetection": "1.0.21",
@@ -82,6 +81,7 @@
     "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",

remote/package.json

@@ -8,7 +8,6 @@
     "@parcel/watcher": "2.1.0",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/proxy-agent": "^0.13.1",
-    "@vscode/spdlog": "^0.13.9",
     "@vscode/ripgrep": "^1.15.0",
     "@vscode/vscode-languagedetection": "1.0.21",
     "cookie": "^0.4.0",
@@ -20,6 +19,7 @@
     "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",

remote/yarn.lock

@@ -80,15 +80,6 @@
     https-proxy-agent "^5.0.0"
     proxy-from-env "^1.1.0"
 
-"@vscode/spdlog@^0.13.9":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.9.tgz#bac062762bc48ae9a6e86dd2d59c96b5ab63170c"
-  integrity sha512-c5Kmkhq+FyI0tCr569Q9aqIex2CgfRsa41PirK/9zpGRYRJlPyLo5U3Vp3THvfJYiDDLpQFeyRh/Sy5UJFW2gA==
-  dependencies:
-    bindings "^1.5.0"
-    mkdirp "^0.5.5"
-    nan "^2.17.0"
-
 "@vscode/[email protected]":
   version "1.0.21"
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
@@ -706,6 +697,15 @@ 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"

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)('@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'));
+	(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'));
 	});
 
 	test('@parcel/watcher', async () => {

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 '@vscode/spdlog';
+import * as spdlog from '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 @vscode/spdlog cannot be loaded
+	// Do not crash if spdlog cannot be loaded
 	try {
-		const _spdlog = await import('@vscode/spdlog');
+		const _spdlog = await import('spdlog');
 		_spdlog.setFlushOn(SpdLogLevel.Trace);
 		const logger = await _spdlog.createAsyncRotatingLogger(name, logfilePath, filesize, filecount);
 		if (donotUseFormatters) {

yarn.lock

@@ -1325,15 +1325,6 @@
     https-proxy-agent "^5.0.0"
     proxy-from-env "^1.1.0"
 
-"@vscode/spdlog@^0.13.9":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.13.9.tgz#bac062762bc48ae9a6e86dd2d59c96b5ab63170c"
-  integrity sha512-c5Kmkhq+FyI0tCr569Q9aqIex2CgfRsa41PirK/9zpGRYRJlPyLo5U3Vp3THvfJYiDDLpQFeyRh/Sy5UJFW2gA==
-  dependencies:
-    bindings "^1.5.0"
-    mkdirp "^0.5.5"
-    nan "^2.17.0"
-
 "@vscode/[email protected]":
   version "5.1.2-vscode"
   resolved "https://registry.yarnpkg.com/@vscode/sqlite3/-/sqlite3-5.1.2-vscode.tgz#ba15962d23ad784a43ecbaaa22c93f17f93b2400"
@@ -9379,6 +9370,15 @@ 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"