Merge branch 'main' into dt-log-formatter-improvements

.eslintrc.js

@@ -80,6 +80,7 @@ module.exports = {
         'packages/api/src/**',
         'packages/graphql-server/src/**',
         'packages/record/src/**',
+        'packages/project-config/src/**',
       ],
       rules: {
         'no-restricted-imports': [

.github/actions/check_test_project_fixture/package.json

@@ -5,5 +5,5 @@
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1"
   },
-  "packageManager": "yarn@3.4.1"
+  "packageManager": "yarn@3.5.0"
 }

.github/actions/only_doc_changes/package.json

@@ -5,5 +5,5 @@
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1"
   },
-  "packageManager": "yarn@3.4.1"
+  "packageManager": "yarn@3.5.0"
 }

.github/renovate.json

@@ -36,6 +36,7 @@
     "@redwoodjs/graphql-server",
     "@redwoodjs/internal",
     "@redwoodjs/prerender",
+    "@redwoodjs/project-config",
     "@redwoodjs/record",
     "@redwoodjs/router",
     "@redwoodjs/structure",

.github/workflows/ci.yml

@@ -330,7 +330,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node-version: [16, 18]
+        node-version: [16.20.0, 18]
       fail-fast: true
     name: 🔭 Telemetry check / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
     runs-on: ${{ matrix.os }}
@@ -360,7 +360,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node-version: [16, 18]
+        node-version: [16.20.0, 18]
     name: 🔭 Telemetry check / ${{ matrix.os }} / node ${{ matrix.node-version }} latest
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/publish-release-candidate.yml

@@ -82,6 +82,7 @@ jobs:
           echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc
           SEMVER=$(basename $(dirname ${{ github.ref_name }}))
           yarn lerna publish pre$SEMVER --include-merged-tags \
+                                        --exact \
                                         --canary \
                                         --preid rc \
                                         --dist-tag rc \

.github/workflows/require-release-label.yml

@@ -15,7 +15,7 @@ jobs:
     name: 🏷 Require release label
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@v4
         with:
           mode: exactly
           count: 1

.yarnrc.yml

@@ -16,4 +16,4 @@ plugins:
 
 preferInteractive: true
 
-yarnPath: .yarn/releases/yarn-3.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.5.0.cjs

README.md

@@ -43,7 +43,7 @@ TOML (an obvious, minimal configuration language used by many projects).
 application looks like, take a look at the following projects:
 
 - [Todo](https://github.com/redwoodjs/example-todo)
-- [Blog](https://github.com/redwoodjs/example-blog)
+- [Store](https://github.com/redwoodjs/example-store-stripe)
 - [Invoice](https://github.com/redwoodjs/example-invoice)
 
 ## Technologies

__fixtures__/empty-project/api/db/schema.prisma

@@ -1,6 +1,7 @@
 datasource db {
-  provider = "sqlite"
-  url      = env("DATABASE_URL")
+  provider  = "sqlite"
+  url       = env("DATABASE_URL")
+  directUrl = env("DIRECT_URL")
 }
 
 generator client {

__fixtures__/test-project/.yarnrc.yml

@@ -14,4 +14,4 @@ nmMode: hardlinks-local
 # Heads up: right now, Redwood expects this to be `node-modules`.
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.5.0.cjs

__fixtures__/test-project/README.md

@@ -4,7 +4,7 @@ Welcome to [RedwoodJS](https://redwoodjs.com)!
 
 > **Prerequisites**
 >
-> - Redwood requires [Node.js](https://nodejs.org/en/) (>=14.19.x <=16.x) and [Yarn](https://yarnpkg.com/) (>=1.15)
+> - Redwood requires [Node.js](https://nodejs.org/en/) (>=16.20 <=18.x) and [Yarn](https://yarnpkg.com/) (>=1.15)
 > - Are you on Windows? For best results, follow our [Windows development setup](https://redwoodjs.com/docs/how-to/windows-development-setup) guide
 
 Start by installing dependencies:

__fixtures__/test-project/api/tsconfig.json

@@ -6,7 +6,7 @@
     "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "baseUrl": "./",
     "rootDirs": [
       "./src",

__fixtures__/test-project/package.json

@@ -14,11 +14,11 @@
     "root": true
   },
   "engines": {
-    "node": ">=16.19 <=18.x",
+    "node": ">=16.20 <=18.x",
     "yarn": ">=1.15"
   },
   "prisma": {
     "seed": "yarn rw exec seed"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.5.0"
 }

__fixtures__/test-project/web/package.json

@@ -23,10 +23,10 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "autoprefixer": "^10.4.13",
+    "autoprefixer": "^10.4.14",
     "postcss": "^8.4.21",
-    "postcss-loader": "^7.0.2",
-    "prettier-plugin-tailwindcss": "^0.2.1",
-    "tailwindcss": "^3.2.4"
+    "postcss-loader": "^7.2.4",
+    "prettier-plugin-tailwindcss": "^0.2.7",
+    "tailwindcss": "^3.3.1"
   }
 }

__fixtures__/test-project/web/src/components/BlogPost/BlogPost.tsx

@@ -29,7 +29,7 @@ const BlogPost = ({ blogPost }: Props) => {
               </Link>
             </h2>
           </header>
-          <div className="mt-2 mb-4 font-light text-gray-900">
+          <div className="mb-4 mt-2 font-light text-gray-900">
             {blogPost.body}
           </div>
         </>

__fixtures__/test-project/web/src/components/WaterfallBlogPostCell/WaterfallBlogPostCell.tsx

@@ -51,7 +51,7 @@ export const Success = ({
             {waterfallBlogPost.title}
           </h2>
         </header>
-        <div className="mt-2 mb-4 font-light text-gray-900">
+        <div className="mb-4 mt-2 font-light text-gray-900">
           {waterfallBlogPost.body}
         </div>
       </>

__fixtures__/test-project/web/src/index.html

@@ -8,10 +8,8 @@
 </head>
 
 <body>
-  <div id="redwood-app">
-    <!-- Please keep the line below for prerender support. -->
-    <%= prerenderPlaceholder %>
-  </div>
+  <!-- Please keep this div empty -->
+  <div id="redwood-app"></div>
 </body>
 
 </html>

__fixtures__/test-project/web/src/layouts/BlogLayout/BlogLayout.tsx

@@ -11,7 +11,7 @@ const BlogLayout = ({ children }: BlogLayoutProps) => {
 
   return (
     <>
-      <header className="relative flex items-center justify-between bg-blue-700 py-4 px-8 text-white">
+      <header className="relative flex items-center justify-between bg-blue-700 px-8 py-4 text-white">
         <h1 className="text-3xl font-semibold tracking-tight">
           <Link
             className="text-blue-400 transition duration-100 hover:text-blue-100"
@@ -24,23 +24,23 @@ const BlogLayout = ({ children }: BlogLayoutProps) => {
           <ul className="relative flex items-center font-light">
             <li>
               <Link
-                className="rounded py-2 px-4 transition duration-100 hover:bg-blue-600"
+                className="rounded px-4 py-2 transition duration-100 hover:bg-blue-600"
                 to={routes.about()}
               >
                 About
               </Link>
             </li>
             <li>
               <Link
-                className="rounded py-2 px-4 transition duration-100 hover:bg-blue-600"
+                className="rounded px-4 py-2 transition duration-100 hover:bg-blue-600"
                 to={routes.contactUs()}
               >
                 Contact Us
               </Link>
             </li>
             <li>
               <Link
-                className="rounded py-2 px-4 transition duration-100 hover:bg-blue-600"
+                className="rounded px-4 py-2 transition duration-100 hover:bg-blue-600"
                 to={routes.posts()}
               >
                 Admin
@@ -49,7 +49,7 @@ const BlogLayout = ({ children }: BlogLayoutProps) => {
             {isAuthenticated && (
               <li>
                 <Link
-                  className="rounded py-2 px-4 transition duration-100 hover:bg-blue-600"
+                  className="rounded px-4 py-2 transition duration-100 hover:bg-blue-600"
                   onClick={logOut}
                   to={''}
                 >
@@ -60,7 +60,7 @@ const BlogLayout = ({ children }: BlogLayoutProps) => {
             {!isAuthenticated && (
               <li>
                 <Link
-                  className="rounded py-2 px-4 transition duration-100 hover:bg-blue-600"
+                  className="rounded px-4 py-2 transition duration-100 hover:bg-blue-600"
                   to={routes.login()}
                 >
                   Log In

__fixtures__/test-project/web/src/scaffold.css

@@ -21,7 +21,7 @@
   @apply text-gray-500;
 }
 .rw-header {
-  @apply flex justify-between py-4 px-8;
+  @apply flex justify-between px-8 py-4;
 }
 .rw-main {
   @apply mx-4 pb-4;
@@ -34,13 +34,13 @@
   height: initial;
 }
 .rw-segment::-webkit-scrollbar-track {
-  @apply rounded-t-none rounded-b-[10px] border-0 border-t border-solid border-gray-200 bg-transparent p-[2px];
+  @apply rounded-b-[10px] rounded-t-none border-0 border-t border-solid border-gray-200 bg-transparent p-[2px];
 }
 .rw-segment::-webkit-scrollbar-thumb {
   @apply rounded-full border-[3px] border-solid border-transparent bg-zinc-400 bg-clip-content;
 }
 .rw-segment-header {
-  @apply bg-gray-200 py-3 px-4 text-gray-700;
+  @apply bg-gray-200 px-4 py-3 text-gray-700;
 }
 .rw-segment-main {
   @apply bg-gray-100 p-4;
@@ -89,13 +89,13 @@
   @apply mt-2 list-inside list-disc;
 }
 .rw-button {
-  @apply flex cursor-pointer justify-center rounded border-0 bg-gray-200 py-1 px-4 text-xs font-semibold uppercase leading-loose tracking-wide text-gray-500 no-underline transition duration-100;
+  @apply flex cursor-pointer justify-center rounded border-0 bg-gray-200 px-4 py-1 text-xs font-semibold uppercase leading-loose tracking-wide text-gray-500 no-underline transition duration-100;
 }
 .rw-button:hover {
   @apply bg-gray-500 text-white;
 }
 .rw-button.rw-button-small {
-  @apply rounded-sm py-1 px-2 text-xs;
+  @apply rounded-sm px-2 py-1 text-xs;
 }
 .rw-button.rw-button-green {
   @apply bg-green-500 text-white;
@@ -119,7 +119,7 @@
   @apply mr-1 text-xl leading-5;
 }
 .rw-button-group {
-  @apply my-3 mx-2 flex justify-center;
+  @apply mx-2 my-3 flex justify-center;
 }
 .rw-button-group .rw-button {
   @apply mx-1;

__fixtures__/test-project/web/tsconfig.json

@@ -7,7 +7,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "baseUrl": "./",
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "rootDirs": [
       "./src",
       "../.redwood/types/mirror/web/src",

babel.config.js

@@ -2,7 +2,7 @@ const path = require('path')
 
 const packageJSON = require(path.join(__dirname, 'package.json'))
 
-const TARGETS_NODE = '16.19'
+const TARGETS_NODE = '16.20'
 
 // Run `npx browserslist "defaults, not IE 11, not IE_Mob 11"` to see a list
 // of target browsers.

docs/README.md

@@ -28,12 +28,15 @@ In [previous section](./first-page) we....
 
 ## Contributing
 
-Open a PR against the repo on GitHub. That will build and launch a copy of the site that you can get from the `netlify/redwoodjs/deploy-preview` check (click "Details" to open it):
+Fork the repo, make your changes and open a PR on GitHub. That will build and launch a copy of the site that you can get from the `netlify/redwoodjs/deploy-preview` check (click "Details" to open it):
 
 ![image](https://user-images.githubusercontent.com/300/76569613-c4421000-6470-11ea-8223-eb98504e6994.png)
 
 Double check that your changes look good!
 
+### Updating Doc Images
+To update any images in the doc, first upload your screenshot into a comment textbox in your PR. Once it's uploaded, you can open the image in a new tab and use the github url as a image link in your docs.
+
 ## Contributors
 
 Redwood is amazing thanks to a wonderful [community of contributors](https://github.com/redwoodjs/redwood/blob/main/README.md#contributors).