update css

Author: aeschli

extensions/css-language-features/esbuild.browser.mts

@@ -24,6 +24,7 @@ await Promise.all([
 	// Build server
 	run({
 		platform: 'browser',
+		format: 'esm',
 		entryPoints: {
 			'cssServerMain': path.join(extensionRoot, 'server', 'src', 'browser', 'cssServerWorkerMain.ts'),
 		},

extensions/css-language-features/esbuild.mts

@@ -24,13 +24,20 @@ await Promise.all([
 	// Build server
 	run({
 		platform: 'node',
+		format: 'esm',
 		entryPoints: {
 			'cssServerMain': path.join(extensionRoot, 'server', 'src', 'node', 'cssServerNodeMain.ts'),
 		},
 		srcDir: path.join(extensionRoot, 'server', 'src'),
 		outdir: path.join(extensionRoot, 'server', 'dist', 'node'),
 		additionalOptions: {
 			tsconfig: path.join(extensionRoot, 'server', 'tsconfig.json'),
+			external: ['vscode', 'typescript', 'fs'],
+			banner: {
+				// `@vscode/l10n` is bundled as CommonJS and still calls `require('fs')` internally.
+				// Provide Node's `require` in the generated ESM output so those imports keep working.
+				js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url);`,
+			},
 		},
 	}, process.argv),
 ]);

extensions/css-language-features/server/package-lock.json

@@ -11,7 +11,7 @@
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.10",
+    "vscode-css-languageservice": "^7.0.0-next.1",
     "vscode-languageserver": "^10.0.0-next.16",
     "vscode-uri": "^3.1.0"
   },
@@ -22,7 +22,7 @@
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-server",
     "watch": "gulp watch-extension:css-language-features-server",
-    "install-service-next": "npm install vscode-css-languageservice",
+    "install-service-next": "npm install vscode-css-languageservice@next",
     "install-service-local": "npm link vscode-css-languageservice",
     "install-server-next": "npm install vscode-languageserver@next",
     "install-server-local": "npm install vscode-languageserver",

extensions/css-language-features/server/package.json

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createConnection, BrowserMessageReader, BrowserMessageWriter, Disposable } from 'vscode-languageserver/browser';
-import { RuntimeEnvironment, startServer } from '../cssServer';
+import { RuntimeEnvironment, startServer } from '../cssServer.js';
 
 const messageReader = new BrowserMessageReader(self);
 const messageWriter = new BrowserMessageWriter(self);

extensions/css-language-features/server/src/browser/cssServerMain.ts

@@ -8,12 +8,12 @@ import {
 } from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
 import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, TextDocument, Position, CodeActionKind } from 'vscode-css-languageservice';
-import { getLanguageModelCache } from './languageModelCache';
-import { runSafeAsync } from './utils/runner';
-import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
-import { getDocumentContext } from './utils/documentContext';
-import { fetchDataProviders } from './customData';
-import { RequestService, getRequestService } from './requests';
+import { getLanguageModelCache } from './languageModelCache.js';
+import { runSafeAsync } from './utils/runner.js';
+import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation.js';
+import { getDocumentContext } from './utils/documentContext.js';
+import { fetchDataProviders } from './customData.js';
+import { RequestService, getRequestService } from './requests.js';
 
 namespace CustomDataChangedNotification {
 	export const type: NotificationType<string[]> = new NotificationType('css/customDataChanged');

extensions/css-language-features/server/src/cssServer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ICSSDataProvider, newCSSDataProvider } from 'vscode-css-languageservice';
-import { RequestService } from './requests';
+import { RequestService } from './requests.js';
 
 export function fetchDataProviders(dataPaths: string[], requestService: RequestService): Promise<ICSSDataProvider[]> {
 	const providers = dataPaths.map(async p => {

extensions/css-language-features/server/src/customData.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createConnection, Connection, Disposable } from 'vscode-languageserver/node';
-import { formatError } from '../utils/runner';
-import { RuntimeEnvironment, startServer } from '../cssServer';
-import { getNodeFSRequestService } from './nodeFs';
+import { formatError } from '../utils/runner.js';
+import { RuntimeEnvironment, startServer } from '../cssServer.js';
+import { getNodeFSRequestService } from './nodeFs.js';
 
 // Create a connection for the server.
 const connection: Connection = createConnection();

extensions/css-language-features/server/src/node/cssServerMain.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RequestService } from '../requests';
+import { RequestService } from '../requests.js';
 import { URI as Uri } from 'vscode-uri';
 
 import * as fs from 'fs';

extensions/css-language-features/server/src/node/nodeFs.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RequestType, Connection } from 'vscode-languageserver';
-import { RuntimeEnvironment } from './cssServer';
+import { RuntimeEnvironment } from './cssServer.js';
 
 export namespace FsContentRequest {
 	export const type: RequestType<{ uri: string; encoding?: string }, string, any> = new RequestType('fs/content');