@@ -3083,23 +3083,23 @@ index afdd6bf398..1633daf93d 100644
3083
3083
return storagePath;
3084
3084
3085
3085
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
3086
- index 10a21537a4..5dcbba0913 100644
3086
+ index 4781f22676..86c9246f51 100644
3087
3087
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
3088
3088
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
3089
- @@ -8 ,6 +8 ,9 @@ import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHost
3090
- import { AbstractExtHostExtensionService } from 'vs/workbench/api/ common/extHostExtensionService ';
3089
+ @@ -9 ,6 +9 ,9 @@ import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHost
3090
+ import { endsWith } from 'vs/base/ common/strings ';
3091
3091
import { URI } from 'vs/base/common/uri';
3092
3092
import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
3093
3093
+ import { joinPath } from 'vs/base/common/resources';
3094
3094
+ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
3095
3095
+ import { loadCommonJSModule } from 'vs/server/browser/worker';
3096
-
3096
+
3097
3097
class WorkerRequireInterceptor extends RequireInterceptor {
3098
-
3099
- @@ -40 ,7 +43 ,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3098
+
3099
+ @@ -41 ,7 +44 ,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3100
3100
await this._fakeModules.install();
3101
3101
}
3102
-
3102
+
3103
3103
- protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
3104
3104
+ protected async _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
3105
3105
+ if (!URI.isUri(module) && module.extensionKind !== 'web') {
@@ -3109,10 +3109,10 @@ index 10a21537a4..5dcbba0913 100644
3109
3109
+ if (!URI.isUri(module)) {
3110
3110
+ module = joinPath(module.extensionLocation, module.main!);
3111
3111
+ }
3112
-
3112
+
3113
3113
module = module.with({ path: ensureSuffix(module.path, '.js') });
3114
3114
const response = await fetch(module.toString(true));
3115
- @@ -56 ,7 +66 ,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3115
+ @@ -57 ,7 +67 ,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
3116
3116
const _exports = {};
3117
3117
const _module = { exports: _exports };
3118
3118
const _require = (request: string) => {
0 commit comments