@blocklet/launcher-workflow 1.7.51 → 1.7.54

package/lib/components/plan.js

@@ -13,7 +13,9 @@ var _lodash = _interopRequireDefault(require("lodash.get"));
 
 var _constant = require("@blocklet/launcher-util/lib/constant");
 
-var _material = require("@mui/material");
+var _util = require("@blocklet/launcher-util/lib/util");
+
+var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 
 var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
 
@@ -48,10 +50,10 @@ function NodeType(_ref) {
   } = (0, _locale.useLocaleContext)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, _objectSpread(_objectSpread({}, props), {}, {
     className: selected ? 'item-selected' : '',
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
       className: "name",
       component: "span",
-      children: (0, _lodash.default)(data, "name.".concat(locale))
+      children: "".concat((0, _lodash.default)(data, "name.".concat(locale)), " (").concat((0, _util.prettyDuration)(data.duration, locale), ")")
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "price",
       component: "span",

package/lib/index.js

@@ -5,22 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PaymentMethod = PaymentMethod;
 exports.Stripe = Stripe;
-exports.default = Launcher;
-
-var _react = require("react");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactRouterDom = require("react-router-dom");
-
-var _content = _interopRequireDefault(require("@blocklet/launcher-layout/lib/content"));
-
 var _checkout = _interopRequireDefault(require("./components/stripe/checkout"));
 
 var _paymentMethod = _interopRequireDefault(require("./components/payment-method"));
 
-var _router = _interopRequireWildcard(require("./contexts/router"));
-
 var _locales = require("./locales");
 
 var _request = require("./contexts/request");
@@ -44,75 +35,12 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const PurchasePage = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./purchase'))));
-const LaunchPage = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./launch'))));
-const PreparePage = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./prepare')))); // eslint-disable-next-line react/prop-types
-
-function LaunchContent(_ref) {
-  let {
-    Route,
-    routerPrefix,
-    noMatchRedirect,
-    disabledBack
-  } = _ref;
-  const routers = [{
-    path: "".concat(routerPrefix),
-    component: PurchasePage
-  }, {
-    path: (0, _router.default)(routerPrefix, '/prepare/:nftId'),
-    component: PreparePage
-  }, {
-    path: (0, _router.default)(routerPrefix, '/in-progress/:nftId'),
-    component: LaunchPage
-  }];
-
-  const redirectToRoot = () => {
-    const result = routers.some(_ref2 => {
-      let {
-        path
-      } = _ref2;
-      return (0, _reactRouterDom.matchPath)(window.location.pathname, {
-        path,
-        exact: true,
-        strict: true
-      });
-    });
-
-    if (!result) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Redirect, {
-        path: "*",
-        to: "/"
-      });
-    }
-
-    return '';
-  };
-
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_content.default, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_router.RouterProvider, {
-        prefix: routerPrefix,
-        disabledBack: disabledBack,
-        children: routers.map(e => /*#__PURE__*/(0, _jsxRuntime.jsx)(Route, {
-          exact: true,
-          path: e.path,
-          component: e.component
-        }, e.path))
-      })
-    }), noMatchRedirect && redirectToRoot()]
-  });
-}
-
-function Stripe(_ref3) {
+function Stripe(_ref) {
   let {
     locale,
     baseURL
-  } = _ref3,
-      rest = _objectWithoutProperties(_ref3, _excluded);
+  } = _ref,
+      rest = _objectWithoutProperties(_ref, _excluded);
 
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locale.LocaleProvider, {
     translations: _locales.translations,
@@ -133,51 +61,11 @@ Stripe.defaultProps = {
   baseURL: '/'
 };
 
-function Launcher(_ref4) {
-  let {
-    Route,
-    routerPrefix,
-    locale,
-    baseURL,
-    noMatchRedirect,
-    disabledBack
-  } = _ref4;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locale.LocaleProvider, {
-    translations: _locales.translations,
-    locale: locale,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_request.RequestProvider, {
-      baseURL: baseURL,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(LaunchContent, {
-        Route: Route,
-        routerPrefix: routerPrefix,
-        noMatchRedirect: noMatchRedirect,
-        disabledBack: disabledBack
-      })
-    })
-  });
-}
-
-Launcher.propTypes = {
-  Route: _propTypes.default.any.isRequired,
-  routerPrefix: _propTypes.default.string,
-  locale: _propTypes.default.string,
-  baseURL: _propTypes.default.string,
-  noMatchRedirect: _propTypes.default.bool,
-  disabledBack: _propTypes.default.array
-};
-Launcher.defaultProps = {
-  routerPrefix: '/',
-  locale: 'en',
-  baseURL: '/',
-  noMatchRedirect: false,
-  disabledBack: []
-};
-
-function PaymentMethod(_ref5) {
+function PaymentMethod(_ref2) {
   let {
     locale
-  } = _ref5,
-      props = _objectWithoutProperties(_ref5, _excluded2);
+  } = _ref2,
+      props = _objectWithoutProperties(_ref2, _excluded2);
 
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locale.LocaleProvider, {
     translations: _locales.translations,

package/lib/prepare.js

@@ -217,7 +217,7 @@ function PreparePage() {
               label: t('common.name'),
               onChange: handleInput('name'),
               value: name,
-              labelWidth: 0,
+              labelwidth: 0,
               autoFocus: true
             }), formError.name && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormHelperText.default, {
               children: formError.name
@@ -232,7 +232,7 @@ function PreparePage() {
               formError: !!formError.desc,
               onChange: handleInput('description'),
               value: description,
-              labelWidth: 0
+              labelwidth: 0
             }), formError.description && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormHelperText.default, {
               children: formError.description
             })]

package/lib/router-content.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = IndexContent;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _content = _interopRequireDefault(require("@blocklet/launcher-layout/lib/content"));
+
+var _locales = require("./locales");
+
+var _request = require("./contexts/request");
+
+var _locale = require("./contexts/locale");
+
+var _router = require("./contexts/router");
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function IndexContent(_ref) {
+  let {
+    locale,
+    baseURL,
+    children,
+    routerPrefix,
+    disabledBack
+  } = _ref;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_locale.LocaleProvider, {
+    translations: _locales.translations,
+    locale: locale,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_request.RequestProvider, {
+      baseURL: baseURL,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_content.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_router.RouterProvider, {
+          prefix: routerPrefix,
+          disabledBack: disabledBack,
+          children: children
+        })
+      })
+    })
+  });
+}
+
+IndexContent.propTypes = {
+  locale: _propTypes.default.string,
+  baseURL: _propTypes.default.string,
+  children: _propTypes.default.node,
+  routerPrefix: _propTypes.default.string,
+  disabledBack: _propTypes.default.array
+};
+IndexContent.defaultProps = {
+  locale: 'en',
+  baseURL: '/',
+  children: '',
+  routerPrefix: '',
+  disabledBack: []
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "1.7.51",
+  "version": "1.7.54",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -37,19 +37,19 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.1.53",
-    "@arcblock/icons": "^2.1.53",
-    "@arcblock/license": "^2.1.53",
-    "@arcblock/ux": "^2.1.53",
-    "@blocklet/launcher-layout": "1.7.51",
-    "@blocklet/launcher-util": "1.7.51",
+    "@arcblock/did-connect": "^2.1.55",
+    "@arcblock/icons": "^2.1.55",
+    "@arcblock/license": "^2.1.55",
+    "@arcblock/ux": "^2.1.55",
+    "@blocklet/launcher-layout": "1.7.54",
+    "@blocklet/launcher-util": "1.7.54",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@mui/icons-material": "^5.6.2",
     "@mui/lab": "^5.0.0-alpha.81",
     "@mui/material": "^5.6.4",
     "@mui/styles": "^5.6.2",
-    "@ocap/util": "^1.17.0",
+    "@ocap/util": "^1.17.2",
     "@stripe/react-stripe-js": "^1.7.0",
     "@stripe/stripe-js": "^1.22.0",
     "@styled-icons/remix-fill": "^10.18.0",
@@ -73,5 +73,5 @@
     "babel-plugin-inline-react-svg": "^2.0.1",
     "babel-plugin-styled-components": "^1.10.7"
   },
-  "gitHead": "cbb48d663ee67bdcb072fff36564ebb954f1bbd0"
+  "gitHead": "49f7491b1fc4f839d52cfa8193b0ecd44e0bfd66"
 }