diff --git a/src/native/libs/Common/JavaScript/loader/assets.ts b/src/native/libs/Common/JavaScript/loader/assets.ts index a6869643d76951..5e82191316841f 100644 --- a/src/native/libs/Common/JavaScript/loader/assets.ts +++ b/src/native/libs/Common/JavaScript/loader/assets.ts @@ -641,7 +641,6 @@ export async function prefetchAllResources(extraVfs?: VfsAsset[]): Promise // Data assets: fetch and discard if (resources.coreAssembly) resources.coreAssembly.forEach(a => enqueueAsset(a, "assembly")); if (resources.assembly) resources.assembly.forEach(a => enqueueAsset(a, "assembly")); - if (resources.coreVfs) resources.coreVfs.forEach(a => enqueueAsset(a, "vfs")); if (resources.vfs) resources.vfs.forEach(a => enqueueAsset(a, "vfs")); if (extraVfs) extraVfs.forEach(a => enqueueAsset(a, "vfs")); if (resources.icu) resources.icu.forEach(a => enqueueAsset(a, "icu")); diff --git a/src/native/libs/Common/JavaScript/loader/config.ts b/src/native/libs/Common/JavaScript/loader/config.ts index 4570a0867d22b5..11c9c19e6115f9 100644 --- a/src/native/libs/Common/JavaScript/loader/config.ts +++ b/src/native/libs/Common/JavaScript/loader/config.ts @@ -73,7 +73,6 @@ function mergeResources(target: Assets, source: Assets): Assets { source.wasmNative = [...target.wasmNative!, ...source.wasmNative || []]; source.icu = [...target.icu!, ...source.icu || []]; source.vfs = [...target.vfs!, ...source.vfs || []]; - source.coreVfs = [...target.coreVfs!, ...source.coreVfs || []]; source.modulesAfterConfigLoaded = [...target.modulesAfterConfigLoaded!, ...source.modulesAfterConfigLoaded || []]; source.modulesAfterRuntimeReady = [...target.modulesAfterRuntimeReady!, ...source.modulesAfterRuntimeReady || []]; source.extensions = { ...target.extensions!, ...source.extensions || {} }; @@ -129,5 +128,4 @@ function normalizeResources(target: Assets) { if (!target.satelliteResources) target.satelliteResources = {}; if (!target.extensions) target.extensions = {}; if (!target.vfs) target.vfs = []; - if (!target.coreVfs) target.coreVfs = []; } diff --git a/src/native/libs/Common/JavaScript/loader/dotnet.d.ts b/src/native/libs/Common/JavaScript/loader/dotnet.d.ts index edec8bb8668075..9a35505c45e638 100644 --- a/src/native/libs/Common/JavaScript/loader/dotnet.d.ts +++ b/src/native/libs/Common/JavaScript/loader/dotnet.d.ts @@ -257,7 +257,6 @@ interface Assets { modulesAfterConfigLoaded?: JsAsset[]; modulesAfterRuntimeReady?: JsAsset[]; extensions?: ResourceExtensions; - coreVfs?: VfsAsset[]; vfs?: VfsAsset[]; } type Asset = { diff --git a/src/native/libs/Common/JavaScript/loader/run.ts b/src/native/libs/Common/JavaScript/loader/run.ts index e26a374a7cade6..6604334d3ce51e 100644 --- a/src/native/libs/Common/JavaScript/loader/run.ts +++ b/src/native/libs/Common/JavaScript/loader/run.ts @@ -118,7 +118,6 @@ export async function createRuntime(downloadOnly: boolean, httpCacheOnly: boolea const wasmNativePromise: Promise = fetchMainWasm(resources.wasmNative[0]); const coreAssembliesPromise = forEachResource(resources.coreAssembly, fetchAssembly); - const coreVfsPromise = forEachResource(resources.coreVfs, fetchVfs); const icuResourceName = getIcuResourceName(); const icuDataPromise = forEachResource(resources.icu, fetchIcu, asset => asset.name === icuResourceName); @@ -158,7 +157,6 @@ export async function createRuntime(downloadOnly: boolean, httpCacheOnly: boolea await nativeModulePromiseController.promise; runtimeState.nativeReady = true; await coreAssembliesPromise; - await coreVfsPromise; await vfsPromise; await icuDataPromise; await wasmNativePromise; // this is just to propagate errors diff --git a/src/native/libs/Common/JavaScript/types/public-api.ts b/src/native/libs/Common/JavaScript/types/public-api.ts index f3f0a520a978e9..f6372e9ddba5b9 100644 --- a/src/native/libs/Common/JavaScript/types/public-api.ts +++ b/src/native/libs/Common/JavaScript/types/public-api.ts @@ -221,7 +221,6 @@ export interface Assets { modulesAfterConfigLoaded?: JsAsset[]; modulesAfterRuntimeReady?: JsAsset[]; extensions?: ResourceExtensions; - coreVfs?: VfsAsset[]; vfs?: VfsAsset[]; } export type Asset = { diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs index b5c351b178d09f..ced85170fb655a 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs @@ -270,6 +270,7 @@ public class ResourcesData [DataMember(EmitDefaultValue = false)] public Dictionary runtimeAssets { get; set; } + // this field this only for Mono [DataMember(EmitDefaultValue = false)] public Dictionary coreVfs { get; set; }