Build and eslint fixes

microsoft · Dec 28, 2021 · 96189e4 · 96189e4
1 parent ec9307f
commit 96189e4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -567,7 +567,9 @@
 					"vscode-oniguruma",
 					"iconv-lite-umd",
 					"tas-client-umd",
-					"jschardet"
+					"jschardet",
+					"dayjs",
+					"dayjs/plugin/*"
 				]
 			},
 			{
@@ -599,6 +601,8 @@
 					"vscode-oniguruma",
 					"iconv-lite-umd",
 					"jschardet",
+					"dayjs",
+					"dayjs/plugin/*",
 					"@vscode/vscode-languagedetection",
 					"@microsoft/applicationinsights-web"
 				]
@@ -632,7 +636,9 @@
 					"vscode-textmate",
 					"vscode-oniguruma",
 					"iconv-lite-umd",
-					"jschardet"
+					"jschardet",
+					"dayjs",
+					"dayjs/plugin/*"
 				]
 			},
 			{
@@ -752,7 +758,9 @@
 					"vscode-textmate",
 					"vscode-oniguruma",
 					"iconv-lite-umd",
-					"jschardet"
+					"jschardet",
+					"dayjs",
+					"dayjs/plugin/*"
 				]
 			},
 			{
@@ -787,7 +795,9 @@
 					"vscode-textmate",
 					"vscode-oniguruma",
 					"iconv-lite-umd",
-					"jschardet"
+					"jschardet",
+					"dayjs",
+					"dayjs/plugin/*"
 				]
 			},
 			{

diff --git a/remote/package.json b/remote/package.json
@@ -8,6 +8,7 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "applicationinsights": "1.4.2",
     "cookie": "^0.4.0",
+	"dayjs": "^1.10.7",
     "graceful-fs": "4.2.8",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",

diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
@@ -142,7 +142,11 @@
 			'iconv-lite-umd': `${baseNodeModulesPath}/iconv-lite-umd/lib/iconv-lite-umd.js`,
 			'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
 			'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
-			'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
+			'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`,
+			'dayjs': `${baseNodeModulesPath}/dayjs/dayjs.min.js`,
+			'dayjs/plugin/relativeTime': `${baseNodeModulesPath}/dayjs/plugin/relativeTime.js`,
+			'dayjs/plugin/updateLocale': `${baseNodeModulesPath}/dayjs/plugin/updateLocale.js`,
+			'dayjs/plugin/localizedFormat': `${baseNodeModulesPath}/dayjs/plugin/localizedFormat.js`
 		};
 
 		// Allow to load built-in and other node.js modules via AMD

diff --git a/src/vs/workbench/contrib/comments/browser/timestamp.ts b/src/vs/workbench/contrib/comments/browser/timestamp.ts
@@ -9,7 +9,7 @@ import { Timestamp } from 'vs/editor/common/modes';
 import * as dayjs from 'dayjs';
 import * as relativeTime from 'dayjs/plugin/relativeTime';
 import * as updateLocale from 'dayjs/plugin/updateLocale';
-import * as localizedFormat from 'dayjs/plugin/localizedFormat'
+import * as localizedFormat from 'dayjs/plugin/localizedFormat';
 
 dayjs.extend(relativeTime, {
 	thresholds: [