@blocklet/meta 1.16.28-next-5a717317 → 1.16.28

package/lib/nft-templates.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlockletPurchaseTemplate = void 0;
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const getBlockletPurchaseTemplate = (serviceUrl = 'https://registry.arcblock.io') => ({
     type: 'vc',
     value: {
@@ -30,11 +27,11 @@ const getBlockletPurchaseTemplate = (serviceUrl = 'https://registry.arcblock.io'
             },
             display: {
                 type: 'url',
-                content: (0, url_join_1.default)(serviceUrl, '/api/nft/display'), // accept asset-did in query param
+                content: (0, ufo_1.joinURL)(serviceUrl, '/api/nft/display'), // accept asset-did in query param
             },
         },
         credentialStatus: {
-            id: (0, url_join_1.default)(serviceUrl, '/api/nft/status'),
+            id: (0, ufo_1.joinURL)(serviceUrl, '/api/nft/status'),
             type: 'NFTStatusList2021',
             scope: 'public',
         },

package/lib/parse-navigation-from-blocklet.js

@@ -10,7 +10,7 @@ const pick_1 = __importDefault(require("lodash/pick"));
 const isNil_1 = __importDefault(require("lodash/isNil"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const path_1 = __importDefault(require("path"));
 const is_absolute_url_1 = __importDefault(require("is-absolute-url"));
 const lodash_1 = require("lodash");
@@ -214,7 +214,7 @@ function parseBlockletNavigationList(blocklet = {}) {
             const childBase = child.mountPoint;
             const mergeName = [parentName, currentName, childName].filter(Boolean).join('.');
             const childNavigation = child.meta.navigation || [];
-            const mergeBase = (0, url_join_1.default)(parentBase, currentBase, childBase);
+            const mergeBase = (0, ufo_1.joinURL)(parentBase, currentBase, childBase);
             if (child.meta?.capabilities?.navigation !== false) {
                 components.push({
                     did: child.meta.did,
@@ -498,14 +498,8 @@ function parseNavigation(blocklet = {}, options = {}) {
     // 将 footer-social, footer-bottom, sessionManager, userCenter 的二级菜单提升为一级菜单
     const levelUpNavigation = splitNavigation.reduce((all, cur) => {
         const shouldLevelUp = ['bottom', 'social', 'sessionManager', 'userCenter'].includes(cur.section);
-        let isRoot = false;
-        // 在更新为容器模式后，最终生成的 navigation 会将 '/' 的子菜单提升为一级菜单
-        // 同时兼容非容器模式（root-blocklet 不会出现在 components 中）
-        const rootBlocklet = components.find((item) => item.link === '/');
-        if (rootBlocklet && cur.id === rootBlocklet.did) {
-            isRoot = true;
-        }
-        if (shouldLevelUp || isRoot) {
+        // 调整设计，不再将 root-blocklet 提升为一级菜单, 但是保留 footer-social, footer-bottom, sessionManager, userCenter 提升为一级菜单
+        if (shouldLevelUp) {
             if (cur.items && cur.items.length > 0) {
                 all.push(...cur.items.map((x) => {
                     const { section } = cur;
@@ -515,10 +509,6 @@ function parseNavigation(blocklet = {}, options = {}) {
                 }));
                 return all;
             }
-            // root blocklet 不应该出现在菜单中
-            if (isRoot) {
-                return all;
-            }
         }
         all.push(cur);
         return all;

package/lib/payment/v1.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNftFactoryItx = exports.createShareContract = void 0;
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const util_1 = require("@ocap/util");
 const asset_1 = require("@ocap/asset");
 const did_util_1 = require("@arcblock/did-util");
@@ -60,7 +57,7 @@ const createNftFactoryItx = ({ meta, tokens, shares, issuers, serviceUrl, }) =>
             type: 'json',
             value: {
                 did: meta.did,
-                url: (0, url_join_1.default)(serviceUrl, `/blocklet/${meta.did}`),
+                url: (0, ufo_1.joinURL)(serviceUrl, `/blocklet/${meta.did}`),
                 name: meta.name,
             },
         },

package/lib/payment/v2.js

@@ -30,7 +30,7 @@ exports.version = exports.checkFreeBlocklet = exports.verifyNftFactory = exports
 /* eslint-disable no-await-in-loop */
 const crypto_1 = __importDefault(require("crypto"));
 const debug_1 = __importDefault(require("debug"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const get_1 = __importDefault(require("lodash/get"));
 const pick_1 = __importDefault(require("lodash/pick"));
@@ -60,7 +60,7 @@ const safeMul = (a, b) => Number((0, util_1.fromUnitToToken)((0, util_1.fromToke
     .div(defaultDecimalsBN)));
 const md5 = (str) => crypto_1.default.createHash('md5').update(str).digest('hex');
 const getStoreInfo = async (url) => {
-    const storeMetaUrl = (0, url_join_1.default)(new URL(url).origin, BLOCKLET_STORE_META_PATH);
+    const storeMetaUrl = (0, ufo_1.joinURL)(new URL(url).origin, BLOCKLET_STORE_META_PATH);
     const { data: info } = await axios_1.default.get(storeMetaUrl, { timeout: 8000 });
     return info;
 };
@@ -328,7 +328,7 @@ const innerCreateNftFactoryItx = ({ meta, issuers, serviceUrl, storeSignatures,
             type: 'json',
             value: {
                 did: meta.did,
-                url: (0, url_join_1.default)(serviceUrl, `/blocklet/${meta.did}`),
+                url: (0, ufo_1.joinURL)(serviceUrl, `/blocklet/${meta.did}`),
                 name: meta.name,
                 version: meta.version,
                 payment: {

package/lib/util-meta.js

@@ -7,7 +7,7 @@ exports.getSourceUrlsFromConfig = exports.getBlockletMetaFromUrls = exports.getB
 const url_1 = require("url");
 const fs_1 = __importDefault(require("fs"));
 const promise_any_1 = __importDefault(require("promise.any"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const axios_1 = __importDefault(require("./axios"));
 const did_1 = __importDefault(require("./did"));
@@ -136,7 +136,7 @@ const getSourceUrlsFromConfig = (config) => {
         // FIXME: @linchen the format or version is semverRange, blocklet store should support it
         return [store]
             .flat()
-            .map((x) => (0, url_join_1.default)(x, BLOCKLET_STORE_API_BLOCKLET_PREFIX, (0, did_1.default)(name), !version || version === 'latest' ? '' : version, 'blocklet.json'));
+            .map((x) => (0, ufo_1.joinURL)(x, BLOCKLET_STORE_API_BLOCKLET_PREFIX, (0, did_1.default)(name), !version || version === 'latest' ? '' : version, 'blocklet.json'));
     }
     if (config.resolved) {
         return [config.resolved];

package/lib/util.js

@@ -8,7 +8,7 @@ exports.hasResourceType = exports.hasStartEngine = void 0;
 /* eslint-disable no-await-in-loop */
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const p_limit_1 = __importDefault(require("p-limit"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const constant_2 = require("@blocklet/constant");
@@ -591,7 +591,7 @@ const getConnectAppUrl = ({ request, baseUrl }) => {
     // Child blocklets should set appInfo.link to exactly the same path as the root blocklet
     let appUrl = baseUrl;
     if (blockletDid !== blockletRealDid && pathPrefix !== groupPathPrefix) {
-        appUrl = (0, url_join_1.default)((0, url_join_1.default)(appUrl, '/').replace(pathPrefix, groupPathPrefix), '');
+        appUrl = (0, ufo_1.joinURL)(appUrl, '/').replace(pathPrefix, groupPathPrefix);
     }
     return appUrl;
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.28-next-5a717317",
+  "version": "1.16.28",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,19 +25,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.28-next-5a717317",
+    "@abtnode/constant": "1.16.28",
     "@arcblock/did": "1.18.123",
     "@arcblock/did-ext": "1.18.123",
     "@arcblock/did-util": "1.18.123",
     "@arcblock/jwt": "1.18.123",
-    "@blocklet/constant": "1.16.28-next-5a717317",
+    "@blocklet/constant": "1.16.28",
     "@ocap/asset": "1.18.123",
     "@ocap/mcrypto": "1.18.123",
     "@ocap/types": "1.18.123",
     "@ocap/util": "1.18.123",
     "@ocap/wallet": "1.18.123",
     "ajv": "^8.11.0",
-    "axios": "^0.27.2",
+    "axios": "^1.7.2",
     "cjk-length": "^1.0.0",
     "debug": "^4.3.4",
     "fs-extra": "^11.2.0",
@@ -54,7 +54,7 @@
     "p-limit": "^3.1.0",
     "promise.any": "^2.0.4",
     "slugify": "^1.6.5",
-    "url-join": "^4.0.1",
+    "ufo": "^1.5.3",
     "utility-types": "^3.10.0",
     "validate-npm-package-name": "^3.0.0"
   },
@@ -79,5 +79,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "3624967f9549de3a25a87ed6b20f82519ddb4757"
+  "gitHead": "54db076a7e520bbc260f8cbf0af31dd50b86aef1"
 }