Merge branch 'release' into main

bespoke-surf · Jul 7, 2023 · fc26ad3 · fc26ad3
2 parents a3e1ff5 + 8041e81
commit fc26ad3
Show file tree

Hide file tree

Showing 14 changed files with 781 additions and 563 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.10](https://github.com/bespoke-surf/bespoke/compare/v0.2.9...v0.2.10) (2023-07-07)
+
+**Note:** Version bump only for package bespoke
+
+
+
+
+
 ## [0.2.9](https://github.com/bespoke-surf/bespoke/compare/v0.2.8...v0.2.9) (2023-07-05)
 
 **Note:** Version bump only for package bespoke

diff --git a/apps/web/CHANGELOG.md b/apps/web/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.10](https://github.com/bespoke-surf/bespoke/compare/v0.2.9...v0.2.10) (2023-07-07)
+
+**Note:** Version bump only for package @bespoke/web
+
+
+
+
+
 ## [0.2.9](https://github.com/bespoke-surf/bespoke/compare/v0.2.8...v0.2.9) (2023-07-05)
 
 **Note:** Version bump only for package @bespoke/web

diff --git a/apps/web/app/routes/index/LandingPage/ComparisonTable.tsx b/apps/web/app/routes/index/LandingPage/ComparisonTable.tsx
@@ -96,7 +96,7 @@ export default function ComparisonTable() {
   const rootLoaderData = useRouteLoaderData("root") as RootData;
   return (
     <Box width="100%">
-      <Table accessibilityLabel="Table.RowDrawer example" stickyColumns={1}>
+      <Table accessibilityLabel="Table.RowDrawer example">
         <Table.Header>
           <Table.Row>
             <Table.HeaderCell>

diff --git a/apps/web/app/routes/onboarding/Hello.tsx b/apps/web/app/routes/onboarding/Hello.tsx
@@ -16,7 +16,7 @@ export default function Hello() {
       </Box>
       <Box marginTop={8}>
         <Text inline>
-          We're here to be your enthusiastic companions throughout every step of
+          We're here to be your enthusiastic companion throughout every step of
           your exhilarating journey!
         </Text>
       </Box>

diff --git a/apps/web/app/routes/onboarding/index.tsx b/apps/web/app/routes/onboarding/index.tsx
@@ -14,7 +14,7 @@ import {
 } from "@remix-run/react";
 import type { FormikConfig, FormikHelpers } from "formik";
 import { Formik } from "formik";
-import { Box, Button, Container, Dropdown, Flex, PageHeader } from "gestalt";
+import { Box, Button, Container, Flex } from "gestalt";
 import React, { useCallback, useState } from "react";
 import { sdk } from "~/graphql/graphqlWrapper.server";
 import { validateForm } from "~/utils/validateForm.server";
@@ -329,57 +329,27 @@ const FormikStepper: React.FC<
         return (
           <Form>
             <Container>
-              <PageHeader
-                borderStyle="none"
-                title=""
-                primaryAction={{
-                  component: (
+              <Flex justifyContent="center">
+                <Box width="91.5%" paddingY={6}>
+                  <Flex justifyContent="end" gap={1}>
+                    {step === 0 ? undefined : (
+                      <Button
+                        text="Back"
+                        onClick={backButtonClick}
+                        disabled={disableBackButton}
+                        color="gray"
+                        size="lg"
+                      />
+                    )}
                     <Button
-                      text={text}
-                      onClick={handleButtonClick}
                       size="lg"
                       color="red"
+                      text={text}
                       disabled={disableNext}
+                      onClick={handleButtonClick}
                     />
-                  ),
-                  dropdownItems: [
-                    <Dropdown.Item
-                      key="create"
-                      option={{
-                        value: "value",
-                        label: text,
-                      }}
-                      onSelect={handleButtonClick}
-                    />,
-                  ],
-                }}
-                secondaryAction={
-                  step === 0
-                    ? undefined
-                    : {
-                        component: (
-                          <Button
-                            onClick={backButtonClick}
-                            disabled={disableBackButton}
-                            size="lg"
-                            text="Back"
-                          />
-                        ),
-                        dropdownItems: [
-                          <Dropdown.Item
-                            key="create"
-                            option={{
-                              value: "back",
-                              label: "Back",
-                            }}
-                            onSelect={backButtonClick}
-                          />,
-                        ],
-                      }
-                }
-              />
-              <Flex justifyContent="center">
-                <Box width="91.5%" paddingY={6}>
+                  </Flex>
+                  <Box marginTop={4} />
                   {currentChild}
                 </Box>
               </Flex>

diff --git a/apps/web/app/routes/post.$postId/Controls.tsx b/apps/web/app/routes/post.$postId/Controls.tsx
@@ -20,7 +20,6 @@ import {
   Heading,
   IconButton,
   Layer,
-  Link,
   Modal,
   RadioGroup,
   SlimBanner,
@@ -356,13 +355,8 @@ const PublishModal = ({ close }: { close: () => void }) => {
               <Flex direction="column" gap={{ row: 0, column: 2 }}>
                 <Text weight="bold">Publishing method</Text>
                 <Text size="200" inline>
-                  You can publish to a list of subscribers or publish only here
-                  as a post.{" "}
-                  <Link display="inlineBlock" href="/tools/public-profile">
-                    <Text inline underline size="100">
-                      See how to view public website
-                    </Text>
-                  </Link>
+                  You can publish to a list of subscribers, or just publish
+                  here.
                 </Text>
               </Flex>
               <RadioGroup

diff --git a/apps/web/app/routes/pricing/FreePlan.tsx b/apps/web/app/routes/pricing/FreePlan.tsx
@@ -57,31 +57,33 @@ export const FreePlanDetails = () => {
   );
 };
 
+export const SelfHostedPlan = () => {
+  return (
+    <Module id="free" type="info" title="Self-Hosted">
+      <Flex direction="column" gap={8}>
+        <Text size="300">Free, forever</Text>
+        <Flex direction="row" justifyContent="between" alignItems="baseline">
+          <Box />
+          <Button
+            text="Self Host Guide"
+            href="https://github.com/bespoke-surf/bespoke#deploying-bespoke"
+            role="link"
+            size="lg"
+            color="blue"
+          />
+        </Flex>
+      </Flex>
+    </Module>
+  );
+};
+
 export const FreePlanHosted = () => {
   return (
     <>
       <Box display="none" smDisplay="none" mdDisplay="block" lgDisplay="block">
         <Flex justifyContent="between" gap={{ row: 4, column: 0 }}>
           <Flex.Item flex="grow">
-            <Module id="free" type="info" title="Self-Hosted">
-              <Flex direction="column" gap={8}>
-                <Text size="300">Free, forever</Text>
-                <Flex
-                  direction="row"
-                  justifyContent="between"
-                  alignItems="baseline"
-                >
-                  <Box />
-                  <Button
-                    text="Self Host Guide"
-                    href="https://github.com/bespoke-surf/bespoke#deploying-bespoke"
-                    role="link"
-                    size="lg"
-                    color="blue"
-                  />
-                </Flex>
-              </Flex>
-            </Module>
+            <SelfHostedPlan />
           </Flex.Item>
           <Box
             marginStart={12}
@@ -95,7 +97,7 @@ export const FreePlanHosted = () => {
         </Flex>
       </Box>
       <Box display="block" smDisplay="block" mdDisplay="none" lgDisplay="none">
-        <FreePlanModal />
+        <SelfHostedPlan />
       </Box>
     </>
   );
@@ -104,7 +106,7 @@ export const FreePlanHosted = () => {
 export const FreePlanDetailsHosted = () => {
   return (
     <Flex gap={2} direction="column">
-      <Details data="Open Source under MIT Licence" type="success" />
+      <Details data="Open Source" type="success" />
       <Details data="Everthing under Cloud Free Plan" type="success" />
       <Details data="REST API" type="success" />
       <Details data="Unlimited Sign-up Forms" type="success" />

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bespoke/web",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "private": true,
   "sideEffects": false,
   "scripts": {
@@ -17,8 +17,8 @@
     "lint": "eslint --fix-dry-run"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.363.0",
-    "@bespoke/common": "^0.2.9",
+    "@aws-sdk/client-s3": "^3.367.0",
+    "@bespoke/common": "^0.2.10",
     "@clayui/css": "^3.99.0",
     "@clayui/slider": "^3.96.0",
     "@lexical/code": "^0.11.1",
@@ -39,13 +39,13 @@
     "@remix-validated-form/with-yup": "^3.0.1",
     "@sentry/remix": "^7.57.0",
     "@shopify/address": "^4.1.0",
-    "@uppy/core": "^3.2.1",
+    "@uppy/core": "^3.3.0",
     "@uppy/dashboard": "^3.4.1",
     "@uppy/drag-drop": "^3.0.2",
     "@uppy/file-input": "^3.0.2",
     "@uppy/progress-bar": "^3.0.2",
     "@uppy/react": "^3.1.2",
-    "@uppy/xhr-upload": "^3.3.0",
+    "@uppy/xhr-upload": "^3.3.1",
     "@use-effect/did-update": "^0.0.3",
     "@welldone-software/why-did-you-render": "^7.0.1",
     "axios": "^1.4.0",
@@ -56,8 +56,8 @@
     "dayjs": "^1.11.9",
     "dotenv": "^16.3.1",
     "formik": "^2.4.2",
-    "gestalt": "117.2.2",
-    "gestalt-datepicker": "^117.2.2",
+    "gestalt": "117.3.1",
+    "gestalt-datepicker": "^117.3.1",
     "graphql": "^16.7.1",
     "graphql-tag": "^2.12.6",
     "immer": "^9.0.19",
@@ -66,18 +66,18 @@
     "lodash": "^4.17.21",
     "millify": "^6.1.0",
     "papaparse": "^5.4.1",
-    "posthog-js": "^1.68.5",
+    "posthog-js": "^1.69.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
     "react-intersection-observer": "^9.5.2",
-    "react-textarea-autosize": "^8.5.1",
+    "react-textarea-autosize": "^8.5.2",
     "react-use-clipboard": "^1.0.9",
     "react-virtual": "^2.10.4",
     "react-waypoint": "^10.3.0",
     "reactflow": "^11.7.4",
     "remix-etag": "^1.0.0",
-    "remix-utils": "^6.5.0",
+    "remix-utils": "^6.6.0",
     "remix-validated-form": "^5.0.2",
     "slug": "^8.2.2",
     "suspend-concurrently": "^0.5.0",
@@ -95,7 +95,7 @@
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@remix-run/dev": "^1.18.1",
     "@remix-run/eslint-config": "^1.18.1",
-    "@swc/core": "^1.3.67",
+    "@swc/core": "^1.3.68",
     "@types/css": "^0.0.33",
     "@types/dagre": "^0.7.48",
     "@types/jsdom": "^21.1.1",
@@ -104,13 +104,13 @@
     "@types/react-dom": "^18.2.6",
     "@types/react-email-editor": "^1.5.1",
     "@types/slug": "^5.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
     "dotenv-cli": "^7.2.1",
     "eslint": "^8.44.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-gestalt": "^116.1.6",
-    "remix-flat-routes": "^0.5.8",
+    "eslint-plugin-gestalt": "^117.3.1",
+    "remix-flat-routes": "^0.5.10",
     "rimraf": "^5.0.1",
     "s3-folder-upload": "^2.3.5",
     "typescript": "^4.9.5"

diff --git a/lerna.json b/lerna.json
@@ -6,7 +6,7 @@
   "apps": [
     "*"
   ],
-  "version": "0.2.9",
+  "version": "0.2.10",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.10](https://github.com/bespoke-surf/bespoke/compare/v0.2.9...v0.2.10) (2023-07-07)
+
+**Note:** Version bump only for package @bespoke/common
+
+
+
+
+
 ## [0.2.9](https://github.com/bespoke-surf/bespoke/compare/v0.2.8...v0.2.9) (2023-07-05)
 
 **Note:** Version bump only for package @bespoke/common

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bespoke/common",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -10,7 +10,7 @@
     "dist/**"
   ],
   "devDependencies": {
-    "postcss": "^8.4.24",
+    "postcss": "^8.4.25",
     "tsup": "^7.1.0",
     "typescript": "^4.9.5"
   },

diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.10](https://github.com/bespoke-surf/bespoke/compare/v0.2.9...v0.2.10) (2023-07-07)
+
+**Note:** Version bump only for package @bespoke/server
+
+
+
+
+
 ## [0.2.9](https://github.com/bespoke-surf/bespoke/compare/v0.2.8...v0.2.9) (2023-07-05)
 
 **Note:** Version bump only for package @bespoke/server