@jetshop/ui 6.1.0-alpha.60f2f3f7 → 6.1.0-alpha.ae06a609

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.
@@ -9,11 +9,13 @@ import useAuth from '@jetshop/core/components/AuthContext/useAuth';
9
9
  import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
10
10
  import { trackLoginEvent } from '@jetshop/core/analytics/tracking';
11
11
  import { useTracker } from '@jetshop/core/analytics/Analytics';
12
+ import { useCartId } from '@jetshop/core/components/Cart/CartIdContext';
12
13
  const LogInFormProvider = ({ children, redirect, initialEmail = '' }) => {
13
14
  const { getRedirectUrl } = useLoginRedirect();
14
15
  const { loggedIn } = useAuth();
15
16
  const { loginMutation } = useLoginMutation();
16
17
  const { routes } = useShopConfig();
18
+ const { cartId } = useCartId();
17
19
  const track = useTracker();
18
20
  const [disabledByTimeout, setDisabledByTimeout] = useState(false);
19
21
  function triggerLoginFailed(globalError) {
@@ -31,7 +33,8 @@ const LogInFormProvider = ({ children, redirect, initialEmail = '' }) => {
31
33
  redirect = redirect ? redirect : routes.myPages.path;
32
34
  return (React.createElement(Formik, { validate: validate, initialValues: {
33
35
  email: initialEmail,
34
- password: ''
36
+ password: '',
37
+ cartId
35
38
  }, onSubmit: (values, actions) => {
36
39
  loginMutation({
37
40
  variables: values
@@ -40,7 +43,7 @@ const LogInFormProvider = ({ children, redirect, initialEmail = '' }) => {
40
43
  track(trackLoginEvent());
41
44
  const returnUrlPromise = getRedirectUrl();
42
45
  if (returnUrlPromise) {
43
- returnUrlPromise.then(returnUrl => {
46
+ returnUrlPromise.then((returnUrl) => {
44
47
  if (returnUrl) {
45
48
  window.location.href = returnUrl;
46
49
  }
@@ -52,7 +55,7 @@ const LogInFormProvider = ({ children, redirect, initialEmail = '' }) => {
52
55
  else {
53
56
  actions.setSubmitting(false);
54
57
  }
55
- }, error => {
58
+ }, (error) => {
56
59
  actions.setSubmitting(false);
57
60
  actions.setErrors(error);
58
61
  actions.setStatus({
@@ -60,7 +63,7 @@ const LogInFormProvider = ({ children, redirect, initialEmail = '' }) => {
60
63
  });
61
64
  triggerLoginFailed(error.graphQLErrors);
62
65
  });
63
- }, render: props => {
66
+ }, render: (props) => {
64
67
  var _a;
65
68
  return (React.createElement(React.Fragment, null,
66
69
  !props.isSubmitting && loggedIn && React.createElement(Redirect, { to: redirect }),
@@ -1 +1 @@
1
- {"version":3,"file":"LogInFormProvider.js","sourceRoot":"","sources":["LogInFormProvider.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LogInFormProvider.js","sourceRoot":"","sources":["LogInFormProvider.tsx"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  declare const validate: (values: {
2
2
  email: string;
3
3
  password: string;
4
+ cartId?: string;
4
5
  }) => {
5
6
  email?: string;
6
7
  password?: string;
8
+ cartId?: string;
7
9
  };
8
10
  export default validate;
@@ -1,6 +1,6 @@
1
1
  import t from 'format-message';
2
2
  const validate = (values) => {
3
- let errors = {};
3
+ const errors = {};
4
4
  if (!values.email) {
5
5
  errors.email = t('Required');
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"logInValidator.js","sourceRoot":"","sources":["logInValidator.tsx"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,gBAAgB,CAAC;AAE/B,MAAM,QAAQ,GAAG,CAAC,MAA2C,EAAE,EAAE;IAC/D,IAAI,MAAM,GAA0C,EAAE,CAAC;IAEvD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;KAC9B;SAAM,IAAI,CAAC,4CAA4C,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAC3E,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC;KAC3C;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"logInValidator.js","sourceRoot":"","sources":["logInValidator.tsx"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,gBAAgB,CAAC;AAE/B,MAAM,QAAQ,GAAG,CAAC,MAIjB,EAAE,EAAE;IACH,MAAM,MAAM,GAA2D,EAAE,CAAC;IAE1E,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;KAC9B;SAAM,IAAI,CAAC,4CAA4C,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAC3E,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC;KAC3C;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,eAAe,QAAQ,CAAC"}
package/CategoryLink.d.ts CHANGED
@@ -4,6 +4,8 @@ import { Category } from '@jetshop/core/types';
4
4
  export interface CategoryLinkProps extends Partial<NavLinkProps> {
5
5
  category: Category;
6
6
  className?: string;
7
+ preloadRoute?: boolean;
8
+ onMouseEnter?: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => any;
7
9
  }
8
- declare const CategoryLink: ({ category: { id, name, primaryRoute }, children, ...props }: CategoryLinkProps) => React.JSX.Element;
10
+ declare const CategoryLink: ({ category: { id, name, primaryRoute }, children, onMouseEnter, preloadRoute, ...props }: CategoryLinkProps) => React.JSX.Element;
9
11
  export default CategoryLink;
package/CategoryLink.js CHANGED
@@ -14,12 +14,13 @@ import { NavLink } from 'react-router-dom';
14
14
  import { useRoutePreload } from '@jetshop/core/hooks/useRoutePreload';
15
15
  import { useHoverIntent } from './utils/useHoverIntent';
16
16
  const CategoryLink = (_a) => {
17
- var { category: { id, name, primaryRoute }, children } = _a, props = __rest(_a, ["category", "children"]);
17
+ var { category: { id, name, primaryRoute }, children, onMouseEnter, preloadRoute = true } = _a, props = __rest(_a, ["category", "children", "onMouseEnter", "preloadRoute"]);
18
18
  const { preload } = useRoutePreload();
19
19
  const categoryPreload = () => {
20
20
  preload({
21
21
  pathname: primaryRoute && primaryRoute.path,
22
- routeType: 'Category'
22
+ routeType: 'Category',
23
+ preloadRoute
23
24
  });
24
25
  };
25
26
  const [, intentRef] = useHoverIntent({
@@ -34,7 +35,12 @@ const CategoryLink = (_a) => {
34
35
  type: 'Category',
35
36
  id
36
37
  }
37
- }, innerRef: intentRef, onTouchStart: categoryPreload, onMouseEnter: categoryPreload }), children ? children : name));
38
+ }, innerRef: intentRef, onTouchStart: categoryPreload, onMouseEnter: (event) => {
39
+ categoryPreload();
40
+ if (typeof onMouseEnter === 'function') {
41
+ onMouseEnter(event);
42
+ }
43
+ } }), children ? children : name));
38
44
  }
39
45
  else
40
46
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"CategoryLink.js","sourceRoot":"","sources":["CategoryLink.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAgB,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAMxD,MAAM,YAAY,GAAG,CAAC,EAIF,EAAE,EAAE;QAJF,EACpB,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EACpC,QAAQ,OAEU,EADf,KAAK,cAHY,wBAIrB,CADS;IAER,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,OAAO,CAAC;YACN,QAAQ,EAAE,YAAY,IAAI,YAAY,CAAC,IAAI;YAC3C,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,cAAc,CAAC;QACnC,OAAO,EAAE,GAAG,EAAE;YACZ,eAAe,EAAE,CAAC;QACpB,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE;QACrC,OAAO,CACL,oBAAC,OAAO,oBACF,KAAK,IACT,EAAE,EAAE;gBACF,QAAQ,EAAE,YAAY,CAAC,IAAI;gBAC3B,KAAK,EAAE;oBACL,IAAI,EAAE,UAAU;oBAChB,EAAE;iBACH;aACF,EACD,QAAQ,EAAE,SAAgB,EAC1B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,KAE5B,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACnB,CACX,CAAC;KACH;;QAAM,OAAO,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"CategoryLink.js","sourceRoot":"","sources":["CategoryLink.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAgB,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAUxD,MAAM,YAAY,GAAG,CAAC,EAMF,EAAE,EAAE;QANF,EACpB,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EACpC,QAAQ,EACR,YAAY,EACZ,YAAY,GAAG,IAAI,OAED,EADf,KAAK,cALY,wDAMrB,CADS;IAER,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,OAAO,CAAC;YACN,QAAQ,EAAE,YAAY,IAAI,YAAY,CAAC,IAAI;YAC3C,SAAS,EAAE,UAAU;YACrB,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,cAAc,CAAC;QACnC,OAAO,EAAE,GAAG,EAAE;YACZ,eAAe,EAAE,CAAC;QACpB,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE;QACrC,OAAO,CACL,oBAAC,OAAO,oBACF,KAAK,IACT,EAAE,EAAE;gBACF,QAAQ,EAAE,YAAY,CAAC,IAAI;gBAC3B,KAAK,EAAE;oBACL,IAAI,EAAE,UAAU;oBAChB,EAAE;iBACH;aACF,EACD,QAAQ,EAAE,SAAgB,EAC1B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,eAAe,EAAE,CAAC;gBAClB,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE;oBACtC,YAAY,CAAC,KAAK,CAAC,CAAC;iBACrB;YACH,CAAC,KAEA,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACnB,CACX,CAAC;KACH;;QAAM,OAAO,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -4,6 +4,8 @@ import { Page } from '@jetshop/core/types';
4
4
  export interface ContentPageLinkProps extends Partial<LinkProps> {
5
5
  page: Page;
6
6
  className?: string;
7
+ preloadRoute?: boolean;
8
+ onMouseEnter?: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => any;
7
9
  }
8
10
  declare const ContentPageLink: React.FC<ContentPageLinkProps>;
9
11
  export default ContentPageLink;
@@ -14,13 +14,17 @@ import { Link } from 'react-router-dom';
14
14
  import { useRoutePreload } from '@jetshop/core/hooks/useRoutePreload';
15
15
  import { useHoverIntent } from './utils/useHoverIntent';
16
16
  const ContentPageLink = function ContentPageLink(props) {
17
- const { page } = props, rest = __rest(props, ["page"]);
17
+ const { page, onMouseEnter, preloadRoute = true } = props, rest = __rest(props, ["page", "onMouseEnter", "preloadRoute"]);
18
18
  const { primaryRoute } = page;
19
19
  const { preload } = useRoutePreload();
20
20
  const contentPreload = () => {
21
+ if (!(primaryRoute === null || primaryRoute === void 0 ? void 0 : primaryRoute.path)) {
22
+ return;
23
+ }
21
24
  preload({
22
25
  pathname: primaryRoute.path,
23
- routeType: 'Page'
26
+ routeType: 'Page',
27
+ preloadRoute
24
28
  });
25
29
  };
26
30
  const [, intentRef] = useHoverIntent({
@@ -29,9 +33,14 @@ const ContentPageLink = function ContentPageLink(props) {
29
33
  }
30
34
  });
31
35
  return (React.createElement(Link, Object.assign({ to: {
32
- pathname: primaryRoute.path,
36
+ pathname: primaryRoute === null || primaryRoute === void 0 ? void 0 : primaryRoute.path,
33
37
  state: { type: 'Page' }
34
- }, innerRef: intentRef, onTouchStart: contentPreload }, rest)));
38
+ }, innerRef: intentRef, onTouchStart: contentPreload, onMouseEnter: (event) => {
39
+ contentPreload();
40
+ if (typeof onMouseEnter === 'function') {
41
+ onMouseEnter(event);
42
+ }
43
+ } }, rest)));
35
44
  };
36
45
  export default ContentPageLink;
37
46
  //# sourceMappingURL=ContentPageLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ContentPageLink.js","sourceRoot":"","sources":["ContentPageLink.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAa,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAOxD,MAAM,eAAe,GACnB,SAAS,eAAe,CAAC,KAAK;IAC5B,MAAM,EAAE,IAAI,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAzB,QAAiB,CAAQ,CAAC;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,OAAO,CAAC;YACN,QAAQ,EAAE,YAAY,CAAC,IAAI;YAC3B,SAAS,EAAE,MAAM;SAClB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,cAAc,CAAC;QACnC,OAAO,EAAE,GAAG,EAAE;YACZ,cAAc,EAAE,CAAC;QACnB,CAAC;KACF,CAAC,CAAC;IACH,OAAO,CACL,oBAAC,IAAI,kBACH,EAAE,EAAE;YACF,QAAQ,EAAE,YAAY,CAAC,IAAI;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB,EACD,QAAQ,EAAE,SAAgB,EAC1B,YAAY,EAAE,cAAc,IACxB,IAAI,EACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEJ,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"ContentPageLink.js","sourceRoot":"","sources":["ContentPageLink.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAa,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAWxD,MAAM,eAAe,GACnB,SAAS,eAAe,CAAC,KAAK;IAC5B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA5D,wCAAoD,CAAQ,CAAC;IACnE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,CAAA,EAAE;YACvB,OAAO;SACR;QACD,OAAO,CAAC;YACN,QAAQ,EAAE,YAAY,CAAC,IAAI;YAC3B,SAAS,EAAE,MAAM;YACjB,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,SAAS,CAAC,GAAG,cAAc,CAAC;QACnC,OAAO,EAAE,GAAG,EAAE;YACZ,cAAc,EAAE,CAAC;QACnB,CAAC;KACF,CAAC,CAAC;IACH,OAAO,CACL,oBAAC,IAAI,kBACH,EAAE,EAAE;YACF,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI;YAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB,EACD,QAAQ,EAAE,SAAgB,EAC1B,YAAY,EAAE,cAAc,EAC5B,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YACtB,cAAc,EAAE,CAAC;YACjB,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE;gBACtC,YAAY,CAAC,KAAK,CAAC,CAAC;aACrB;QACH,CAAC,IACG,IAAI,EACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEJ,eAAe,eAAe,CAAC"}
package/ProductLink.d.ts CHANGED
@@ -15,6 +15,8 @@ export interface ProductLinkProps extends Partial<LinkProps> {
15
15
  /** Optional string to be used as the hash string. */
16
16
  hash?: string;
17
17
  className?: string;
18
+ preloadRoute?: boolean;
19
+ onMouseEnter?: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => any;
18
20
  }
19
21
  export declare function getPathWithTrailingSlash(path: string): string;
20
22
  declare const ProductLink: React.FC<ProductLinkProps>;
package/ProductLink.js CHANGED
@@ -27,7 +27,7 @@ export function getPathWithTrailingSlash(path) {
27
27
  return path + '/';
28
28
  }
29
29
  const ProductLink = (_a) => {
30
- var { product, index, list, children, onClick, categoryPath, search, hash } = _a, rest = __rest(_a, ["product", "index", "list", "children", "onClick", "categoryPath", "search", "hash"]);
30
+ var { product, index, list, children, onClick, categoryPath, search, hash, onMouseEnter, preloadRoute = true } = _a, rest = __rest(_a, ["product", "index", "list", "children", "onClick", "categoryPath", "search", "hash", "onMouseEnter", "preloadRoute"]);
31
31
  const track = useTracker();
32
32
  const { preload } = useRoutePreload();
33
33
  useWarningInDev(!product, `You must pass a product to ProductLink`);
@@ -37,7 +37,8 @@ const ProductLink = (_a) => {
37
37
  const productPreload = () => {
38
38
  preload({
39
39
  pathname,
40
- routeType: 'Product'
40
+ routeType: 'Product',
41
+ preloadRoute
41
42
  });
42
43
  };
43
44
  const [, intentRef] = useHoverIntent({
@@ -76,7 +77,12 @@ const ProductLink = (_a) => {
76
77
  },
77
78
  search,
78
79
  hash
79
- }, innerRef: intentRef, onTouchStart: productPreload }), children ? children : product.name));
80
+ }, innerRef: intentRef, onTouchStart: productPreload, onMouseEnter: (event) => {
81
+ productPreload();
82
+ if (typeof onMouseEnter === 'function') {
83
+ onMouseEnter(event);
84
+ }
85
+ } }), children ? children : product.name));
80
86
  };
81
87
  export default ProductLink;
82
88
  //# sourceMappingURL=ProductLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ProductLink.js","sourceRoot":"","sources":["ProductLink.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProductLink.js","sourceRoot":"","sources":["ProductLink.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetshop/ui",
3
- "version": "6.1.0-alpha.60f2f3f7",
3
+ "version": "6.1.0-alpha.ae06a609",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",