@next-core/brick-kit 2.194.0 → 2.194.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6104,11 +6104,11 @@
6104
6104
  }, ...args];
6105
6105
  }
6106
6106
  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version) {
6107
- var prefix = version ? serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
6107
+ var prefix = version ? serviceName === "logic.api.gateway" ? "" : serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
6108
6108
  var restArgs = originalArgs.slice();
6109
6109
  var transformedUri = uri.replace(/:([^/]+)/g, () => restArgs.shift());
6110
6110
  return {
6111
- url: prefix + transformedUri,
6111
+ url: prefix ? prefix + transformedUri : transformedUri.replace(/^\//, ""),
6112
6112
  args: restArgs
6113
6113
  };
6114
6114
  }
@@ -9119,9 +9119,12 @@
9119
9119
  var bricksMap = new Map();
9120
9120
 
9121
9121
  // bootstrapData 数据和 pubDeps 中可能同时存在同一个包名,需要过滤去重, 以 pubDeps 中的包为准
9122
- [...brickPackages, ...pubDeps].forEach(pkg => {
9122
+ [...pubDeps, ...brickPackages].forEach(pkg => {
9123
9123
  var pkgName = pkg.filePath.split("/")[1];
9124
- bricksMap.set(pkgName, pkg);
9124
+ // 始终将 pubDeps 放在前面
9125
+ if (!bricksMap.has(pkgName)) {
9126
+ bricksMap.set(pkgName, pkg);
9127
+ }
9125
9128
  });
9126
9129
  return Array.from(bricksMap.values());
9127
9130
  }