diff --git a/app/api/package.json b/app/api/package.json index 5af9c78..112cdce 100644 --- a/app/api/package.json +++ b/app/api/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "^0.36.3", + "@redwoodjs/api": "^0.36.4", "@sentry/node": "^6.5.1", "axios": "^0.21.1", "cloudinary": "^1.23.0", @@ -20,4 +20,4 @@ "concurrently": "^6.0.0", "nodemon": "^2.0.7" } -} +} \ No newline at end of file diff --git a/app/api/src/docker/aws-emulator.js b/app/api/src/docker/aws-emulator.js index 903303b..239d8a0 100644 --- a/app/api/src/docker/aws-emulator.js +++ b/app/api/src/docker/aws-emulator.js @@ -1,7 +1,6 @@ const express = require('express') var cors = require('cors') const axios = require('axios') -const { restart } = require('nodemon') const app = express() const port = 8080 app.use(express.json()) diff --git a/app/api/src/lib/sentry.ts b/app/api/src/lib/sentry.ts index bbabe5c..b20be6f 100644 --- a/app/api/src/lib/sentry.ts +++ b/app/api/src/lib/sentry.ts @@ -1,5 +1,5 @@ import * as Sentry from '@sentry/node' -import { context, Config, ApolloError } from '@redwoodjs/api' +import { Config, ApolloError } from '@redwoodjs/api' let sentryInitialized = false if (process.env.SENTRY_DSN && !sentryInitialized) { diff --git a/app/api/src/services/projects/projects.ts b/app/api/src/services/projects/projects.ts index 6add1d6..2f0c806 100644 --- a/app/api/src/services/projects/projects.ts +++ b/app/api/src/services/projects/projects.ts @@ -12,7 +12,6 @@ import { } from 'src/services/helpers' import { requireAuth } from 'src/lib/auth' import { requireOwnership, requireProjectOwnership } from 'src/lib/owner' -import { socialCard } from '../socialCards/socialCards' export const projects = ({ userName }) => { if (!userName) { diff --git a/app/package.json b/app/package.json index ce57b74..d78d8c7 100644 --- a/app/package.json +++ b/app/package.json @@ -12,7 +12,7 @@ "aws-emulate": "nodemon ./api/src/docker/aws-emulator.js" }, "devDependencies": { - "@redwoodjs/core": "^0.36.3" + "@redwoodjs/core": "^0.36.4" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config", diff --git a/app/web/package.json b/app/web/package.json index 1dd0060..0d7a885 100644 --- a/app/web/package.json +++ b/app/web/package.json @@ -19,10 +19,10 @@ "@monaco-editor/react": "^4.0.11", "@react-three/drei": "^7.3.1", "@react-three/fiber": "^7.0.5", - "@redwoodjs/auth": "^0.36.3", - "@redwoodjs/forms": "^0.36.3", - "@redwoodjs/router": "^0.36.3", - "@redwoodjs/web": "^0.36.3", + "@redwoodjs/auth": "^0.36.4", + "@redwoodjs/forms": "^0.36.4", + "@redwoodjs/router": "^0.36.4", + "@redwoodjs/web": "^0.36.4", "@sentry/browser": "^6.5.1", "@tailwindcss/aspect-ratio": "0.2.1", "axios": "^0.21.1", @@ -61,4 +61,4 @@ "raw-loader": "^4.0.2", "tailwindcss": "^2.2.7" } -} +} \ No newline at end of file diff --git a/app/web/src/components/EditableProjecTitle/EditableProjecTitle.tsx b/app/web/src/components/EditableProjecTitle/EditableProjecTitle.tsx index ccc0333..efc8733 100644 --- a/app/web/src/components/EditableProjecTitle/EditableProjecTitle.tsx +++ b/app/web/src/components/EditableProjecTitle/EditableProjecTitle.tsx @@ -24,7 +24,7 @@ const EditableProjectTitle = ({ const [newTitle, setNewTitle] = useState(projectTitle) const inputRef = React.useRef(null) - const { updateProject, loading, error } = useUpdateProject({ + const { updateProject } = useUpdateProject({ onCompleted: ({ updateProject }) => { const routeVars = { userName: updateProject.user.userName, diff --git a/app/web/src/components/EditorMenu/EditorMenu.tsx b/app/web/src/components/EditorMenu/EditorMenu.tsx index 33c0517..7475e11 100644 --- a/app/web/src/components/EditorMenu/EditorMenu.tsx +++ b/app/web/src/components/EditorMenu/EditorMenu.tsx @@ -23,7 +23,7 @@ const EditorMenu = () => { key={menu.label + '-dropdown'} > {menu.items.map((itemConfig) => ( - { + Component: (props) => { const { state, config } = props const handleRender = useRender() const saveCode = useSaveCode() @@ -37,7 +37,7 @@ const fileMenuConfig: EditorMenuConfig = { label: 'Download STL', shortcut: 'ctrl+shift+d, command+shift+d', shortcutLabel: cmdOrCtrl() + ' Shift D', - component: (props) => { + Component: (props) => { const { state, thunkDispatch, config } = props const handleStlDownload = makeStlDownloadHandler({ type: state.objectData?.type, @@ -56,14 +56,14 @@ const fileMenuConfig: EditorMenuConfig = { ], } -const editMenuConfig = { +const editMenuConfig: EditorMenuConfig = { name: 'edit', label: 'Edit', disabled: true, items: [], } -const viewMenuConfig = { +const viewMenuConfig: EditorMenuConfig = { name: 'view', label: 'View', disabled: false, @@ -72,7 +72,7 @@ const viewMenuConfig = { label: 'Reset layout', shortcut: 'ctrl+shift+r', shortcutLabel: 'Ctrl Shift R', - component: (props) => { + Component: (props) => { const { config, thunkDispatch } = props config.callback = () => thunkDispatch({ type: 'resetLayout' }) return @@ -82,7 +82,7 @@ const viewMenuConfig = { label: 'All shortcuts', shortcut: 'ctrl+shift+/', shortcutLabel: 'Ctrl Shift /', - component: (props) => { + Component: (props) => { const { config } = props const { toggleOpen } = useShortcutsModalContext() config.callback = toggleOpen @@ -98,7 +98,7 @@ export interface EditorMenuItemConfig { label: string shortcut: string shortcutLabel: React.ReactElement | string - component: (props: any) => React.ReactElement + Component: (props: any) => React.ReactElement } export interface EditorMenuConfig { diff --git a/app/web/src/helpers/cadPackages/jsCad/jscadParams.ts b/app/web/src/helpers/cadPackages/jsCad/jscadParams.ts index c990902..855579a 100644 --- a/app/web/src/helpers/cadPackages/jsCad/jscadParams.ts +++ b/app/web/src/helpers/cadPackages/jsCad/jscadParams.ts @@ -1,8 +1,6 @@ import { - CadhubNumberChoiceParam, CadhubNumberOption, CadhubParams, - CadhubStringChoiceParam, CadhubStringOption, } from 'src/components/Customizer/customizerConverter' diff --git a/app/web/src/helpers/cadPackages/jsCad/jscadWorker.ts b/app/web/src/helpers/cadPackages/jsCad/jscadWorker.ts index 3f8f6a1..fef0383 100644 --- a/app/web/src/helpers/cadPackages/jsCad/jscadWorker.ts +++ b/app/web/src/helpers/cadPackages/jsCad/jscadWorker.ts @@ -5,8 +5,6 @@ const setPoints = (points, p, i) => { } function CSG2Vertices(csg) { - const idx = 0 - let vLen = 0, iLen = 0 for (const poly of csg.polygons) { @@ -178,7 +176,6 @@ function parseParams(script) { let i = 0, line, - next, lineNum while (i < lines.length) { line = lines[i].code.trim() @@ -194,7 +191,6 @@ function parseParams(script) { while (i < lines.length) { line = lines[i].code lineNum = lines[i].line - next = lines[i + 1] ? lines[i + 1].code : '' if (line[0] === '}') break if (line[0] === '/') { @@ -593,7 +589,7 @@ const makeRenderWorker = () => { } } - const updateAndRender = (timestamp) => { + const updateAndRender = () => { renderTimer = null doRotatePanZoom() @@ -607,7 +603,6 @@ const makeRenderWorker = () => { state.camera.position = updates.camera.position perspectiveCamera.update(state.camera) renderOptions.entities = [gridOptions, axisOptions, ...entities] - const time = Date.now() renderer(renderOptions) if (updateRender) { updateRender = '' diff --git a/app/web/src/helpers/cadPackages/openScad/openScadController.ts b/app/web/src/helpers/cadPackages/openScad/openScadController.ts index b4bde9f..ceb00e5 100644 --- a/app/web/src/helpers/cadPackages/openScad/openScadController.ts +++ b/app/web/src/helpers/cadPackages/openScad/openScadController.ts @@ -75,7 +75,7 @@ export const render = async ({ code, settings }: RenderArgs) => { } } -export const stl = async ({ code, settings }: RenderArgs) => { +export const stl = async ({ code /*settings*/ }: RenderArgs) => { const body = JSON.stringify({ settings: {}, file: code, diff --git a/app/web/src/helpers/canvasToBlob.ts b/app/web/src/helpers/canvasToBlob.ts index 33d2d65..7d81435 100644 --- a/app/web/src/helpers/canvasToBlob.ts +++ b/app/web/src/helpers/canvasToBlob.ts @@ -21,7 +21,7 @@ export const canvasToBlob = async ( } const oldSize = threeInstance.size updateCanvasSize({ width, height }) - const imgBlobPromise: Promise = new Promise((resolve, reject) => { + const imgBlobPromise: Promise = new Promise((resolve) => { threeInstance.gl.domElement.toBlob( (blob) => { resolve(blob) @@ -34,8 +34,8 @@ export const canvasToBlob = async ( return imgBlobPromise } -export const blobTo64 = async (blob: Blob): Promise => { - return new Promise(async (resolve, reject) => { +export const blobTo64 = (blob: Blob): Promise => { + return new Promise((resolve, reject) => { const reader = new FileReader() reader.onloadend = () => { if (typeof reader.result === 'string') { diff --git a/app/web/src/layouts/MainLayout/MainLayout.js b/app/web/src/layouts/MainLayout/MainLayout.js index 811eff0..b56cfc8 100644 --- a/app/web/src/layouts/MainLayout/MainLayout.js +++ b/app/web/src/layouts/MainLayout/MainLayout.js @@ -22,28 +22,6 @@ const MainLayout = ({ children, shouldRemoveFooterInIde }) => { const { logOut, isAuthenticated, currentUser, client } = useAuth() const { user, loading } = useUser() const [isLoginModalOpen, setIsLoginModalOpen] = useState(false) - const [isOpen, setIsOpen] = useState(false) - const [anchorEl, setAnchorEl] = useState(null) - const [popoverId, setPopoverId] = useState(undefined) - const openPopover = (target) => { - setAnchorEl(target) - setPopoverId('simple-popover') - setIsOpen(true) - } - - const closePopover = () => { - setAnchorEl(null) - setPopoverId(undefined) - setIsOpen(false) - } - - const togglePopover = ({ currentTarget }) => { - if (isOpen) { - return closePopover() - } - - openPopover(currentTarget) - } const recordedLogin = () => { ReactGA.event({ diff --git a/app/web/src/pages/SocialCardPage/SocialCardPage.tsx b/app/web/src/pages/SocialCardPage/SocialCardPage.tsx index ce280e2..cb85fa2 100644 --- a/app/web/src/pages/SocialCardPage/SocialCardPage.tsx +++ b/app/web/src/pages/SocialCardPage/SocialCardPage.tsx @@ -1,4 +1,3 @@ -import { Link, routes } from '@redwoodjs/router' import SocialCardCell from 'src/components/SocialCardCell' interface Props { diff --git a/app/yarn.lock b/app/yarn.lock index 02984a2..c07492d 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2476,21 +2476,12 @@ resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz" integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q== -"@prisma/client@2.30.0": - version "2.30.0" - resolved "https://registry.npmjs.org/@prisma/client/-/client-2.30.0.tgz" - integrity sha512-tjJNHVfgyNOwS2F+AkjMMCJGPnXzHuUCrOnAMJyidAu4aNzxbJ8jWwjt96rRMpyrg9Hwen3xqqQ2oA+ikK7nhQ== +"@prisma/client@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.30.3.tgz#49c1015e2cec26a44b20c62eb2fd738cb0bb043b" + integrity sha512-Ey2miZ+Hne12We3rA8XrlPoAF0iuKEhw5IK2nropaelSt0Ju3b2qSz9Qt50a/1Mx3+7yRSu/iSXt8y9TUMl/Yw== dependencies: - "@prisma/engines-version" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - -"@prisma/debug@2.29.1": - version "2.29.1" - resolved "https://registry.npmjs.org/@prisma/debug/-/debug-2.29.1.tgz" - integrity sha512-8OAh4ozVCvlcZU1HaP7QTWIA6Aqzs98nYgTYrxjDLqXJcytIvpIjHxfgqKhuPQ8MTkUm9cI5TJGswwcjJt0/0g== - dependencies: - "@types/debug" "4.1.7" - debug "4.3.2" - ms "2.1.3" + "@prisma/engines-version" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" "@prisma/debug@2.30.0": version "2.30.0" @@ -2501,15 +2492,24 @@ debug "4.3.2" ms "2.1.3" -"@prisma/engine-core@2.30.0": - version "2.30.0" - resolved "https://registry.npmjs.org/@prisma/engine-core/-/engine-core-2.30.0.tgz" - integrity sha512-wy9B1dJLGv5u/E6LbjobEjEfhCVf9++2L3OLAAk9hfg4cCqwY4629woJ1m3w5FWLy29HSnZKgpvQ/8lz1dUbMA== +"@prisma/debug@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.30.3.tgz#2c10a4aa4c99728d0f13d64036eca9521352b0d4" + integrity sha512-hMsCl6ZA718vgKuTRd1+qeetzGSVkZEIEUTfeT5rPtklgqDytQ01nRNN74gLeoSI64tyGg/pvSX1wgAioMuyiQ== dependencies: - "@prisma/debug" "2.30.0" - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/generator-helper" "2.30.0" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@types/debug" "4.1.7" + debug "4.3.2" + ms "2.1.3" + +"@prisma/engine-core@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.30.3.tgz#ec0675cdb0ee25e27fd771fd90b998616ac2dc1f" + integrity sha512-5wVfwRiEgCHgd6/V7ZaegsBT5lJ/RuF/vRgFKKEqVfeGvSQAkm3GtuvhDdIcjovJPazfQciJM8zaG8Pu3bdgWw== + dependencies: + "@prisma/debug" "2.30.3" + "@prisma/engines" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + "@prisma/generator-helper" "2.30.3" + "@prisma/get-platform" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" chalk "4.1.2" execa "5.1.1" get-stream "6.0.1" @@ -2519,23 +2519,23 @@ terminal-link "2.1.1" undici "3.3.6" -"@prisma/engines-version@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz" - integrity sha512-oThNpx7HtJ0eEmnvrWARYcNCs6dqFdAK3Smt2bJVDD6Go4HLuuhjx028osP+rHaFrGOTx7OslLZYtvvFlAXRDA== +"@prisma/engines-version@2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20": + version "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20.tgz#d5ef55c92beeba56e52bba12b703af0bfd30530d" + integrity sha512-/iDRgaoSQC77WN2oDsOM8dn61fykm6tnZUAClY+6p+XJbOEgZ9gy4CKuKTBgrjSGDVjtQ/S2KGcYd3Ring8xaw== -"@prisma/engines@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.npmjs.org/@prisma/engines/-/engines-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz" - integrity sha512-LPKq88lIbYezvX0OOc1PU42hHdTsSMPJWmK8lusaHK7DaLHyXjDp/551LbsVapypbjW6N3Jx/If6GoMDASSMSw== +"@prisma/engines@2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20": + version "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20.tgz#2df768aa7c9f84acaa1f35c970417822233a9fb1" + integrity sha512-WPnA/IUrxDihrRhdP6+8KAVSwsc0zsh8ioPYsLJjOhzVhwpRbuFH2tJDRIAbc+qFh+BbTIZbeyBYt8fpNXaYQQ== -"@prisma/fetch-engine@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz" - integrity sha512-62/gM4Gm+e1BQlgj4OFmdQKa22nWg5FZ6hNsoRHopcm45RRhnSHqYiD+9djo/98i1/+MYfwxCwPqhhJm28lJuw== +"@prisma/fetch-engine@2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20": + version "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20.tgz#c5a9c0df6c7df27eb3162b38e384c02caa4aff7e" + integrity sha512-kGbNAtmke1DP9Lj9kFFJp39t7IaQu7mKCGdjQT3+DzgXRLtHmv92zNguGuSVj+E+GBfBvzLOs4yBtUIU8KIgQw== dependencies: - "@prisma/debug" "2.29.1" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@prisma/debug" "2.30.0" + "@prisma/get-platform" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" chalk "^4.0.0" execa "^5.0.0" find-cache-dir "^3.3.1" @@ -2552,34 +2552,34 @@ temp-dir "^2.0.0" tempy "^1.0.0" -"@prisma/generator-helper@2.30.0": - version "2.30.0" - resolved "https://registry.npmjs.org/@prisma/generator-helper/-/generator-helper-2.30.0.tgz" - integrity sha512-7XKJM83LLrpDSqiDrINaBqtePUJomgxfiofIx0TM5pBIg2vmWwpe5Q+VDQxr88ypqVW83NW6BfPgTm7Qni4+mQ== +"@prisma/generator-helper@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.30.3.tgz#bf0405d1ff9a4d34776c0b76c1565638f4a4c55e" + integrity sha512-HM43m9RHlDzC8yZJaPIDDfPChiXGC4l3oH85Esxn2F/bVvP60VSpXC+EHHzBRhexDpNgpRNQBHqQJoxbo+O/1Q== dependencies: - "@prisma/debug" "2.30.0" + "@prisma/debug" "2.30.3" "@types/cross-spawn" "6.0.2" chalk "4.1.2" cross-spawn "7.0.3" -"@prisma/get-platform@2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb": - version "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - resolved "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb.tgz" - integrity sha512-gqB9defmpCvxvQM9HFNpo1s0G652eE556ckO+k9X1Kfbt1vaX6FuxtQD5IPcu0nDm42u3NTkX9lDR1Y0j5VPng== - dependencies: - "@prisma/debug" "2.29.1" - -"@prisma/sdk@2.30.0": - version "2.30.0" - resolved "https://registry.npmjs.org/@prisma/sdk/-/sdk-2.30.0.tgz" - integrity sha512-bIYLphnGnfoguFfKiHon/RZhMTAk8gpElUos1+O7RHzDdzqPEusyl8T9lX123zxhmeVocyV0V2y/AxaD5USaxg== +"@prisma/get-platform@2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20": + version "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20.tgz#bcf2146792376c2606424acdbb41eac5688c1217" + integrity sha512-MPAwDBpWpEMRwlxx+P3DTOti5cZuuthtRLel5FK3QE4rN45jF4IN4Xi1baNv/04uYhrwKztQmMH30YwgCFdMtw== dependencies: "@prisma/debug" "2.30.0" - "@prisma/engine-core" "2.30.0" - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/fetch-engine" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" - "@prisma/generator-helper" "2.30.0" - "@prisma/get-platform" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + +"@prisma/sdk@2.30.3": + version "2.30.3" + resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.30.3.tgz#85d7f8d6b911fb93d239ce825f84d66445bf3ad3" + integrity sha512-+6pIH78gqk1N4ZNn0oP5tXx3hpfySv8kMrKxsu3Cc9l3g/Zw4tk/HauTzWYW2r+fdNwNBzQS/aMoCvrPU+RKXg== + dependencies: + "@prisma/debug" "2.30.3" + "@prisma/engine-core" "2.30.3" + "@prisma/engines" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + "@prisma/fetch-engine" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" + "@prisma/generator-helper" "2.30.3" + "@prisma/get-platform" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" "@timsuchanek/copy" "1.4.5" archiver "4.0.2" arg "5.0.1" @@ -2740,10 +2740,10 @@ utility-types "^3.10.0" zustand "^3.5.1" -"@redwoodjs/api-server@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/api-server/-/api-server-0.36.3.tgz" - integrity sha512-9hhn6rJSEo08IxzFmcZK5n5wdqiRdY3wBRs1JfM6zZDGvus+4Jwj9erK7pDLPeJilJazOtB/0gGW5JQnjE58yw== +"@redwoodjs/api-server@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/api-server/-/api-server-0.36.4.tgz#eaf517a4f6253f8fa1b363de2bc0bac36ab2a361" + integrity sha512-ZIhat9fMwx2yRmIrIjtayipR3Aa2hMw5V7h7nl3HcR+yRI5PA7fmBDqXrWDK7duPP8jiLUr0JnpylTF8wi566Q== dependencies: ansi-colors "4.1.1" body-parser "1.19.0" @@ -2759,13 +2759,13 @@ youch "2.2.2" youch-terminal "1.1.1" -"@redwoodjs/api@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/api/-/api-0.36.3.tgz" - integrity sha512-Qcgsk/4nw4lbPIWD3Q+6f1cnJ4s8G52edVkkf6tJuQ6D3He4whJc0PVpfDOGymSJs3DA49C7TFuRfaV+W22QBA== +"@redwoodjs/api@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.36.4.tgz#3d2990ebd7c9fa9ae0197885f9eb87128a6ead02" + integrity sha512-1aa1aUjteXqeoNUPvdhiuTjm7t/cW47AwLt8jNZQtNoIkgUwmGoBJzvzS1QsylsklcHqWr0119ZHg4/FZnhqTA== dependencies: "@graphql-tools/merge" "7.0.0" - "@prisma/client" "2.30.0" + "@prisma/client" "2.30.3" "@types/pino" "6.3.11" apollo-server-lambda "2.25.2" core-js "3.16.1" @@ -2781,21 +2781,21 @@ pino-pretty "5.1.3" uuid "8.3.2" -"@redwoodjs/auth@0.36.3", "@redwoodjs/auth@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/auth/-/auth-0.36.3.tgz" - integrity sha512-FYJfwrEuByrELrcxCBHKO3clvlTFUJii9wogxYg/ojzAMbbbjo0QF/DSHobpiE95GSyXb9LTUtaaHqGc0Y4R1g== +"@redwoodjs/auth@0.36.4", "@redwoodjs/auth@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.36.4.tgz#b9d14744f3fceb8f9c7c656272441cee56121015" + integrity sha512-XOtNfy5vC2SRYx0FG0GFa4W7QPzvo+6HWnmeXzmPS/sq5vLL7qS/2OYV01u6xexlEg/vch8GnuJ3MJy9OiTY1Q== -"@redwoodjs/cli@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/cli/-/cli-0.36.3.tgz" - integrity sha512-ItsjxjeAXYwN+Ax0SZB3DZtuMZP0H0HuEgPgLPuzVAwIueVLw21dooM1Hq8ggHjkDAY+rgKJwcEN2qzxpo/QkA== +"@redwoodjs/cli@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.36.4.tgz#2d0e75052d85e132a2d3c33e8132a9238579fb4c" + integrity sha512-AoYHD20aPqdl8rTnG2a3dbWjdJY2nL3B1fd/gcaTeSkwwl6FqtCpC7cCdSEPNkO9pjM9HOYYvgawQNr7TAPtXA== dependencies: - "@prisma/sdk" "2.30.0" - "@redwoodjs/api-server" "0.36.3" - "@redwoodjs/internal" "0.36.3" - "@redwoodjs/prerender" "0.36.3" - "@redwoodjs/structure" "0.36.3" + "@prisma/sdk" "2.30.3" + "@redwoodjs/api-server" "0.36.4" + "@redwoodjs/internal" "0.36.4" + "@redwoodjs/prerender" "0.36.4" + "@redwoodjs/structure" "0.36.4" boxen "5.0.1" camelcase "6.2.0" chalk "4.1.2" @@ -2817,17 +2817,17 @@ pascalcase "1.0.0" pluralize "8.0.0" prettier "2.3.2" - prisma "2.30.0" + prisma "2.30.3" prompts "2.4.1" rimraf "3.0.2" secure-random-password "0.2.3" terminal-link "2.1.1" yargs "16.2.0" -"@redwoodjs/core@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/core/-/core-0.36.3.tgz" - integrity sha512-HNJeFevkWNJ/1Rt7pEvwyu96Z1xsKF8mwrpXCBGhEh2m+aHCMf3Oc/gq4DLmWkZ9mEPwYbTGR0fEvd8cPQlRCQ== +"@redwoodjs/core@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.36.4.tgz#d35f45d53f9168cd7b4566e6963467a8dc31ac59" + integrity sha512-ivLUMBoIurIEy+E33aIAQ+r8tcnmLkUkbWaLZnvpVggqVP5CYRizRI5BzC/Qz5YaPmrPNTbgnOZ4A3fpTn3lmQ== dependencies: "@babel/cli" "7.14.8" "@babel/core" "7.15.0" @@ -2841,10 +2841,10 @@ "@babel/preset-typescript" "7.15.0" "@babel/runtime-corejs3" "7.15.3" "@pmmmwh/react-refresh-webpack-plugin" "0.5.0-rc.4" - "@redwoodjs/cli" "0.36.3" - "@redwoodjs/eslint-config" "0.36.3" - "@redwoodjs/internal" "0.36.3" - "@redwoodjs/testing" "0.36.3" + "@redwoodjs/cli" "0.36.4" + "@redwoodjs/eslint-config" "0.36.4" + "@redwoodjs/internal" "0.36.4" + "@redwoodjs/testing" "0.36.4" babel-loader "8.2.2" babel-plugin-auto-import "1.1.0" babel-plugin-graphql-tag "3.3.0" @@ -2882,10 +2882,10 @@ webpack-retry-chunk-load-plugin "2.2.0" x----x----x "^0 Webpack" -"@redwoodjs/eslint-config@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/eslint-config/-/eslint-config-0.36.3.tgz" - integrity sha512-Gl9vFbyXJ2S5QT+pPIsTdofrXjgnaat5Ws8wssG2fBM58gRbBfj50/McMBsMVArjaZllcPLzekpC9tGlsK9zBw== +"@redwoodjs/eslint-config@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.36.4.tgz#53dc018fc684e954ca2ccdbe961f496728555f36" + integrity sha512-nD5zHA0A8Yy6AmVtQeQOeVuaFs3R1+u5jiwjOux5JZzBE0jkYN9fiUuqvGpjnH7c5L8b3bcYTVrTTjXF+iTDkA== dependencies: "@typescript-eslint/eslint-plugin" "4.29.0" "@typescript-eslint/parser" "4.29.0" @@ -2902,20 +2902,20 @@ eslint-plugin-react-hooks "4.2.0" prettier "2.3.2" -"@redwoodjs/forms@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/forms/-/forms-0.36.3.tgz" - integrity sha512-WcJzv5bBuYFkUwhbL5dn29GqltAfhwRMKyDpuqGfLFxcbtMY7uzf/ie07fh3LJgzIu/KBXv2f5aNCxzmXvDHsQ== +"@redwoodjs/forms@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.36.4.tgz#d8fd85af4d0cac3512bae42261ad596ab297da68" + integrity sha512-F18ilr4j7r8upqjKYVgYTqL8aPskWHm+ZEuvQxmQV5YxV8s2P8/ijq1w3dCoslIN5ZhHSuK/U9dkDB7VwVuxAg== dependencies: "@types/pascalcase" "1.0.0" core-js "3.16.1" pascalcase "1.0.0" react-hook-form "7.12.2" -"@redwoodjs/internal@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/internal/-/internal-0.36.3.tgz" - integrity sha512-3iLe3bJaBReabTMK6vZMckNv5LgwcBg/cTmeEAKRDjGd521yKrsuoqdjNkA1O7JvAIjUzDVOe4Q4IyfVNBTdIA== +"@redwoodjs/internal@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.36.4.tgz#50b6abf69d7a3715f6122d54b48bf5617b76c160" + integrity sha512-8Y2QEyZuN8kg2NadWPZErthcCbSFo6pip/tUvmhyES+96v+ZgSFiOUfxIDeURL1e+CSN4rZoQA3N2LX7VXc3/A== dependencies: "@babel/parser" "7.15.3" "@babel/plugin-transform-typescript" "7.15.0" @@ -2943,37 +2943,37 @@ rimraf "3.0.2" toml "3.0.0" -"@redwoodjs/prerender@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/prerender/-/prerender-0.36.3.tgz" - integrity sha512-l9vH5NG2sam+a8gBf3V4JeAXsNN4byrsN+yGwfVlef8d+aJjhdwJ1B3rE9Z0NkH99SybE11KubrWvRp+rfuHrg== +"@redwoodjs/prerender@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/prerender/-/prerender-0.36.4.tgz#3a71eb1b12aaf47bcce47d6b4180073434dbac8e" + integrity sha512-zvecAKsEaC7sgqfk7AWmw5S1ZjSgCvD7uePceWGuB6nPKnS+x0Bq0h42oFEFbOxlq1ay66G3W/yqlBc0XdK0TA== dependencies: - "@redwoodjs/auth" "0.36.3" - "@redwoodjs/internal" "0.36.3" - "@redwoodjs/router" "0.36.3" - "@redwoodjs/structure" "0.36.3" - "@redwoodjs/web" "0.36.3" + "@redwoodjs/auth" "0.36.4" + "@redwoodjs/internal" "0.36.4" + "@redwoodjs/router" "0.36.4" + "@redwoodjs/structure" "0.36.4" + "@redwoodjs/web" "0.36.4" babel-plugin-ignore-html-and-css-imports "0.1.0" cheerio "1.0.0-rc.10" node-fetch "2.6.1" -"@redwoodjs/router@0.36.3", "@redwoodjs/router@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/router/-/router-0.36.3.tgz" - integrity sha512-ErslfXTkljTJtggtfE/gIfDDltOkkvqimM483VR/jldRUoanR4k3iiwAwlt3AjAA43wLjSohV+jylR6dWy3d0g== +"@redwoodjs/router@0.36.4", "@redwoodjs/router@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.36.4.tgz#2fad89cefd1ecae1c8d8c4fed9648661735f03cc" + integrity sha512-UdOmUoi3lLCBYf8WWGJ9PHBz7D1Rx2FpinU3fJe6n2S0OStJBKxxB2gCW60ZOANm6mGjCihCDkPxP7NQ3U7IuA== dependencies: "@reach/skip-nav" "0.16.0" - "@redwoodjs/auth" "0.36.3" + "@redwoodjs/auth" "0.36.4" core-js "3.16.1" lodash.isequal "4.5.0" -"@redwoodjs/structure@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/structure/-/structure-0.36.3.tgz" - integrity sha512-QY4Qm76tKUCn74zyyRdBV7CmvFXhg7WDzq2Q2m6rLOOtOaj1wo0s8ayfSWA7E5cDrYCetO/aGetAzmyUkYzIsw== +"@redwoodjs/structure@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.36.4.tgz#87a30d5675352107aeba542a88b0509d45d3441c" + integrity sha512-ExUdrwvEsGHGvpn/P97bCcLpq8DxAWQOshxAUD98l3b6Vy2+7elZMUg5jD0DIzU8WS8dbwHhjWydlB0BHJlAcA== dependencies: - "@prisma/sdk" "2.30.0" - "@redwoodjs/internal" "0.36.3" + "@prisma/sdk" "2.30.3" + "@redwoodjs/internal" "0.36.4" "@types/line-column" "1.0.0" camelcase "6.2.0" deepmerge "4.2.2" @@ -2994,15 +2994,15 @@ vscode-languageserver-types "3.15.1" yargs-parser "20.2.9" -"@redwoodjs/testing@0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/testing/-/testing-0.36.3.tgz" - integrity sha512-9VdSmbO2WeOrjNCRk00cpvbYqVQ6IF5mVEreR481vEG7DyV4GdxPj1gMxBNSL+RpZRT1OeTQiMeCkw85C2UG9A== +"@redwoodjs/testing@0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.36.4.tgz#7319e9ded4fe1356c2361aa86262a6f9d7e7fe8a" + integrity sha512-aY7EcUVGfWT/RgoFo0Kadqyx8ZVStKmC1dUOXTAZsI2I4xnvATPes1YoqU48cAYq55msjYYK//CCTKMwTc/JvQ== dependencies: - "@redwoodjs/auth" "0.36.3" - "@redwoodjs/internal" "0.36.3" - "@redwoodjs/router" "0.36.3" - "@redwoodjs/web" "0.36.3" + "@redwoodjs/auth" "0.36.4" + "@redwoodjs/internal" "0.36.4" + "@redwoodjs/router" "0.36.4" + "@redwoodjs/web" "0.36.4" "@storybook/addon-a11y" "6.3.7" "@storybook/builder-webpack5" "6.3.7" "@storybook/manager-webpack5" "6.3.7" @@ -3023,13 +3023,13 @@ ts-toolbelt "9.6.0" whatwg-fetch "3.6.2" -"@redwoodjs/web@0.36.3", "@redwoodjs/web@^0.36.3": - version "0.36.3" - resolved "https://registry.npmjs.org/@redwoodjs/web/-/web-0.36.3.tgz" - integrity sha512-nOPpL5MYHWFqVmRjNB4XJSbViiRjOUfhhf6axQ54ww88A5PxWmtlJlZCiKulyyJhgnt0EjOagnWQRu/JENcL1A== +"@redwoodjs/web@0.36.4", "@redwoodjs/web@^0.36.4": + version "0.36.4" + resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.36.4.tgz#e194f44d8266c66724d27284464cad2f934cbfa6" + integrity sha512-8tc4D47qtjWoSDLPKTdDiBSSSuC1K0dY+sTEULgA1r/moM7ogVmIBLh3bC9BBKNfQKshuXMPaimg7ELna84p2Q== dependencies: "@apollo/client" "3.3.21" - "@redwoodjs/auth" "0.36.3" + "@redwoodjs/auth" "0.36.4" core-js "3.16.1" graphql "15.5.1" proptypes "1.1.0" @@ -14999,12 +14999,12 @@ prettysize@^2.0.0: resolved "https://registry.npmjs.org/prettysize/-/prettysize-2.0.0.tgz" integrity sha512-VVtxR7sOh0VsG8o06Ttq5TrI1aiZKmC+ClSn4eBPaNf4SHr5lzbYW+kYGX3HocBL/MfpVrRfFZ9V3vCbLaiplg== -prisma@2.30.0: - version "2.30.0" - resolved "https://registry.npmjs.org/prisma/-/prisma-2.30.0.tgz" - integrity sha512-2XYpSibcVpMd1JDxYypGDU/JKq0W2f/HI1itdddr4Pfg+q6qxt/ItWKcftv4/lqN6u/BVlQ2gDzXVEjpHeO5kQ== +prisma@2.30.3: + version "2.30.3" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.30.3.tgz#e4a770e1f52151e72c1c5be0aa2e75222a0135c4" + integrity sha512-48qYba2BIyUmXuosBZs0g3kYGrxKvo4VkSHYOuLlDdDirmKyvoY2hCYMUYHSx3f++8ovfgs+MX5KmNlP+iAZrQ== dependencies: - "@prisma/engines" "2.30.0-28.60b19f4a1de4fe95741da371b4c44a92f4d1adcb" + "@prisma/engines" "2.30.1-2.b8c35d44de987a9691890b3ddf3e2e7effb9bf20" prismjs@^1.21.0, prismjs@~1.23.0: version "1.23.0"