detect ESM from root package.json

microsoft · Oct 3, 2024 · 0ce2f84 · 0ce2f84
1 parent 4a353c7
commit 0ce2f84
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "scripts": {
     "install-extensions": "npm i --prefix=fs-provider && npm i --prefix=sample",
     "compile": "tsc -b ./ && npm run compile-fs-provider",
@@ -51,7 +51,7 @@
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.14.9",
     "@types/tar-fs": "^2.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "@typescript-eslint/eslint-plugin": "^8.8.0",
     "@typescript-eslint/parser": "^8.7.0",
     "eslint": "^9.11.1",
     "@tony.ganchev/eslint-plugin-header": "^3.1.2",

diff --git a/src/server/workbench.ts b/src/server/workbench.ts
@@ -225,6 +225,12 @@ async function isESM(vsCodeDevLocation: string): Promise<boolean> {
 	try {
 		const packageJSON = await fs.readFile(path.join(vsCodeDevLocation, 'out', 'package.json'));
 		return JSON.parse(packageJSON.toString()).type === 'module';
+	} catch (e) {
+		// ignore
+	}
+	try {
+		const packageJSON = await fs.readFile(path.join(vsCodeDevLocation, 'package.json'));
+		return JSON.parse(packageJSON.toString()).type === 'module';
 	} catch (e) {
 		return false;
 	}