@qiankunjs/shared 0.0.1-rc.0 → 0.0.1-rc.1

package/dist/cjs/module-resolver/index.d.ts

@@ -1,7 +1,7 @@
 import type { MatchResult } from './types';
 declare global {
     interface HTMLElement {
-        __cached_deps__?: string[];
+        __matched_deps__?: string[];
     }
 }
 export type { MatchResult } from './types';

package/dist/cjs/module-resolver/index.js

@@ -24,10 +24,10 @@ function moduleResolver(url, microAppContainer, mainAppContainer) {
       if (mainAppDependencyMapString) {
         var _microAppContainer$__;
         var mainAppDependencyMap = JSON.parse(mainAppDependencyMapString);
-        var cachedDeps = (_microAppContainer$__ = microAppContainer.__cached_deps__) !== null && _microAppContainer$__ !== void 0 ? _microAppContainer$__ : microAppContainer.__cached_deps__ = [];
-        var matchedDep = findDependency(microAppDependency, normalizeDependencies(mainAppDependencyMap.dependencies), cachedDeps);
+        var matchedDeps = (_microAppContainer$__ = microAppContainer.__matched_deps__) !== null && _microAppContainer$__ !== void 0 ? _microAppContainer$__ : microAppContainer.__matched_deps__ = [];
+        var matchedDep = findDependency(microAppDependency, normalizeDependencies(mainAppDependencyMap.dependencies), matchedDeps);
         if (matchedDep) {
-          cachedDeps.push(matchedDep.name);
+          matchedDeps.push(matchedDep.name);
           return matchedDep;
         }
       }
@@ -35,13 +35,13 @@ function moduleResolver(url, microAppContainer, mainAppContainer) {
   }
   return undefined;
 }
-function findDependency(dependency, mainAppDependencies, cachedDependencies) {
-  var matched = mainAppDependencies.find(function (cachedDependency) {
-    var _dependency$peerDeps;
-    return cachedDependency.name === dependency.name && (0, _satisfies.default)(cachedDependency.version, dependency.range) && ( // peer dependencies must be cached before
-    (_dependency$peerDeps = dependency.peerDeps) === null || _dependency$peerDeps === void 0 ? void 0 : _dependency$peerDeps.every(function (peerDep) {
-      return cachedDependencies.indexOf(peerDep) !== -1;
-    }));
+function findDependency(dependency, mainAppDependencies, matchedDependencies) {
+  var matched = mainAppDependencies.find(function (mainAppDependency) {
+    return mainAppDependency.name === dependency.name && (0, _satisfies.default)(mainAppDependency.version, dependency.range) &&
+    // peer dependencies must be cached before
+    (dependency.peerDeps || []).every(function (peerDep) {
+      return matchedDependencies.indexOf(peerDep) !== -1;
+    });
   });
   if (matched) {
     return {

package/dist/cjs/module-resolver/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_satisfies","_interopRequireDefault","require","moduleResolver","url","microAppContainer","mainAppContainer","_microAppContainer$qu","dependencyMapSelector","microAppDependenciesString","querySelector","innerHTML","_ref","JSON","parse","dependencies","normalizedDependencies","normalizeDependencies","microAppDependency","find","v","_mainAppContainer$que","mainAppDependencyMapString","_microAppContainer$__","mainAppDependencyMap","cachedDeps","__cached_deps__","matchedDep","findDependency","push","name","undefined","dependency","mainAppDependencies","cachedDependencies","matched","cachedDependency","_dependency$peerDeps","satisfies","version","range","peerDeps","every","peerDep","indexOf","Object","keys","map","_objectSpread2","default"],"sources":["../../../src/module-resolver/index.ts"],"sourcesContent":["import satisfies from 'semver/functions/satisfies';\nimport type { MatchResult } from './types';\n\ndeclare global {\n  interface HTMLElement {\n    __cached_deps__?: string[];\n  }\n}\n\ntype Dependency = {\n  url: string;\n  version: string;\n  range: string;\n  peerDeps?: string[];\n};\n\ntype NormalizedDependency = {\n  name: string;\n} & Dependency;\n\ntype DependencyMap = {\n  dependencies: Record<string, Dependency>;\n};\n\nexport type { MatchResult } from './types';\n\nexport function moduleResolver(\n  url: string,\n  microAppContainer: HTMLElement,\n  mainAppContainer: HTMLElement,\n): MatchResult | undefined {\n  const dependencyMapSelector = 'script[type=dependencymap]';\n\n  const microAppDependenciesString = microAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n  if (microAppDependenciesString) {\n    const { dependencies } = JSON.parse(microAppDependenciesString) as DependencyMap;\n    const normalizedDependencies = normalizeDependencies(dependencies);\n    const microAppDependency = normalizedDependencies.find((v) => v.url === url);\n\n    if (microAppDependency) {\n      const mainAppDependencyMapString = mainAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n\n      if (mainAppDependencyMapString) {\n        const mainAppDependencyMap = JSON.parse(mainAppDependencyMapString) as DependencyMap;\n        const cachedDeps = (microAppContainer.__cached_deps__ ??= []);\n        const matchedDep = findDependency(\n          microAppDependency,\n          normalizeDependencies(mainAppDependencyMap.dependencies),\n          cachedDeps,\n        );\n\n        if (matchedDep) {\n          cachedDeps.push(matchedDep.name);\n          return matchedDep;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n\nfunction findDependency(\n  dependency: NormalizedDependency,\n  mainAppDependencies: NormalizedDependency[],\n  cachedDependencies: string[],\n): MatchResult | undefined {\n  const matched = mainAppDependencies.find(\n    (cachedDependency) =>\n      cachedDependency.name === dependency.name &&\n      satisfies(cachedDependency.version, dependency.range) &&\n      // peer dependencies must be cached before\n      dependency.peerDeps?.every((peerDep) => cachedDependencies.indexOf(peerDep) !== -1),\n  );\n\n  if (matched) {\n    return {\n      name: matched.name,\n      version: matched.version,\n      url: matched.url,\n    };\n  }\n\n  return undefined;\n}\n\nfunction normalizeDependencies(dependencies: DependencyMap['dependencies']): NormalizedDependency[] {\n  return Object.keys(dependencies).map((name) => ({\n    name,\n    ...dependencies[name],\n  }));\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AA0BO,SAASC,cAAcA,CAC5BC,GAAW,EACXC,iBAA8B,EAC9BC,gBAA6B,EACJ;EAAA,IAAAC,qBAAA;EACzB,IAAMC,qBAAqB,GAAG,4BAA4B;EAE1D,IAAMC,0BAA0B,IAAAF,qBAAA,GAAGF,iBAAiB,CAACK,aAAa,CAACF,qBAAqB,CAAC,cAAAD,qBAAA,uBAAtDA,qBAAA,CAAwDI,SAAS;EACpG,IAAIF,0BAA0B,EAAE;IAC9B,IAAAG,IAAA,GAAyBC,IAAI,CAACC,KAAK,CAACL,0BAA0B,CAAC;MAAvDM,YAAY,GAAAH,IAAA,CAAZG,YAAY;IACpB,IAAMC,sBAAsB,GAAGC,qBAAqB,CAACF,YAAY,CAAC;IAClE,IAAMG,kBAAkB,GAAGF,sBAAsB,CAACG,IAAI,CAAC,UAACC,CAAC;MAAA,OAAKA,CAAC,CAAChB,GAAG,KAAKA,GAAG;IAAA,EAAC;IAE5E,IAAIc,kBAAkB,EAAE;MAAA,IAAAG,qBAAA;MACtB,IAAMC,0BAA0B,IAAAD,qBAAA,GAAGf,gBAAgB,CAACI,aAAa,CAACF,qBAAqB,CAAC,cAAAa,qBAAA,uBAArDA,qBAAA,CAAuDV,SAAS;MAEnG,IAAIW,0BAA0B,EAAE;QAAA,IAAAC,qBAAA;QAC9B,IAAMC,oBAAoB,GAAGX,IAAI,CAACC,KAAK,CAACQ,0BAA0B,CAAkB;QACpF,IAAMG,UAAU,IAAAF,qBAAA,GAAIlB,iBAAiB,CAACqB,eAAe,cAAAH,qBAAA,cAAAA,qBAAA,GAAjClB,iBAAiB,CAACqB,eAAe,GAAK,EAAG;QAC7D,IAAMC,UAAU,GAAGC,cAAc,CAC/BV,kBAAkB,EAClBD,qBAAqB,CAACO,oBAAoB,CAACT,YAAY,CAAC,EACxDU,UACF,CAAC;QAED,IAAIE,UAAU,EAAE;UACdF,UAAU,CAACI,IAAI,CAACF,UAAU,CAACG,IAAI,CAAC;UAChC,OAAOH,UAAU;QACnB;MACF;IACF;EACF;EAEA,OAAOI,SAAS;AAClB;AAEA,SAASH,cAAcA,CACrBI,UAAgC,EAChCC,mBAA2C,EAC3CC,kBAA4B,EACH;EACzB,IAAMC,OAAO,GAAGF,mBAAmB,CAACd,IAAI,CACtC,UAACiB,gBAAgB;IAAA,IAAAC,oBAAA;IAAA,OACfD,gBAAgB,CAACN,IAAI,KAAKE,UAAU,CAACF,IAAI,IACzC,IAAAQ,kBAAS,EAACF,gBAAgB,CAACG,OAAO,EAAEP,UAAU,CAACQ,KAAK,CAAC,MACrD;IAAA,CAAAH,oBAAA,GACAL,UAAU,CAACS,QAAQ,cAAAJ,oBAAA,uBAAnBA,oBAAA,CAAqBK,KAAK,CAAC,UAACC,OAAO;MAAA,OAAKT,kBAAkB,CAACU,OAAO,CAACD,OAAO,CAAC,KAAK,CAAC,CAAC;IAAA,EAAC;EAAA,CACvF,CAAC;EAED,IAAIR,OAAO,EAAE;IACX,OAAO;MACLL,IAAI,EAAEK,OAAO,CAACL,IAAI;MAClBS,OAAO,EAAEJ,OAAO,CAACI,OAAO;MACxBnC,GAAG,EAAE+B,OAAO,CAAC/B;IACf,CAAC;EACH;EAEA,OAAO2B,SAAS;AAClB;AAEA,SAASd,qBAAqBA,CAACF,YAA2C,EAA0B;EAClG,OAAO8B,MAAM,CAACC,IAAI,CAAC/B,YAAY,CAAC,CAACgC,GAAG,CAAC,UAACjB,IAAI;IAAA,WAAAkB,cAAA,CAAAC,OAAA;MACxCnB,IAAI,EAAJA;IAAI,GACDf,YAAY,CAACe,IAAI,CAAC;EAAA,CACrB,CAAC;AACL"}
+{"version":3,"names":["_satisfies","_interopRequireDefault","require","moduleResolver","url","microAppContainer","mainAppContainer","_microAppContainer$qu","dependencyMapSelector","microAppDependenciesString","querySelector","innerHTML","_ref","JSON","parse","dependencies","normalizedDependencies","normalizeDependencies","microAppDependency","find","v","_mainAppContainer$que","mainAppDependencyMapString","_microAppContainer$__","mainAppDependencyMap","matchedDeps","__matched_deps__","matchedDep","findDependency","push","name","undefined","dependency","mainAppDependencies","matchedDependencies","matched","mainAppDependency","satisfies","version","range","peerDeps","every","peerDep","indexOf","Object","keys","map","_objectSpread2","default"],"sources":["../../../src/module-resolver/index.ts"],"sourcesContent":["import satisfies from 'semver/functions/satisfies';\nimport type { MatchResult } from './types';\n\ndeclare global {\n  interface HTMLElement {\n    __matched_deps__?: string[];\n  }\n}\n\ntype Dependency = {\n  url: string;\n  version: string;\n  range: string;\n  peerDeps?: string[];\n};\n\ntype NormalizedDependency = {\n  name: string;\n} & Dependency;\n\ntype DependencyMap = {\n  dependencies: Record<string, Dependency>;\n};\n\nexport type { MatchResult } from './types';\n\nexport function moduleResolver(\n  url: string,\n  microAppContainer: HTMLElement,\n  mainAppContainer: HTMLElement,\n): MatchResult | undefined {\n  const dependencyMapSelector = 'script[type=dependencymap]';\n\n  const microAppDependenciesString = microAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n  if (microAppDependenciesString) {\n    const { dependencies } = JSON.parse(microAppDependenciesString) as DependencyMap;\n    const normalizedDependencies = normalizeDependencies(dependencies);\n    const microAppDependency = normalizedDependencies.find((v) => v.url === url);\n\n    if (microAppDependency) {\n      const mainAppDependencyMapString = mainAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n\n      if (mainAppDependencyMapString) {\n        const mainAppDependencyMap = JSON.parse(mainAppDependencyMapString) as DependencyMap;\n        const matchedDeps = (microAppContainer.__matched_deps__ ??= []);\n        const matchedDep = findDependency(\n          microAppDependency,\n          normalizeDependencies(mainAppDependencyMap.dependencies),\n          matchedDeps,\n        );\n\n        if (matchedDep) {\n          matchedDeps.push(matchedDep.name);\n          return matchedDep;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n\nfunction findDependency(\n  dependency: NormalizedDependency,\n  mainAppDependencies: NormalizedDependency[],\n  matchedDependencies: string[],\n): MatchResult | undefined {\n  const matched = mainAppDependencies.find(\n    (mainAppDependency) =>\n      mainAppDependency.name === dependency.name &&\n      satisfies(mainAppDependency.version, dependency.range) &&\n      // peer dependencies must be cached before\n      (dependency.peerDeps || []).every((peerDep) => matchedDependencies.indexOf(peerDep) !== -1),\n  );\n\n  if (matched) {\n    return {\n      name: matched.name,\n      version: matched.version,\n      url: matched.url,\n    };\n  }\n\n  return undefined;\n}\n\nfunction normalizeDependencies(dependencies: DependencyMap['dependencies']): NormalizedDependency[] {\n  return Object.keys(dependencies).map((name) => ({\n    name,\n    ...dependencies[name],\n  }));\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AA0BO,SAASC,cAAcA,CAC5BC,GAAW,EACXC,iBAA8B,EAC9BC,gBAA6B,EACJ;EAAA,IAAAC,qBAAA;EACzB,IAAMC,qBAAqB,GAAG,4BAA4B;EAE1D,IAAMC,0BAA0B,IAAAF,qBAAA,GAAGF,iBAAiB,CAACK,aAAa,CAACF,qBAAqB,CAAC,cAAAD,qBAAA,uBAAtDA,qBAAA,CAAwDI,SAAS;EACpG,IAAIF,0BAA0B,EAAE;IAC9B,IAAAG,IAAA,GAAyBC,IAAI,CAACC,KAAK,CAACL,0BAA0B,CAAC;MAAvDM,YAAY,GAAAH,IAAA,CAAZG,YAAY;IACpB,IAAMC,sBAAsB,GAAGC,qBAAqB,CAACF,YAAY,CAAC;IAClE,IAAMG,kBAAkB,GAAGF,sBAAsB,CAACG,IAAI,CAAC,UAACC,CAAC;MAAA,OAAKA,CAAC,CAAChB,GAAG,KAAKA,GAAG;IAAA,EAAC;IAE5E,IAAIc,kBAAkB,EAAE;MAAA,IAAAG,qBAAA;MACtB,IAAMC,0BAA0B,IAAAD,qBAAA,GAAGf,gBAAgB,CAACI,aAAa,CAACF,qBAAqB,CAAC,cAAAa,qBAAA,uBAArDA,qBAAA,CAAuDV,SAAS;MAEnG,IAAIW,0BAA0B,EAAE;QAAA,IAAAC,qBAAA;QAC9B,IAAMC,oBAAoB,GAAGX,IAAI,CAACC,KAAK,CAACQ,0BAA0B,CAAkB;QACpF,IAAMG,WAAW,IAAAF,qBAAA,GAAIlB,iBAAiB,CAACqB,gBAAgB,cAAAH,qBAAA,cAAAA,qBAAA,GAAlClB,iBAAiB,CAACqB,gBAAgB,GAAK,EAAG;QAC/D,IAAMC,UAAU,GAAGC,cAAc,CAC/BV,kBAAkB,EAClBD,qBAAqB,CAACO,oBAAoB,CAACT,YAAY,CAAC,EACxDU,WACF,CAAC;QAED,IAAIE,UAAU,EAAE;UACdF,WAAW,CAACI,IAAI,CAACF,UAAU,CAACG,IAAI,CAAC;UACjC,OAAOH,UAAU;QACnB;MACF;IACF;EACF;EAEA,OAAOI,SAAS;AAClB;AAEA,SAASH,cAAcA,CACrBI,UAAgC,EAChCC,mBAA2C,EAC3CC,mBAA6B,EACJ;EACzB,IAAMC,OAAO,GAAGF,mBAAmB,CAACd,IAAI,CACtC,UAACiB,iBAAiB;IAAA,OAChBA,iBAAiB,CAACN,IAAI,KAAKE,UAAU,CAACF,IAAI,IAC1C,IAAAO,kBAAS,EAACD,iBAAiB,CAACE,OAAO,EAAEN,UAAU,CAACO,KAAK,CAAC;IACtD;IACA,CAACP,UAAU,CAACQ,QAAQ,IAAI,EAAE,EAAEC,KAAK,CAAC,UAACC,OAAO;MAAA,OAAKR,mBAAmB,CAACS,OAAO,CAACD,OAAO,CAAC,KAAK,CAAC,CAAC;IAAA,EAAC;EAAA,CAC/F,CAAC;EAED,IAAIP,OAAO,EAAE;IACX,OAAO;MACLL,IAAI,EAAEK,OAAO,CAACL,IAAI;MAClBQ,OAAO,EAAEH,OAAO,CAACG,OAAO;MACxBlC,GAAG,EAAE+B,OAAO,CAAC/B;IACf,CAAC;EACH;EAEA,OAAO2B,SAAS;AAClB;AAEA,SAASd,qBAAqBA,CAACF,YAA2C,EAA0B;EAClG,OAAO6B,MAAM,CAACC,IAAI,CAAC9B,YAAY,CAAC,CAAC+B,GAAG,CAAC,UAAChB,IAAI;IAAA,WAAAiB,cAAA,CAAAC,OAAA;MACxClB,IAAI,EAAJA;IAAI,GACDf,YAAY,CAACe,IAAI,CAAC;EAAA,CACrB,CAAC;AACL"}

package/dist/esm/module-resolver/index.d.ts

@@ -1,7 +1,7 @@
 import type { MatchResult } from './types';
 declare global {
     interface HTMLElement {
-        __cached_deps__?: string[];
+        __matched_deps__?: string[];
     }
 }
 export type { MatchResult } from './types';

package/dist/esm/module-resolver/index.js

@@ -17,10 +17,10 @@ export function moduleResolver(url, microAppContainer, mainAppContainer) {
       if (mainAppDependencyMapString) {
         var _microAppContainer$__;
         var mainAppDependencyMap = JSON.parse(mainAppDependencyMapString);
-        var cachedDeps = (_microAppContainer$__ = microAppContainer.__cached_deps__) !== null && _microAppContainer$__ !== void 0 ? _microAppContainer$__ : microAppContainer.__cached_deps__ = [];
-        var matchedDep = findDependency(microAppDependency, normalizeDependencies(mainAppDependencyMap.dependencies), cachedDeps);
+        var matchedDeps = (_microAppContainer$__ = microAppContainer.__matched_deps__) !== null && _microAppContainer$__ !== void 0 ? _microAppContainer$__ : microAppContainer.__matched_deps__ = [];
+        var matchedDep = findDependency(microAppDependency, normalizeDependencies(mainAppDependencyMap.dependencies), matchedDeps);
         if (matchedDep) {
-          cachedDeps.push(matchedDep.name);
+          matchedDeps.push(matchedDep.name);
           return matchedDep;
         }
       }
@@ -28,13 +28,13 @@ export function moduleResolver(url, microAppContainer, mainAppContainer) {
   }
   return undefined;
 }
-function findDependency(dependency, mainAppDependencies, cachedDependencies) {
-  var matched = mainAppDependencies.find(function (cachedDependency) {
-    var _dependency$peerDeps;
-    return cachedDependency.name === dependency.name && satisfies(cachedDependency.version, dependency.range) && ( // peer dependencies must be cached before
-    (_dependency$peerDeps = dependency.peerDeps) === null || _dependency$peerDeps === void 0 ? void 0 : _dependency$peerDeps.every(function (peerDep) {
-      return cachedDependencies.indexOf(peerDep) !== -1;
-    }));
+function findDependency(dependency, mainAppDependencies, matchedDependencies) {
+  var matched = mainAppDependencies.find(function (mainAppDependency) {
+    return mainAppDependency.name === dependency.name && satisfies(mainAppDependency.version, dependency.range) &&
+    // peer dependencies must be cached before
+    (dependency.peerDeps || []).every(function (peerDep) {
+      return matchedDependencies.indexOf(peerDep) !== -1;
+    });
   });
   if (matched) {
     return {

package/dist/esm/module-resolver/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["satisfies","moduleResolver","url","microAppContainer","mainAppContainer","_microAppContainer$qu","dependencyMapSelector","microAppDependenciesString","querySelector","innerHTML","_ref","JSON","parse","dependencies","normalizedDependencies","normalizeDependencies","microAppDependency","find","v","_mainAppContainer$que","mainAppDependencyMapString","_microAppContainer$__","mainAppDependencyMap","cachedDeps","__cached_deps__","matchedDep","findDependency","push","name","undefined","dependency","mainAppDependencies","cachedDependencies","matched","cachedDependency","_dependency$peerDeps","version","range","peerDeps","every","peerDep","indexOf","Object","keys","map","_objectSpread"],"sources":["../../../src/module-resolver/index.ts"],"sourcesContent":["import satisfies from 'semver/functions/satisfies';\nimport type { MatchResult } from './types';\n\ndeclare global {\n  interface HTMLElement {\n    __cached_deps__?: string[];\n  }\n}\n\ntype Dependency = {\n  url: string;\n  version: string;\n  range: string;\n  peerDeps?: string[];\n};\n\ntype NormalizedDependency = {\n  name: string;\n} & Dependency;\n\ntype DependencyMap = {\n  dependencies: Record<string, Dependency>;\n};\n\nexport type { MatchResult } from './types';\n\nexport function moduleResolver(\n  url: string,\n  microAppContainer: HTMLElement,\n  mainAppContainer: HTMLElement,\n): MatchResult | undefined {\n  const dependencyMapSelector = 'script[type=dependencymap]';\n\n  const microAppDependenciesString = microAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n  if (microAppDependenciesString) {\n    const { dependencies } = JSON.parse(microAppDependenciesString) as DependencyMap;\n    const normalizedDependencies = normalizeDependencies(dependencies);\n    const microAppDependency = normalizedDependencies.find((v) => v.url === url);\n\n    if (microAppDependency) {\n      const mainAppDependencyMapString = mainAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n\n      if (mainAppDependencyMapString) {\n        const mainAppDependencyMap = JSON.parse(mainAppDependencyMapString) as DependencyMap;\n        const cachedDeps = (microAppContainer.__cached_deps__ ??= []);\n        const matchedDep = findDependency(\n          microAppDependency,\n          normalizeDependencies(mainAppDependencyMap.dependencies),\n          cachedDeps,\n        );\n\n        if (matchedDep) {\n          cachedDeps.push(matchedDep.name);\n          return matchedDep;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n\nfunction findDependency(\n  dependency: NormalizedDependency,\n  mainAppDependencies: NormalizedDependency[],\n  cachedDependencies: string[],\n): MatchResult | undefined {\n  const matched = mainAppDependencies.find(\n    (cachedDependency) =>\n      cachedDependency.name === dependency.name &&\n      satisfies(cachedDependency.version, dependency.range) &&\n      // peer dependencies must be cached before\n      dependency.peerDeps?.every((peerDep) => cachedDependencies.indexOf(peerDep) !== -1),\n  );\n\n  if (matched) {\n    return {\n      name: matched.name,\n      version: matched.version,\n      url: matched.url,\n    };\n  }\n\n  return undefined;\n}\n\nfunction normalizeDependencies(dependencies: DependencyMap['dependencies']): NormalizedDependency[] {\n  return Object.keys(dependencies).map((name) => ({\n    name,\n    ...dependencies[name],\n  }));\n}\n"],"mappings":";AAAA,OAAOA,SAAS,MAAM,4BAA4B;AA0BlD,OAAO,SAASC,cAAcA,CAC5BC,GAAW,EACXC,iBAA8B,EAC9BC,gBAA6B,EACJ;EAAA,IAAAC,qBAAA;EACzB,IAAMC,qBAAqB,GAAG,4BAA4B;EAE1D,IAAMC,0BAA0B,IAAAF,qBAAA,GAAGF,iBAAiB,CAACK,aAAa,CAACF,qBAAqB,CAAC,cAAAD,qBAAA,uBAAtDA,qBAAA,CAAwDI,SAAS;EACpG,IAAIF,0BAA0B,EAAE;IAC9B,IAAAG,IAAA,GAAyBC,IAAI,CAACC,KAAK,CAACL,0BAA0B,CAAC;MAAvDM,YAAY,GAAAH,IAAA,CAAZG,YAAY;IACpB,IAAMC,sBAAsB,GAAGC,qBAAqB,CAACF,YAAY,CAAC;IAClE,IAAMG,kBAAkB,GAAGF,sBAAsB,CAACG,IAAI,CAAC,UAACC,CAAC;MAAA,OAAKA,CAAC,CAAChB,GAAG,KAAKA,GAAG;IAAA,EAAC;IAE5E,IAAIc,kBAAkB,EAAE;MAAA,IAAAG,qBAAA;MACtB,IAAMC,0BAA0B,IAAAD,qBAAA,GAAGf,gBAAgB,CAACI,aAAa,CAACF,qBAAqB,CAAC,cAAAa,qBAAA,uBAArDA,qBAAA,CAAuDV,SAAS;MAEnG,IAAIW,0BAA0B,EAAE;QAAA,IAAAC,qBAAA;QAC9B,IAAMC,oBAAoB,GAAGX,IAAI,CAACC,KAAK,CAACQ,0BAA0B,CAAkB;QACpF,IAAMG,UAAU,IAAAF,qBAAA,GAAIlB,iBAAiB,CAACqB,eAAe,cAAAH,qBAAA,cAAAA,qBAAA,GAAjClB,iBAAiB,CAACqB,eAAe,GAAK,EAAG;QAC7D,IAAMC,UAAU,GAAGC,cAAc,CAC/BV,kBAAkB,EAClBD,qBAAqB,CAACO,oBAAoB,CAACT,YAAY,CAAC,EACxDU,UACF,CAAC;QAED,IAAIE,UAAU,EAAE;UACdF,UAAU,CAACI,IAAI,CAACF,UAAU,CAACG,IAAI,CAAC;UAChC,OAAOH,UAAU;QACnB;MACF;IACF;EACF;EAEA,OAAOI,SAAS;AAClB;AAEA,SAASH,cAAcA,CACrBI,UAAgC,EAChCC,mBAA2C,EAC3CC,kBAA4B,EACH;EACzB,IAAMC,OAAO,GAAGF,mBAAmB,CAACd,IAAI,CACtC,UAACiB,gBAAgB;IAAA,IAAAC,oBAAA;IAAA,OACfD,gBAAgB,CAACN,IAAI,KAAKE,UAAU,CAACF,IAAI,IACzC5B,SAAS,CAACkC,gBAAgB,CAACE,OAAO,EAAEN,UAAU,CAACO,KAAK,CAAC,MACrD;IAAA,CAAAF,oBAAA,GACAL,UAAU,CAACQ,QAAQ,cAAAH,oBAAA,uBAAnBA,oBAAA,CAAqBI,KAAK,CAAC,UAACC,OAAO;MAAA,OAAKR,kBAAkB,CAACS,OAAO,CAACD,OAAO,CAAC,KAAK,CAAC,CAAC;IAAA,EAAC;EAAA,CACvF,CAAC;EAED,IAAIP,OAAO,EAAE;IACX,OAAO;MACLL,IAAI,EAAEK,OAAO,CAACL,IAAI;MAClBQ,OAAO,EAAEH,OAAO,CAACG,OAAO;MACxBlC,GAAG,EAAE+B,OAAO,CAAC/B;IACf,CAAC;EACH;EAEA,OAAO2B,SAAS;AAClB;AAEA,SAASd,qBAAqBA,CAACF,YAA2C,EAA0B;EAClG,OAAO6B,MAAM,CAACC,IAAI,CAAC9B,YAAY,CAAC,CAAC+B,GAAG,CAAC,UAAChB,IAAI;IAAA,OAAAiB,aAAA;MACxCjB,IAAI,EAAJA;IAAI,GACDf,YAAY,CAACe,IAAI,CAAC;EAAA,CACrB,CAAC;AACL"}
+{"version":3,"names":["satisfies","moduleResolver","url","microAppContainer","mainAppContainer","_microAppContainer$qu","dependencyMapSelector","microAppDependenciesString","querySelector","innerHTML","_ref","JSON","parse","dependencies","normalizedDependencies","normalizeDependencies","microAppDependency","find","v","_mainAppContainer$que","mainAppDependencyMapString","_microAppContainer$__","mainAppDependencyMap","matchedDeps","__matched_deps__","matchedDep","findDependency","push","name","undefined","dependency","mainAppDependencies","matchedDependencies","matched","mainAppDependency","version","range","peerDeps","every","peerDep","indexOf","Object","keys","map","_objectSpread"],"sources":["../../../src/module-resolver/index.ts"],"sourcesContent":["import satisfies from 'semver/functions/satisfies';\nimport type { MatchResult } from './types';\n\ndeclare global {\n  interface HTMLElement {\n    __matched_deps__?: string[];\n  }\n}\n\ntype Dependency = {\n  url: string;\n  version: string;\n  range: string;\n  peerDeps?: string[];\n};\n\ntype NormalizedDependency = {\n  name: string;\n} & Dependency;\n\ntype DependencyMap = {\n  dependencies: Record<string, Dependency>;\n};\n\nexport type { MatchResult } from './types';\n\nexport function moduleResolver(\n  url: string,\n  microAppContainer: HTMLElement,\n  mainAppContainer: HTMLElement,\n): MatchResult | undefined {\n  const dependencyMapSelector = 'script[type=dependencymap]';\n\n  const microAppDependenciesString = microAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n  if (microAppDependenciesString) {\n    const { dependencies } = JSON.parse(microAppDependenciesString) as DependencyMap;\n    const normalizedDependencies = normalizeDependencies(dependencies);\n    const microAppDependency = normalizedDependencies.find((v) => v.url === url);\n\n    if (microAppDependency) {\n      const mainAppDependencyMapString = mainAppContainer.querySelector(dependencyMapSelector)?.innerHTML;\n\n      if (mainAppDependencyMapString) {\n        const mainAppDependencyMap = JSON.parse(mainAppDependencyMapString) as DependencyMap;\n        const matchedDeps = (microAppContainer.__matched_deps__ ??= []);\n        const matchedDep = findDependency(\n          microAppDependency,\n          normalizeDependencies(mainAppDependencyMap.dependencies),\n          matchedDeps,\n        );\n\n        if (matchedDep) {\n          matchedDeps.push(matchedDep.name);\n          return matchedDep;\n        }\n      }\n    }\n  }\n\n  return undefined;\n}\n\nfunction findDependency(\n  dependency: NormalizedDependency,\n  mainAppDependencies: NormalizedDependency[],\n  matchedDependencies: string[],\n): MatchResult | undefined {\n  const matched = mainAppDependencies.find(\n    (mainAppDependency) =>\n      mainAppDependency.name === dependency.name &&\n      satisfies(mainAppDependency.version, dependency.range) &&\n      // peer dependencies must be cached before\n      (dependency.peerDeps || []).every((peerDep) => matchedDependencies.indexOf(peerDep) !== -1),\n  );\n\n  if (matched) {\n    return {\n      name: matched.name,\n      version: matched.version,\n      url: matched.url,\n    };\n  }\n\n  return undefined;\n}\n\nfunction normalizeDependencies(dependencies: DependencyMap['dependencies']): NormalizedDependency[] {\n  return Object.keys(dependencies).map((name) => ({\n    name,\n    ...dependencies[name],\n  }));\n}\n"],"mappings":";AAAA,OAAOA,SAAS,MAAM,4BAA4B;AA0BlD,OAAO,SAASC,cAAcA,CAC5BC,GAAW,EACXC,iBAA8B,EAC9BC,gBAA6B,EACJ;EAAA,IAAAC,qBAAA;EACzB,IAAMC,qBAAqB,GAAG,4BAA4B;EAE1D,IAAMC,0BAA0B,IAAAF,qBAAA,GAAGF,iBAAiB,CAACK,aAAa,CAACF,qBAAqB,CAAC,cAAAD,qBAAA,uBAAtDA,qBAAA,CAAwDI,SAAS;EACpG,IAAIF,0BAA0B,EAAE;IAC9B,IAAAG,IAAA,GAAyBC,IAAI,CAACC,KAAK,CAACL,0BAA0B,CAAC;MAAvDM,YAAY,GAAAH,IAAA,CAAZG,YAAY;IACpB,IAAMC,sBAAsB,GAAGC,qBAAqB,CAACF,YAAY,CAAC;IAClE,IAAMG,kBAAkB,GAAGF,sBAAsB,CAACG,IAAI,CAAC,UAACC,CAAC;MAAA,OAAKA,CAAC,CAAChB,GAAG,KAAKA,GAAG;IAAA,EAAC;IAE5E,IAAIc,kBAAkB,EAAE;MAAA,IAAAG,qBAAA;MACtB,IAAMC,0BAA0B,IAAAD,qBAAA,GAAGf,gBAAgB,CAACI,aAAa,CAACF,qBAAqB,CAAC,cAAAa,qBAAA,uBAArDA,qBAAA,CAAuDV,SAAS;MAEnG,IAAIW,0BAA0B,EAAE;QAAA,IAAAC,qBAAA;QAC9B,IAAMC,oBAAoB,GAAGX,IAAI,CAACC,KAAK,CAACQ,0BAA0B,CAAkB;QACpF,IAAMG,WAAW,IAAAF,qBAAA,GAAIlB,iBAAiB,CAACqB,gBAAgB,cAAAH,qBAAA,cAAAA,qBAAA,GAAlClB,iBAAiB,CAACqB,gBAAgB,GAAK,EAAG;QAC/D,IAAMC,UAAU,GAAGC,cAAc,CAC/BV,kBAAkB,EAClBD,qBAAqB,CAACO,oBAAoB,CAACT,YAAY,CAAC,EACxDU,WACF,CAAC;QAED,IAAIE,UAAU,EAAE;UACdF,WAAW,CAACI,IAAI,CAACF,UAAU,CAACG,IAAI,CAAC;UACjC,OAAOH,UAAU;QACnB;MACF;IACF;EACF;EAEA,OAAOI,SAAS;AAClB;AAEA,SAASH,cAAcA,CACrBI,UAAgC,EAChCC,mBAA2C,EAC3CC,mBAA6B,EACJ;EACzB,IAAMC,OAAO,GAAGF,mBAAmB,CAACd,IAAI,CACtC,UAACiB,iBAAiB;IAAA,OAChBA,iBAAiB,CAACN,IAAI,KAAKE,UAAU,CAACF,IAAI,IAC1C5B,SAAS,CAACkC,iBAAiB,CAACC,OAAO,EAAEL,UAAU,CAACM,KAAK,CAAC;IACtD;IACA,CAACN,UAAU,CAACO,QAAQ,IAAI,EAAE,EAAEC,KAAK,CAAC,UAACC,OAAO;MAAA,OAAKP,mBAAmB,CAACQ,OAAO,CAACD,OAAO,CAAC,KAAK,CAAC,CAAC;IAAA,EAAC;EAAA,CAC/F,CAAC;EAED,IAAIN,OAAO,EAAE;IACX,OAAO;MACLL,IAAI,EAAEK,OAAO,CAACL,IAAI;MAClBO,OAAO,EAAEF,OAAO,CAACE,OAAO;MACxBjC,GAAG,EAAE+B,OAAO,CAAC/B;IACf,CAAC;EACH;EAEA,OAAO2B,SAAS;AAClB;AAEA,SAASd,qBAAqBA,CAACF,YAA2C,EAA0B;EAClG,OAAO4B,MAAM,CAACC,IAAI,CAAC7B,YAAY,CAAC,CAAC8B,GAAG,CAAC,UAACf,IAAI;IAAA,OAAAgB,aAAA;MACxChB,IAAI,EAAJA;IAAI,GACDf,YAAY,CAACe,IAAI,CAAC;EAAA,CACrB,CAAC;AACL"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qiankunjs/shared",
-  "version": "0.0.1-rc.0",
+  "version": "0.0.1-rc.1",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -12,7 +12,7 @@
     "@babel/runtime": "^7.10.5",
     "lodash": "^4.17.11",
     "semver": "^7.5.3",
-    "@qiankunjs/sandbox": "^0.0.1-rc.0"
+    "@qiankunjs/sandbox": "^0.0.1-rc.1"
   },
   "files": [
     "dist",

package/src/module-resolver/index.ts

@@ -3,7 +3,7 @@ import type { MatchResult } from './types';
 
 declare global {
   interface HTMLElement {
-    __cached_deps__?: string[];
+    __matched_deps__?: string[];
   }
 }
 
@@ -42,15 +42,15 @@ export function moduleResolver(
 
       if (mainAppDependencyMapString) {
         const mainAppDependencyMap = JSON.parse(mainAppDependencyMapString) as DependencyMap;
-        const cachedDeps = (microAppContainer.__cached_deps__ ??= []);
+        const matchedDeps = (microAppContainer.__matched_deps__ ??= []);
         const matchedDep = findDependency(
           microAppDependency,
           normalizeDependencies(mainAppDependencyMap.dependencies),
-          cachedDeps,
+          matchedDeps,
         );
 
         if (matchedDep) {
-          cachedDeps.push(matchedDep.name);
+          matchedDeps.push(matchedDep.name);
           return matchedDep;
         }
       }
@@ -63,14 +63,14 @@ export function moduleResolver(
 function findDependency(
   dependency: NormalizedDependency,
   mainAppDependencies: NormalizedDependency[],
-  cachedDependencies: string[],
+  matchedDependencies: string[],
 ): MatchResult | undefined {
   const matched = mainAppDependencies.find(
-    (cachedDependency) =>
-      cachedDependency.name === dependency.name &&
-      satisfies(cachedDependency.version, dependency.range) &&
+    (mainAppDependency) =>
+      mainAppDependency.name === dependency.name &&
+      satisfies(mainAppDependency.version, dependency.range) &&
       // peer dependencies must be cached before
-      dependency.peerDeps?.every((peerDep) => cachedDependencies.indexOf(peerDep) !== -1),
+      (dependency.peerDeps || []).every((peerDep) => matchedDependencies.indexOf(peerDep) !== -1),
   );
 
   if (matched) {