Merge pull request #483 from Irev-Dev/kurt/482

Upgrade redwood to v0.36

app/api/.babelrc.js

@@ -1 +0,0 @@
-module.exports = { extends: "../babel.config.js" }

app/api/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^0.34.1",
+    "@redwoodjs/api": "^0.36.2",
     "@sentry/node": "^6.5.1",
     "cloudinary": "^1.23.0",
     "human-id": "^2.0.1",
@@ -12,4 +12,4 @@
   "devDependencies": {
     "@types/nodemailer": "^6.4.2"
   }
-}
+}

app/api/src/functions/graphql.ts

@@ -4,6 +4,7 @@ import {
   makeServices,
 } from '@redwoodjs/api'
 import { createSentryApolloPlugin } from 'src/lib/sentry'
+import { logger } from 'src/lib/logger'
 
 import schemas from 'src/graphql/**/*.{js,ts}'
 import services from 'src/services/**/*.{js,ts}'
@@ -12,6 +13,7 @@ import { getCurrentUser } from 'src/lib/auth'
 import { db } from 'src/lib/db'
 
 export const handler = createGraphQLHandler({
+  loggerConfig: { logger, options: {} },
   getCurrentUser,
   schema: makeMergedSchema({
     schemas,

app/package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {},
   "devDependencies": {
-    "@redwoodjs/core": "^0.34.1"
+    "@redwoodjs/core": "^0.36.2"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

app/web/config/postcss.config.js

@@ -2,7 +2,7 @@ const path = require('path')
 
 module.exports = {
   plugins: [
-    require('tailwindcss')(path.resolve(__dirname, '../tailwind.config.js')),
+    require('tailwindcss')(path.resolve(__dirname, 'tailwind.config.js')),
     require('autoprefixer'),
   ],
 }

app/web/config/webpack.config.js

@@ -2,7 +2,7 @@
 module.exports = (config, { env }) => {
   config.plugins.forEach((plugin) => {
     if (plugin.constructor.name === 'HtmlWebpackPlugin') {
-      plugin.options.favicon = './src/favicon.svg'
+      plugin.userOptions.favicon = './src/favicon.svg'
     }
   })
   return config

app/web/package.json

@@ -19,12 +19,13 @@
     "@monaco-editor/react": "^4.0.11",
     "@react-three/drei": "^7.3.1",
     "@react-three/fiber": "^7.0.5",
-    "@redwoodjs/auth": "^0.34.1",
-    "@redwoodjs/forms": "^0.34.1",
-    "@redwoodjs/router": "^0.34.1",
-    "@redwoodjs/web": "^0.34.1",
+    "@redwoodjs/auth": "^0.36.2",
+    "@redwoodjs/forms": "^0.36.2",
+    "@redwoodjs/router": "^0.36.2",
+    "@redwoodjs/web": "^0.36.2",
     "@sentry/browser": "^6.5.1",
     "@tailwindcss/aspect-ratio": "0.2.1",
+    "axios": "^0.21.1",
     "browser-fs-access": "^0.17.2",
     "cloudinary-react": "^1.6.7",
     "get-active-classes": "^0.0.11",
@@ -40,7 +41,7 @@
     "react-ga": "^3.3.0",
     "react-helmet": "^6.1.0",
     "react-image-crop": "^8.6.6",
-    "react-mosaic-component": "^4.1.1",
+    "react-mosaic-component": "^5.0.0",
     "react-tabs": "^3.2.2",
     "rich-markdown-editor": "^11.0.2",
     "styled-components": "^5.2.0",
@@ -48,10 +49,10 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.170",
-    "autoprefixer": "^10.2.5",
+    "autoprefixer": "^10.3.1",
     "html-webpack-plugin": "^4.5.0",
-    "postcss": "^8.2.13",
-    "postcss-loader": "4.0.2",
-    "tailwindcss": "^2.1.2"
+    "postcss": "^8.3.6",
+    "postcss-loader": "^6.1.1",
+    "tailwindcss": "^2.2.7"
   }
 }

app/web/src/App.tsx

@@ -1,7 +1,7 @@
 import { AuthProvider } from '@redwoodjs/auth'
 import GoTrue from 'gotrue-js'
 
-import { FatalErrorBoundary } from '@redwoodjs/web'
+import { FatalErrorBoundary, RedwoodProvider } from '@redwoodjs/web'
 import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import ReactGA from 'react-ga'
@@ -20,11 +20,13 @@ const goTrueClient = new GoTrue({
 
 const App = () => (
   <FatalErrorBoundary page={FatalErrorPage}>
-    <AuthProvider client={goTrueClient} type="goTrue">
-      <RedwoodApolloProvider>
-        <Routes />
-      </RedwoodApolloProvider>
-    </AuthProvider>
+    <RedwoodProvider>
+      <AuthProvider client={goTrueClient} type="goTrue">
+        <RedwoodApolloProvider>
+          <Routes />
+        </RedwoodApolloProvider>
+      </AuthProvider>
+    </RedwoodProvider>
   </FatalErrorBoundary>
 )
 

app/web/src/components/IdeEditor/IdeEditor.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
 import { makeCodeStoreKey, requestRender } from 'src/helpers/hooks/useIdeState'
 import Editor, { useMonaco } from '@monaco-editor/react'
-import { theme } from 'src/../tailwind.config'
+import { theme } from 'src/../config/tailwind.config'
 import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
 import type { CadPackage as CadPackageType } from 'src/helpers/hooks/useIdeState'
 import CadPackage from '../CadPackage/CadPackage'

app/web/src/components/InputTextForm/InputTextForm.tsx

@@ -3,7 +3,7 @@ import { TextField, FieldError } from '@redwoodjs/forms'
 import { useFormContext } from 'react-hook-form'
 
 const InputText = ({ type = 'text', className, name, validation }) => {
-  const { errors } = useFormContext()
+  const { formState: { errors } } = useFormContext()
   return (
     <>
       <div className={getActiveClasses('relative inline-block', className)}>

app/web/src/helpers/cadPackages/common.ts

@@ -112,7 +112,6 @@ export const splitGziped = (text: string) => {
   try {
     return JSON.parse(json)
   } catch (e) {
-    console.log(json, e)
     return {}
   }
 }

docs/tailwind.config.js

@@ -1,4 +1,4 @@
-const webConfig = require('../app/web/tailwind.config.js')
+const webConfig = require('../app/web/config/tailwind.config.js')
 module.exports = {
   ...webConfig,
   purge: ['./src/**/*.html', './src/**/*.js', './src/**/*.ts', './src/**/*.tsx', './blog/**/*.md', './blog/**/*.mdx', './docs/**/*.md', './docs/**/*.mdx', './src/**/*.css'],