From 07ba72f04077ed250ebabd1786ead6d431a09d6e Mon Sep 17 00:00:00 2001 From: Emma Hamilton Date: Wed, 21 Jun 2023 19:03:12 +1000 Subject: [PATCH 1/3] Use api route in app directory --- package-lock.json | 183 +++++++++++++++++++-- package.json | 4 +- src/app/api/keystatic/[...params]/route.ts | 6 + src/pages/api/keystatic/[[...params]].tsx | 15 -- 4 files changed, 174 insertions(+), 34 deletions(-) create mode 100644 src/app/api/keystatic/[...params]/route.ts delete mode 100644 src/pages/api/keystatic/[[...params]].tsx diff --git a/package-lock.json b/package-lock.json index 59333bb..dee2d28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "dependencies": { "@headlessui/react": "^1.7.14", "@heroicons/react": "^2.0.17", - "@keystatic/core": "^0.0.106", - "@keystatic/next": "^0.0.9", + "@keystatic/core": "^0.0.107", + "@keystatic/next": "^0.0.11", "@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/typography": "^0.5.9", "@types/node": "^18.16.5", @@ -359,6 +359,45 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.3.1.tgz", + "integrity": "sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==" + }, + "node_modules/@floating-ui/dom": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.4.2.tgz", + "integrity": "sha512-VKmvHVatWnewmGGy+7Mdy4cTJX71Pli6v/Wjb5RQBuq5wjUYx+Ef+kRThi8qggZqDgD8CogCpqhRoVp3+yQk+g==", + "dependencies": { + "@floating-ui/core": "^1.3.1" + } + }, + "node_modules/@floating-ui/react": { + "version": "0.24.3", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.3.tgz", + "integrity": "sha512-wWC9duiog4HmbgKSKObDRuXqMjZR/6m75MIG+slm5CVWbridAjK9STcnCsGYmdpK78H/GmzYj4ADVP8paZVLYQ==", + "dependencies": { + "@floating-ui/react-dom": "^2.0.1", + "aria-hidden": "^1.1.3", + "tabbable": "^6.0.1" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz", + "integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==", + "dependencies": { + "@floating-ui/dom": "^1.3.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, "node_modules/@formatjs/ecma402-abstract": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.15.0.tgz", @@ -631,29 +670,34 @@ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==" }, "node_modules/@keystatic/core": { - "version": "0.0.106", - "resolved": "https://registry.npmjs.org/@keystatic/core/-/core-0.0.106.tgz", - "integrity": "sha512-kjGMJt8a4mKxpSC0JwLOHDNvFUpLlQrYrfm0aL+GoH2FzRDaUp0tObyc+2u5oAFU07Oj0Cg97yhyuiVskYs/BA==", + "version": "0.0.107", + "resolved": "https://registry.npmjs.org/@keystatic/core/-/core-0.0.107.tgz", + "integrity": "sha512-7uAR4s+tAceTp7B2VtVfeseoxu32n/PPzoYs6HUPp55WDSA4p3Y4ZSm6oIejrR7YyXluZbiZjUMoLlGTNRTMPw==", "dependencies": { "@babel/runtime": "^7.18.3", "@braintree/sanitize-url": "^6.0.2", "@emotion/css": "^11.9.0", "@emotion/weak-memoize": "^0.3.0", + "@floating-ui/react": "^0.24.0", "@hapi/iron": "^7.0.0", "@markdoc/markdoc": "^0.3.0", "@react-aria/focus": "^3.12.1", "@react-aria/i18n": "^3.7.1", "@react-aria/interactions": "^3.15.1", "@react-aria/overlays": "^3.12.0", + "@react-aria/selection": "^3.12.0", "@react-aria/utils": "^3.17.0", "@react-aria/visually-hidden": "^3.6.1", "@react-stately/collections": "^3.5.0", "@react-stately/list": "^3.6.0", "@react-stately/overlays": "^3.4.3", + "@react-stately/utils": "^3.5.1", + "@react-types/shared": "^3.18.0", "@sindresorhus/slugify": "^1.1.2", "@ts-gql/tag": "^0.7.0", "@types/node": "16.11.13", - "@types/react": "^18.0.25", + "@types/react": "^18.2.8", + "@types/react-dom": "^18.0.11", "@urql/core": "^4.0.4", "@urql/exchange-auth": "^2.1.0", "@urql/exchange-graphcache": "^6.0.1", @@ -678,7 +722,7 @@ "@voussoir/nav-list": "^0.1.3", "@voussoir/notice": "^0.1.5", "@voussoir/number-field": "^0.1.6", - "@voussoir/overlays": "^0.1.7", + "@voussoir/overlays": "^0.1.8", "@voussoir/picker": "^0.1.6", "@voussoir/progress": "^0.1.3", "@voussoir/radio": "^0.1.6", @@ -697,6 +741,7 @@ "apply-ref": "^1.0.0", "cookie": "^0.5.0", "emery": "^1.4.1", + "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "graphql": "^16.6.0", "ignore": "^5.2.4", @@ -714,6 +759,13 @@ "minimatch": "^7.1.0", "pretty-format": "^29.0.1", "prismjs": "^1.29.0", + "prosemirror-commands": "^1.5.1", + "prosemirror-history": "^1.3.0", + "prosemirror-keymap": "^1.2.1", + "prosemirror-model": "^1.19.0", + "prosemirror-state": "^1.4.2", + "prosemirror-transform": "^1.7.1", + "prosemirror-view": "^1.30.2", "scroll-into-view-if-needed": "^3.0.3", "slate": "^0.91.4", "slate-history": "^0.86.0", @@ -733,12 +785,12 @@ "integrity": "sha512-eUXZzHLHoZqj1frtUetNkUetYoJ6X55UmrVnFD4DMhVeAmwLjniZhtBmsRiemQh4uq4G3vUra/Ws/hs9vEvL3Q==" }, "node_modules/@keystatic/next": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/@keystatic/next/-/next-0.0.9.tgz", - "integrity": "sha512-+GYdmtrvy1z/0bQo5TzpRMVEo2d9k9ULjiBzu9++1GYbTVU6w6a3dN7T8tv4afj+c6pXBJcqbYZBWJuttvsgqA==", + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/@keystatic/next/-/next-0.0.11.tgz", + "integrity": "sha512-bH+Sjp1RqGo2Q6uZQH9dqjFtdPOOe8+1B2T/2VxQP6W6fRs8XYGXmjtHim6M4WWS3i6WsfyQ5rzlqrJ4agUltg==", "dependencies": { "@babel/runtime": "^7.18.3", - "@types/react": "^18.0.25", + "@types/react": "^18.2.8", "chokidar": "^3.5.3", "server-only": "^0.0.1" }, @@ -2415,9 +2467,9 @@ "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" }, "node_modules/@types/react": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz", - "integrity": "sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==", + "version": "18.2.13", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.13.tgz", + "integrity": "sha512-vJ+zElvi/Zn9cVXB5slX2xL8PZodPCwPRDpittQdw43JR2AJ5k3vKdgJJyneV/cYgIbLQUwXa9JVDvUZXGba+Q==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3153,9 +3205,9 @@ } }, "node_modules/@voussoir/overlays": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/@voussoir/overlays/-/overlays-0.1.7.tgz", - "integrity": "sha512-5eA/lsSBDNhvSeoc3ueiYC4CSngJXhJ2ETRKWSsxxwa/H119fo4of2OmZjQdFf35E/17QQl+FcYBKKWGtfsaKg==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@voussoir/overlays/-/overlays-0.1.8.tgz", + "integrity": "sha512-7IOsxncW6GY8KHD4lYrQHNuW9VG6sj/1RCBnG+OSrW6t1fUvVyn9UqmdO+xu2S+vzo9mxklObS6RgVcUUrndLA==", "dependencies": { "@babel/runtime": "^7.18.3", "@react-aria/i18n": "^3.7.1", @@ -3669,6 +3721,17 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, + "node_modules/aria-hidden": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz", + "integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/aria-query": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", @@ -6780,6 +6843,11 @@ "node": ">= 0.8.0" } }, + "node_modules/orderedmap": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz", + "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==" + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -7170,6 +7238,72 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/prosemirror-commands": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.5.2.tgz", + "integrity": "sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==", + "dependencies": { + "prosemirror-model": "^1.0.0", + "prosemirror-state": "^1.0.0", + "prosemirror-transform": "^1.0.0" + } + }, + "node_modules/prosemirror-history": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.3.2.tgz", + "integrity": "sha512-/zm0XoU/N/+u7i5zepjmZAEnpvjDtzoPWW6VmKptcAnPadN/SStsBjMImdCEbb3seiNTpveziPTIrXQbHLtU1g==", + "dependencies": { + "prosemirror-state": "^1.2.2", + "prosemirror-transform": "^1.0.0", + "prosemirror-view": "^1.31.0", + "rope-sequence": "^1.3.0" + } + }, + "node_modules/prosemirror-keymap": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz", + "integrity": "sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==", + "dependencies": { + "prosemirror-state": "^1.0.0", + "w3c-keyname": "^2.2.0" + } + }, + "node_modules/prosemirror-model": { + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.19.2.tgz", + "integrity": "sha512-RXl0Waiss4YtJAUY3NzKH0xkJmsZupCIccqcIFoLTIKFlKNbIvFDRl27/kQy1FP8iUAxrjRRfIVvOebnnXJgqQ==", + "dependencies": { + "orderedmap": "^2.0.0" + } + }, + "node_modules/prosemirror-state": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.3.tgz", + "integrity": "sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==", + "dependencies": { + "prosemirror-model": "^1.0.0", + "prosemirror-transform": "^1.0.0", + "prosemirror-view": "^1.27.0" + } + }, + "node_modules/prosemirror-transform": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.7.3.tgz", + "integrity": "sha512-qDapyx5lqYfxVeUWEw0xTGgeP2S8346QtE7DxkalsXlX89lpzkY6GZfulgfHyk1n4tf74sZ7CcXgcaCcGjsUtA==", + "dependencies": { + "prosemirror-model": "^1.0.0" + } + }, + "node_modules/prosemirror-view": { + "version": "1.31.5", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.31.5.tgz", + "integrity": "sha512-tobRCDeCp61elR1d97XE/JTL9FDIfswZpWeNs7GKJjAJvWyMGHWYFCq29850p6bbG2bckP+i9n1vT56RifosbA==", + "dependencies": { + "prosemirror-model": "^1.16.0", + "prosemirror-state": "^1.0.0", + "prosemirror-transform": "^1.1.0" + } + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", @@ -7361,6 +7495,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rope-sequence": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz", + "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==" + }, "node_modules/run-applescript": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", @@ -7925,6 +8064,11 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/tabbable": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.1.2.tgz", + "integrity": "sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==" + }, "node_modules/tailwindcss": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz", @@ -8299,6 +8443,11 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, + "node_modules/w3c-keyname": { + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", + "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", diff --git a/package.json b/package.json index 7824fd6..1c62867 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "dependencies": { "@headlessui/react": "^1.7.14", "@heroicons/react": "^2.0.17", - "@keystatic/core": "^0.0.106", - "@keystatic/next": "^0.0.9", + "@keystatic/core": "^0.0.107", + "@keystatic/next": "^0.0.11", "@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/typography": "^0.5.9", "@types/node": "^18.16.5", diff --git a/src/app/api/keystatic/[...params]/route.ts b/src/app/api/keystatic/[...params]/route.ts new file mode 100644 index 0000000..28b0151 --- /dev/null +++ b/src/app/api/keystatic/[...params]/route.ts @@ -0,0 +1,6 @@ +import keystaticConfig from '@/app/keystatic/keystatic.config' +import { makeRouteHandler } from '@keystatic/next/route-handler' + +export const { POST, GET } = makeRouteHandler({ + config: keystaticConfig, +}) diff --git a/src/pages/api/keystatic/[[...params]].tsx b/src/pages/api/keystatic/[[...params]].tsx deleted file mode 100644 index ebe4f0f..0000000 --- a/src/pages/api/keystatic/[[...params]].tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { makeAPIRouteHandler } from '@keystatic/next/api' -import keystaticConfig from '@/app/keystatic/keystatic.config' - -export const config = { - api: { - bodyParser: { - sizeLimit: '20mb', - }, - responseLimit: '20mb', - }, -} - -export default makeAPIRouteHandler({ - config: keystaticConfig, -}) From d137ab7f5f1e04b30a83c9971981fbf733533a16 Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Wed, 5 Jul 2023 09:58:20 +1000 Subject: [PATCH 2/3] Update src/content/admin --- src/content/admin/index.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/admin/index.yaml b/src/content/admin/index.yaml index 246ecda..0c5be98 100644 --- a/src/content/admin/index.yaml +++ b/src/content/admin/index.yaml @@ -2,7 +2,7 @@ siteTitle: SydJS Meetup siteDescription: >- Join the vibrant and inclusive community of web developers discussing the latest in Javascript from Sydney, Australia. -homepageTitle: Welcome to the home of SydJS. +homepageTitle: Welcome to the new home of SydJS. homepageDescription: >- Join the vibrant and inclusive community of web developers discussing the latest in Javascript from Sydney, Australia. From 6ca813740e13348400bb98c5627cf84c891aae0c Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Wed, 5 Jul 2023 10:06:01 +1000 Subject: [PATCH 3/3] Update src/content/admin --- src/content/admin/index.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/admin/index.yaml b/src/content/admin/index.yaml index 0c5be98..246ecda 100644 --- a/src/content/admin/index.yaml +++ b/src/content/admin/index.yaml @@ -2,7 +2,7 @@ siteTitle: SydJS Meetup siteDescription: >- Join the vibrant and inclusive community of web developers discussing the latest in Javascript from Sydney, Australia. -homepageTitle: Welcome to the new home of SydJS. +homepageTitle: Welcome to the home of SydJS. homepageDescription: >- Join the vibrant and inclusive community of web developers discussing the latest in Javascript from Sydney, Australia.