diff --git a/.circleci/config.yml b/.circleci/config.yml index b5d80aedc..35e21b548 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,8 +10,8 @@ jobs: steps: - checkout - node/install: - node-version: 14.17.4 - npm-version: 6.14.14 + node-version: 16.17.0 + npm-version: 8.15.0 - restore_cache: keys: - node-deps-v3-{{ checksum "packages/web/package-lock.json" }} diff --git a/packages/j-db-client/package-lock.json b/packages/j-db-client/package-lock.json index f9556f4e4..d501a4576 100644 --- a/packages/j-db-client/package-lock.json +++ b/packages/j-db-client/package-lock.json @@ -1,35 +1,111 @@ { "name": "@journaly/j-db-client", - "version": "13.18.1", - "lockfileVersion": 1, + "version": "13.19.1", + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "@journaly/j-db-client", + "version": "13.19.1", + "license": "ISC", + "dependencies": { + "@prisma/client": "^3.15.2" + }, + "devDependencies": { + "prisma": "^3.15.2", + "typescript": "4.2.4" + } + }, + "node_modules/@prisma/client": { + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.15.2.tgz", + "integrity": "sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w==", + "hasInstallScript": true, + "dependencies": { + "@prisma/engines-version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + }, + "engines": { + "node": ">=12.6" + }, + "peerDependencies": { + "prisma": "*" + }, + "peerDependenciesMeta": { + "prisma": { + "optional": true + } + } + }, + "node_modules/@prisma/engines": { + "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", + "integrity": "sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg==", + "devOptional": true, + "hasInstallScript": true + }, + "node_modules/@prisma/engines-version": { + "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", + "integrity": "sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w==" + }, + "node_modules/prisma": { + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.15.2.tgz", + "integrity": "sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA==", + "devOptional": true, + "hasInstallScript": true, + "dependencies": { + "@prisma/engines": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + }, + "bin": { + "prisma": "build/index.js", + "prisma2": "build/index.js" + }, + "engines": { + "node": ">=12.6" + } + }, + "node_modules/typescript": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", + "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + } + }, "dependencies": { "@prisma/client": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.5.0.tgz", - "integrity": "sha512-LuaaisknLe9CCfJ1Rtqe9b9knvPgEEcC77OMmWdo3fSanxl5oTDxcH3IIhpULQQlJfZvDcaEXuXNU4dsNF+q1w==", + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.15.2.tgz", + "integrity": "sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w==", "requires": { - "@prisma/engines-version": "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" + "@prisma/engines-version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" } }, "@prisma/engines": { - "version": "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e.tgz", - "integrity": "sha512-MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g==", - "dev": true + "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", + "integrity": "sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg==", + "devOptional": true }, "@prisma/engines-version": { - "version": "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e.tgz", - "integrity": "sha512-X16YmBmj7Omso4ZbkNBe6gPYlNcnwZMUPtXsguCkn+KoMqm3DJD9M4X31gx0Gf13Q44dY3SKPJZUk44/XUj/WA==" + "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", + "integrity": "sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w==" }, "prisma": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.5.0.tgz", - "integrity": "sha512-WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg==", - "dev": true, + "version": "3.15.2", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.15.2.tgz", + "integrity": "sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA==", + "devOptional": true, "requires": { - "@prisma/engines": "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" + "@prisma/engines": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" } }, "typescript": { diff --git a/packages/j-db-client/package.json b/packages/j-db-client/package.json index 2a7494e85..d68fd6705 100644 --- a/packages/j-db-client/package.json +++ b/packages/j-db-client/package.json @@ -1,6 +1,6 @@ { "name": "@journaly/j-db-client", - "version": "13.19.0", + "version": "13.19.1", "description": "Journaly's internal database client.", "main": "dist/index", "scripts": { @@ -24,10 +24,10 @@ "author": "Journaly", "license": "ISC", "dependencies": { - "@prisma/client": "3.5.0" + "@prisma/client": "^3.15.2" }, "devDependencies": { - "prisma": "3.5.0", + "prisma": "^3.15.2", "typescript": "4.2.4" } } diff --git a/packages/web/components/FeatureComparisonTable/FeatureComparisonTable.tsx b/packages/web/components/FeatureComparisonTable/FeatureComparisonTable.tsx index 4dc4a313b..296e19e7f 100644 --- a/packages/web/components/FeatureComparisonTable/FeatureComparisonTable.tsx +++ b/packages/web/components/FeatureComparisonTable/FeatureComparisonTable.tsx @@ -20,9 +20,11 @@ const Feature = ({ name, plan, status }: FeatureProps) => { {name} diff --git a/packages/web/components/PostEditor/PostEditor.tsx b/packages/web/components/PostEditor/PostEditor.tsx index a084d68ce..4ab096b4a 100644 --- a/packages/web/components/PostEditor/PostEditor.tsx +++ b/packages/web/components/PostEditor/PostEditor.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react' -import { Editor, Descendant } from 'slate' +import { Editor } from 'slate' +import { TElement } from '@udecode/plate' import PostHeader from '@/components/PostHeader' import JournalyEditor from '@/components/JournalyEditor' @@ -28,7 +29,7 @@ type BasePostData = { smallSize: string largeSize: string } - body: Descendant[] + body: TElement[] } type OutputPostData = BasePostData & { @@ -88,7 +89,7 @@ const PostEditor: React.FC = ({ key: `${autosaveKey}:title`, debounceTime: 1000, }) - const [body, setBody, resetBody] = useAutosavedState(initialData.body, { + const [body, setBody, resetBody] = useAutosavedState(initialData.body, { initialTimestamp: initialData.timestamp, key: `${autosaveKey}:body`, debounceTime: 1000, diff --git a/packages/web/components/Site/Nav/Nav.tsx b/packages/web/components/Site/Nav/Nav.tsx index 30d5cc418..4877cd5fe 100644 --- a/packages/web/components/Site/Nav/Nav.tsx +++ b/packages/web/components/Site/Nav/Nav.tsx @@ -38,8 +38,6 @@ const Nav = () => {