fontdue-js 1.12.0 → 1.12.2

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.12.2
+
+- Fixes an issue completing checkout with a 100% coupon
+
+## 1.12.1
+
+- Fixes issues in the StoreModal router
+
+## 1.12.0
+
+- Added `indexExcludeTags` option to `storeModal` config
+
+## 1.11.0
+
+- Updated Stripe integration and checkout UX to support payment methods via
+  Stripe's Payment Element
+
 ## 1.10.2
 
 - Fixed error importing module

package/dist/__generated__/StoreModalIndexQuery.graphql.d.ts

@@ -8,6 +8,7 @@ export declare type StoreModalIndexQueryResponse = {
         readonly rootCollections: {
             readonly edges: ReadonlyArray<{
                 readonly node: {
+                    readonly id: string;
                     readonly " $fragmentRefs": FragmentRefs<"StoreModalIndexItem_fontCollection">;
                 } | null;
             } | null> | null;

package/dist/__generated__/StoreModalIndexQuery.graphql.js

@@ -16,8 +16,8 @@ query StoreModalIndexQuery(
     rootCollections: fontCollections(onlyRoots: true, first: 99, excludeTags: $excludeTags) {
       edges {
         node {
-          ...StoreModalIndexItem_fontCollection
           id
+          ...StoreModalIndexItem_fontCollection
         }
       }
     }
@@ -85,21 +85,21 @@ const node = function () {
       "alias": null,
       "args": null,
       "kind": "ScalarField",
-      "name": "totalStyles",
+      "name": "id",
       "storageKey": null
     },
     v3 = {
       "alias": null,
       "args": null,
       "kind": "ScalarField",
-      "name": "isVariableFont",
+      "name": "totalStyles",
       "storageKey": null
     },
     v4 = {
       "alias": null,
       "args": null,
       "kind": "ScalarField",
-      "name": "id",
+      "name": "isVariableFont",
       "storageKey": null
     },
     v5 = {
@@ -143,7 +143,7 @@ const node = function () {
               "kind": "LinkedField",
               "name": "node",
               "plural": false,
-              "selections": [{
+              "selections": [v2 /*: any*/, {
                 "args": null,
                 "kind": "FragmentSpread",
                 "name": "StoreModalIndexItem_fontCollection"
@@ -192,7 +192,7 @@ const node = function () {
               "kind": "LinkedField",
               "name": "node",
               "plural": false,
-              "selections": [v2 /*: any*/, {
+              "selections": [v2 /*: any*/, v3 /*: any*/, {
                 "alias": null,
                 "args": [{
                   "kind": "Literal",
@@ -203,10 +203,10 @@ const node = function () {
                 "kind": "LinkedField",
                 "name": "children",
                 "plural": true,
-                "selections": [v3 /*: any*/, v2 /*: any*/, v4 /*: any*/],
+                "selections": [v4 /*: any*/, v3 /*: any*/, v2 /*: any*/],
 
                 "storageKey": "children(collectionTypes:[\"FAMILY\"])"
-              }, v4 /*: any*/, v5 /*: any*/, v3 /*: any*/, {
+              }, v5 /*: any*/, v4 /*: any*/, {
                 "alias": null,
                 "args": null,
                 "kind": "ScalarField",
@@ -238,10 +238,10 @@ const node = function () {
                     "kind": "ScalarField",
                     "name": "cssUrl",
                     "storageKey": null
-                  }, v4 /*: any*/],
+                  }, v2 /*: any*/],
 
                   "storageKey": null
-                }, v4 /*: any*/],
+                }, v2 /*: any*/],
 
                 "storageKey": null
               }],
@@ -250,21 +250,21 @@ const node = function () {
             "storageKey": null
           }],
           "storageKey": null
-        }, v4 /*: any*/],
+        }, v2 /*: any*/],
 
         "storageKey": null
       }]
     },
     "params": {
-      "cacheID": "6ffce75f636184d17f6e4b3e02d02482",
+      "cacheID": "0f5be213b1111b517d42ebde0348dcc4",
       "id": null,
       "metadata": {},
       "name": "StoreModalIndexQuery",
       "operationKind": "query",
-      "text": "query StoreModalIndexQuery(\n  $excludeTags: [String!]\n) {\n  viewer {\n    rootCollections: fontCollections(onlyRoots: true, first: 99, excludeTags: $excludeTags) {\n      edges {\n        node {\n          ...StoreModalIndexItem_fontCollection\n          id\n        }\n      }\n    }\n    id\n  }\n}\n\nfragment FontStyle_fontStyle on FontStyle {\n  cssFamily\n  name\n}\n\nfragment StoreModalIndexItem_fontCollection on FontCollection {\n  ...useTotalStyles_fontCollection\n  id\n  name\n  totalStyles\n  isVariableFont\n  children(collectionTypes: [FAMILY]) {\n    isVariableFont\n    totalStyles\n    id\n  }\n  collectionType\n  featureStyle {\n    ...FontStyle_fontStyle\n    family {\n      cssUrl\n      id\n    }\n    id\n  }\n}\n\nfragment useTotalStyles_fontCollection on FontCollection {\n  totalStyles\n  children(collectionTypes: [FAMILY]) {\n    isVariableFont\n    totalStyles\n    id\n  }\n}\n"
+      "text": "query StoreModalIndexQuery(\n  $excludeTags: [String!]\n) {\n  viewer {\n    rootCollections: fontCollections(onlyRoots: true, first: 99, excludeTags: $excludeTags) {\n      edges {\n        node {\n          id\n          ...StoreModalIndexItem_fontCollection\n        }\n      }\n    }\n    id\n  }\n}\n\nfragment FontStyle_fontStyle on FontStyle {\n  cssFamily\n  name\n}\n\nfragment StoreModalIndexItem_fontCollection on FontCollection {\n  ...useTotalStyles_fontCollection\n  id\n  name\n  totalStyles\n  isVariableFont\n  children(collectionTypes: [FAMILY]) {\n    isVariableFont\n    totalStyles\n    id\n  }\n  collectionType\n  featureStyle {\n    ...FontStyle_fontStyle\n    family {\n      cssUrl\n      id\n    }\n    id\n  }\n}\n\nfragment useTotalStyles_fontCollection on FontCollection {\n  totalStyles\n  children(collectionTypes: [FAMILY]) {\n    isVariableFont\n    totalStyles\n    id\n  }\n}\n"
     }
   };
 }();
-node.hash = 'd1a037f0551211a8f93528d5bb6e39fa';
+node.hash = '5eaa31564579fe1265790984a85d1a12';
 var _default = node;
 exports.default = _default;

package/dist/components/BuyButton/index.js

@@ -39,6 +39,7 @@ const BuyButtonBase = _ref => {
   }, [dispatch, collection]);
   (0, _react.useEffect)(() => {
     if (!collection) return;
+    console.log(`Populating ${collection.id}`);
     // populate as soon as BuyButton mounts. this prepares the StoreModal
     // to be able to apply discounts as soon as the user clicks "BUY" on
     // a style. (this is necessary if the bundle price is <= single style price)

package/dist/components/StoreModal/StoreModalIndex.js

@@ -15,16 +15,15 @@ const StoreModalIndex = _ref => {
   let {
     prepared
   } = _ref;
-  const data = (0, _reactRelay.usePreloadedQuery)(_StoreModalIndexQuery !== void 0 ? _StoreModalIndexQuery : (_StoreModalIndexQuery = require("../../__generated__/StoreModalIndexQuery.graphql"), _StoreModalIndexQuery.hash && _StoreModalIndexQuery.hash !== "d1a037f0551211a8f93528d5bb6e39fa" && console.error("The definition of 'StoreModalIndexQuery' appears to have changed. Run `relay-compiler` to update the generated files to receive the expected data."), _StoreModalIndexQuery), prepared.indexQuery);
+  const data = (0, _reactRelay.usePreloadedQuery)(_StoreModalIndexQuery !== void 0 ? _StoreModalIndexQuery : (_StoreModalIndexQuery = require("../../__generated__/StoreModalIndexQuery.graphql"), _StoreModalIndexQuery.hash && _StoreModalIndexQuery.hash !== "5eaa31564579fe1265790984a85d1a12" && console.error("The definition of 'StoreModalIndexQuery' appears to have changed. Run `relay-compiler` to update the generated files to receive the expected data."), _StoreModalIndexQuery), prepared.indexQuery);
   const viewer = data.viewer;
   const edges = (viewer === null || viewer === void 0 ? void 0 : (_viewer$rootCollectio = viewer.rootCollections) === null || _viewer$rootCollectio === void 0 ? void 0 : _viewer$rootCollectio.edges) ?? [];
   return /*#__PURE__*/_react.default.createElement(_StoreModalPageContainer.default, null, {
     title: 'All collections',
-    body: edges.map(edge => {
-      return /*#__PURE__*/_react.default.createElement(_StoreModalIndexItem.default, {
-        collection: edge.node
-      });
-    })
+    body: edges.map(edge => /*#__PURE__*/_react.default.createElement(_StoreModalIndexItem.default, {
+      collection: edge.node,
+      key: edge.node.id
+    }))
   });
 };
 var _default = StoreModalIndex;

package/dist/components/StoreModal/StoreModalReview.js

@@ -63,15 +63,9 @@ const StoreModalReview = _ref => {
     stripe = (0, _reactStripeJs.useStripe)();
     elements = (0, _reactStripeJs.useElements)();
   }
-  if (!order) return null;
-  if (order.completedWithCoupon) {
-    return /*#__PURE__*/_react.default.createElement(_StoreModalDownload.default, {
-      order: order
-    });
-  }
-  const billingIdentity = order.billingIdentity;
-  const lastShownTotal = (0, _react.useRef)((_order$total = order.total) === null || _order$total === void 0 ? void 0 : _order$total.amount);
+  const lastShownTotal = (0, _react.useRef)(order === null || order === void 0 ? void 0 : (_order$total = order.total) === null || _order$total === void 0 ? void 0 : _order$total.amount);
   const handleSubmit = () => {
+    if (!order) return;
     if (!billingIdentity) {
       console.error('No billing identity, required for payment');
       return;
@@ -159,6 +153,13 @@ const StoreModalReview = _ref => {
       route: 'checkout'
     });
   };
+  if (!order) return null;
+  if (order.completedWithCoupon) {
+    return /*#__PURE__*/_react.default.createElement(_StoreModalDownload.default, {
+      order: order
+    });
+  }
+  const billingIdentity = order.billingIdentity;
   return /*#__PURE__*/_react.default.createElement(_StoreModalPageContainer.default, null, {
     title: 'Review & pay',
     body: /*#__PURE__*/_react.default.createElement(_StoreModalReviewLayout.default, {

package/dist/components/StoreModal/StoreModalRouter.d.ts

@@ -1,6 +1,3 @@
 import React from 'react';
-export interface RouteState {
-    prepared: any;
-}
 declare const StoreModalRouter: React.FunctionComponent<{}>;
 export default StoreModalRouter;

package/dist/components/StoreModal/StoreModalRouter.js

@@ -5,26 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _StoreModalRouterContext = _interopRequireDefault(require("./StoreModalRouterContext"));
+var _reactRedux = require("react-redux");
+var _reactRelay = require("react-relay");
+var _routes = _interopRequireDefault(require("./routes"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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 StoreModalRouter = () => {
-  const router = (0, _react.useContext)(_StoreModalRouterContext.default);
-  const [routeEntry, setRouteEntry] = (0, _react.useState)(router.get());
-  (0, _react.useEffect)(() => {
-    const currentEntry = router.get();
-    if (currentEntry !== routeEntry) {
-      setRouteEntry(currentEntry);
-      return;
-    }
-    const dispose = router.subscribe(entry => {
-      setRouteEntry(entry);
-    });
-    return () => dispose();
-  }, [router]);
-  return /*#__PURE__*/_react.default.createElement(routeEntry.Component, {
-    prepared: routeEntry.prepared
+  const environment = (0, _reactRelay.useRelayEnvironment)();
+  const currentRoute = (0, _reactRedux.useSelector)(state => state.storeModalRoute);
+  const route = _routes.default[currentRoute.name];
+  (0, _react.useEffect)(() => {}, [currentRoute]);
+  const prepared = (0, _react.useMemo)(() => {
+    // @ts-ignore
+    return _routes.default[currentRoute.name].prepare(currentRoute.variables, environment);
+  }, [currentRoute, environment]);
+  return /*#__PURE__*/_react.default.createElement(route.Component, {
+    prepared: prepared
   });
 };
 var _default = StoreModalRouter;

package/dist/components/StoreModal/index.js

@@ -5,25 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _reactRedux = require("react-redux");
-var _reactRelay = require("react-relay");
 var _StoreModalLoader = _interopRequireDefault(require("./StoreModalLoader"));
 var _StoreModalContainer = _interopRequireDefault(require("./StoreModalContainer"));
 var _StoreModalRouter = _interopRequireDefault(require("./StoreModalRouter"));
-var _createRouter = _interopRequireDefault(require("./createRouter"));
-var _StoreModalRouterContext = _interopRequireDefault(require("./StoreModalRouterContext"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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 StoreModal = () => {
-  const store = (0, _reactRedux.useStore)();
-  const environment = (0, _reactRelay.useRelayEnvironment)();
-  const router = (0, _react.useRef)((0, _createRouter.default)(store, environment));
-  return /*#__PURE__*/_react.default.createElement(_StoreModalLoader.default, null, /*#__PURE__*/_react.default.createElement(_StoreModalRouterContext.default.Provider, {
-    value: router.current
-  }, /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+  return /*#__PURE__*/_react.default.createElement(_StoreModalLoader.default, null, /*#__PURE__*/_react.default.createElement(_react.Suspense, {
     fallback: null
-  }, /*#__PURE__*/_react.default.createElement(_StoreModalContainer.default, null, /*#__PURE__*/_react.default.createElement(_StoreModalRouter.default, null)))));
+  }, /*#__PURE__*/_react.default.createElement(_StoreModalContainer.default, null, /*#__PURE__*/_react.default.createElement(_StoreModalRouter.default, null))));
 };
 var _default = StoreModal;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontdue-js",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "main": "index.js",
   "scripts": {
     "build": "npm run relay && run-p build-js build-css build-ts-declarations",