@blocklet/launcher-workflow 2.3.63 → 2.3.65

package/es/contexts/request.js

@@ -1,12 +1,11 @@
-import { createContext, useContext } from 'react';
-import PropTypes from 'prop-types';
-import axios from 'axios';
+import { create as createRequestInstance } from '@blocklet/launcher-util/es/api';
 import get from 'lodash.get';
+import PropTypes from 'prop-types';
+import { createContext, useContext } from 'react';
 import joinUrl from 'url-join';
-import { useSessionContext } from './session';
 import { useLocaleContext } from './locale';
+import { useSessionContext } from './session';
 import { jsx as _jsx } from "react/jsx-runtime";
-axios.defaults.timeout = 200000;
 const RequestContext = /*#__PURE__*/createContext();
 const {
   Provider
@@ -42,10 +41,10 @@ export function RequestProvider({
     });
     return r;
   };
-  const request = axios.create({
+  const request = createRequestInstance({
     baseURL
   });
-  const create = configs => configRequest(axios.create({
+  const create = configs => configRequest(createRequestInstance({
     baseURL,
     ...(configs || {})
   }));

package/es/prepare.js

@@ -1,7 +1,7 @@
 import Center from '@arcblock/ux/lib/Center';
 import Toast from '@arcblock/ux/lib/Toast';
 import { LAUNCH_STATUS } from '@blocklet/launcher-util/es/constant';
-import { getBlockletAdminURL, getBlockletLogoUrl, getBlockletMetaUrlFromQuery, getDefaultTrialEnd } from '@blocklet/launcher-util/es/util';
+import { getBlockletAdminURL, getBlockletLogoUrl, getBlockletMetaUrlFromQuery } from '@blocklet/launcher-util/es/util';
 import useMobile from '@blocklet/launcher-ux/lib/use-mobile';
 import CheckoutOnDemand from '@blocklet/launcher-ux/lib/payment/checkout/on-demand';
 import { CheckoutTable, PaymentProvider } from '@blocklet/payment-react';
@@ -96,7 +96,7 @@ function Content({
       return result;
     }
     if (launchState.value?.metadata?.isSupportOnDemand === false) {
-      Toast.info( /*#__PURE__*/_jsxs(Box, {
+      Toast.info(/*#__PURE__*/_jsxs(Box, {
         component: "span",
         children: [t('purchase.onDemandNotSupport'), ",", /*#__PURE__*/_jsxs(ExternalLink, {
           target: "_blank",
@@ -339,7 +339,6 @@ function Content({
               mode: "inline",
               extraParams: {
                 'metadata.session_id': launch._id,
-                'subscription_data.trial_end': getDefaultTrialEnd(),
                 'subscription_data.days_until_due': 0,
                 'subscription_data.days_until_cancel': window.blocklet?.preferences?.daysUntilCancel || 30
               },

package/es/util.js

@@ -1,9 +1,9 @@
-import joinURL from 'url-join';
+import { create as createRequestInstance } from '@blocklet/launcher-util/es/api';
+import { getFromQuery } from '@blocklet/launcher-ux/lib/util';
 import get from 'lodash.get';
 import noop from 'lodash.noop';
 import pick from 'lodash.pick';
-import axios from 'axios';
-import { getFromQuery } from '@blocklet/launcher-ux/lib/util';
+import joinURL from 'url-join';
 export const BLOCKLET_STORE_URL = get(window, 'blocklet.LAUNCHER_BLOCKLET_STORE_URL') || 'https://store.blocklet.dev';
 export function getBlockletMetaUrl(registry, did) {
   return joinURL(registry, `/api/blocklets/${did}/blocklet.json?source=webapp`);
@@ -70,7 +70,7 @@ export const loadURL = url => new Promise(resolve => {
 });
 export const getAsset = async (chainHost, address) => {
   const url = joinURL(new URL(chainHost).origin, '/api/gql/');
-  const result = await axios.create().post(url, JSON.stringify({
+  const result = await createRequestInstance().post(url, JSON.stringify({
     query: `{
           getAssetState(address: "${address}") {
             state {

package/lib/contexts/request.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RequestProvider = RequestProvider;
 exports.default = useRequest;
-var _react = require("react");
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _axios = _interopRequireDefault(require("axios"));
+var _api = require("@blocklet/launcher-util/es/api");
 var _lodash = _interopRequireDefault(require("lodash.get"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
 var _urlJoin = _interopRequireDefault(require("url-join"));
-var _session = require("./session");
 var _locale = require("./locale");
+var _session = require("./session");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -19,7 +19,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-_axios.default.defaults.timeout = 200000;
 const RequestContext = /*#__PURE__*/(0, _react.createContext)();
 const {
   Provider
@@ -56,10 +55,10 @@ function RequestProvider(_ref) {
     });
     return r;
   };
-  const request = _axios.default.create({
+  const request = (0, _api.create)({
     baseURL
   });
-  const create = configs => configRequest(_axios.default.create(_objectSpread({
+  const create = configs => configRequest((0, _api.create)(_objectSpread({
     baseURL
   }, configs || {})));
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {

package/lib/prepare.js

@@ -106,7 +106,7 @@ function Content(_ref) {
     }
     if (((_launchState$value = launchState.value) === null || _launchState$value === void 0 || (_launchState$value = _launchState$value.metadata) === null || _launchState$value === void 0 ? void 0 : _launchState$value.isSupportOnDemand) === false) {
       var _window$blocklet;
-      _Toast.default.info( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      _Toast.default.info(/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         component: "span",
         children: [t('purchase.onDemandNotSupport'), ",", /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Link.default, {
           target: "_blank",
@@ -354,7 +354,6 @@ function Content(_ref) {
               mode: "inline",
               extraParams: {
                 'metadata.session_id': launch._id,
-                'subscription_data.trial_end': (0, _util.getDefaultTrialEnd)(),
                 'subscription_data.days_until_due': 0,
                 'subscription_data.days_until_cancel': ((_window$blocklet5 = window.blocklet) === null || _window$blocklet5 === void 0 || (_window$blocklet5 = _window$blocklet5.preferences) === null || _window$blocklet5 === void 0 ? void 0 : _window$blocklet5.daysUntilCancel) || 30
               },

package/lib/util.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.getAsset = exports.getAPIResponseError = exports.BLOCKLET_STORE_URL = void 0;
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
 exports.loadURL = exports.launchSession = exports.getPrice = exports.getLaunchBlockletUrl = void 0;
-var _urlJoin = _interopRequireDefault(require("url-join"));
+var _api = require("@blocklet/launcher-util/es/api");
+var _util = require("@blocklet/launcher-ux/lib/util");
 var _lodash = _interopRequireDefault(require("lodash.get"));
 var _lodash2 = _interopRequireDefault(require("lodash.noop"));
 var _lodash3 = _interopRequireDefault(require("lodash.pick"));
-var _axios = _interopRequireDefault(require("axios"));
-var _util = require("@blocklet/launcher-ux/lib/util");
+var _urlJoin = _interopRequireDefault(require("url-join"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BLOCKLET_STORE_URL = exports.BLOCKLET_STORE_URL = (0, _lodash.default)(window, 'blocklet.LAUNCHER_BLOCKLET_STORE_URL') || 'https://store.blocklet.dev';
 function getBlockletMetaUrl(registry, did) {
@@ -83,7 +83,7 @@ const loadURL = url => new Promise(resolve => {
 exports.loadURL = loadURL;
 const getAsset = async (chainHost, address) => {
   const url = (0, _urlJoin.default)(new URL(chainHost).origin, '/api/gql/');
-  const result = await _axios.default.create().post(url, JSON.stringify({
+  const result = await (0, _api.create)().post(url, JSON.stringify({
     query: "{\n          getAssetState(address: \"".concat(address, "\") {\n            state {\n              address\n              data {\n                typeUrl\n                value\n              }\n              display {\n                type\n                content\n              }\n              issuer\n              owner\n              parent\n              tags\n            }\n          }\n        }")
   }), {
     headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.63",
+  "version": "2.3.65",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -41,16 +41,16 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.10.38",
-    "@arcblock/icons": "^2.10.38",
-    "@arcblock/license": "^2.10.38",
-    "@arcblock/react-hooks": "^2.10.38",
-    "@arcblock/ux": "^2.10.38",
-    "@blocklet/launcher-layout": "^2.10.38",
-    "@blocklet/launcher-util": "2.3.63",
-    "@blocklet/launcher-ux": "2.3.63",
+    "@arcblock/did-connect": "^2.10.40",
+    "@arcblock/icons": "^2.10.40",
+    "@arcblock/license": "^2.10.40",
+    "@arcblock/react-hooks": "^2.10.40",
+    "@arcblock/ux": "^2.10.40",
+    "@blocklet/launcher-layout": "^2.10.40",
+    "@blocklet/launcher-util": "2.3.65",
+    "@blocklet/launcher-ux": "2.3.65",
     "@blocklet/payment": "^1.14.8",
-    "@blocklet/payment-react": "^1.15.8",
+    "@blocklet/payment-react": "^1.15.14",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@mui/icons-material": "^5.16.7",
@@ -80,10 +80,10 @@
     "url-join": "^4.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.6",
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
+    "@babel/cli": "^7.25.7",
+    "@babel/core": "^7.25.7",
+    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-react": "^7.25.7",
     "babel-plugin-inline-react-svg": "^2.0.2",
     "glob": "^10.4.5"
   },
@@ -105,5 +105,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "c4ea98e35b952b97303d92620fd3104e41a402ad"
+  "gitHead": "fd9d8f05cc456803d3b15c9435a907d963efc061"
 }