colin/redwood-tutorial
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from redwoodjs/dsp-upgrade-v0.26-v0.27

Browse Source 
upgrade and code mods v0.26 and v0.27
This commit is contained in:
David Price
2021-03-10 23:37:17 -08:00
committed by GitHub
parent 6254e24801 5c7f9832f9
commit 7e6337005b
7 changed files with 957 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/package.json
View File

@@ -3,6 +3,6 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@redwoodjs/api": "^0.25.1" "@redwoodjs/api": "^0.27.0"
} }
} }

8
package.json
View File

@@ -7,13 +7,17 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@redwoodjs/core": "^0.25.1" "@redwoodjs/core": "^0.27.0"
}, },
"eslintConfig": { "eslintConfig": {
"extends": "@redwoodjs/eslint-config" "extends": "@redwoodjs/eslint-config"
}, },
"engines": { "engines": {
"node": ">=12", "node": ">=14",
"yarn": ">=1.15" "yarn": ">=1.15"
},
"resolutions": {
"react": "17.0.1",
"react-dom": "17.0.1"
} }
} }

12
web/package.json
View File

@@ -13,14 +13,14 @@
] ]
}, },
"dependencies": { "dependencies": {
"@redwoodjs/auth": "^0.25.1", "@redwoodjs/auth": "^0.27.0",
"@redwoodjs/forms": "^0.25.1", "@redwoodjs/forms": "^0.27.0",
"@redwoodjs/router": "^0.25.1", "@redwoodjs/router": "^0.27.0",
"@redwoodjs/web": "^0.25.1", "@redwoodjs/web": "^0.27.0",
"netlify-identity-widget": "^1.9.1", "netlify-identity-widget": "^1.9.1",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.13.1", "react": "^17.0.1",
"react-dom": "^16.13.1" "react-dom": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "9.8.6", "autoprefixer": "9.8.6",

11
web/src/index.js → web/src/App.js
View File

@@ -1,24 +1,25 @@
import { AuthProvider } from '@redwoodjs/auth' import { AuthProvider } from '@redwoodjs/auth'
import netlifyIdentity from 'netlify-identity-widget' import netlifyIdentity from 'netlify-identity-widget'
import ReactDOM from 'react-dom'
import { FatalErrorBoundary } from '@redwoodjs/web' import { FatalErrorBoundary } from '@redwoodjs/web'
import { RedwoodApolloProvider } from '@redwoodjs/web/apollo' import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
import FatalErrorPage from 'src/pages/FatalErrorPage' import FatalErrorPage from 'src/pages/FatalErrorPage'
import { isBrowser } from '@redwoodjs/prerender/browserUtils'
import Routes from 'src/Routes' import Routes from 'src/Routes'
import './scaffold.css' import './scaffold.css'
import './index.css' import './index.css'
netlifyIdentity.init() isBrowser && netlifyIdentity.init()
ReactDOM.render( const App = () => (
<FatalErrorBoundary page={FatalErrorPage}> <FatalErrorBoundary page={FatalErrorPage}>
<AuthProvider client={netlifyIdentity} type="netlify"> <AuthProvider client={netlifyIdentity} type="netlify">
<RedwoodApolloProvider> <RedwoodApolloProvider>
<Routes /> <Routes />
</RedwoodApolloProvider> </RedwoodApolloProvider>
</AuthProvider> </AuthProvider>
</FatalErrorBoundary>, </FatalErrorBoundary>
document.getElementById('redwood-app')
) )
export default App

2
web/src/Routes.js
View File

@@ -22,7 +22,7 @@ const Routes = () => {
<Route path="/admin/posts/{id:Int}" page={PostPage} name="post" /> <Route path="/admin/posts/{id:Int}" page={PostPage} name="post" />
<Route path="/admin/posts" page={PostsPage} name="posts" /> <Route path="/admin/posts" page={PostsPage} name="posts" />
</Private> </Private>
<Route notfound page={NotFoundPage} /> <Route notfound page={NotFoundPage} prerender />
</Router> </Router>
) )
} }

4
web/src/index.html
View File

@@ -7,6 +7,8 @@
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
</head> </head>
<body class="h-full bg-gray-200"> <body class="h-full bg-gray-200">
<div id="redwood-app"></div> <div id="redwood-app">
<%= prerenderPlaceholder %>
</div>
</body> </body>
</html> </html>

1157
yarn.lock
View File

File diff suppressed because it is too large Load Diff