Merge branch 'canary' into refactor-global-to-globalThis

.all-contributorsrc

@@ -840,6 +840,35 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "drenther",
+      "name": "Soumyajit Pathak",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12991390?v=4",
+      "profile": "https://able.bio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SebastianKurp",
+      "name": "Sebastian Kurpiel",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/16307737?v=4",
+      "profile": "http://www.sebastiankurpiel.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "scisteffan",
+      "name": "Steffan",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2676185?v=4",
+      "profile": "https://github.com/scisteffan",
+      "contributions": [
+        "code",
+        "doc",
+        "financial"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/CODEOWNERS

@@ -7,4 +7,5 @@ packages/server/**/* @ryardley
 packages/file-pipeline/**/* @ryardley
 packages/cli/**/* @aem
 packages/generator/**/* @aem
+packages/generator/templates**/* @flybayer
 packages/installer/**/* @aem

README.md

@@ -6,7 +6,7 @@
     <img alt="" src="https://img.shields.io/badge/Join%20our%20community-6700EB.svg?style=for-the-badge&labelColor=000000&logoWidth=20&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ9SURBVHgB7d3dVdtAEIbhcSpICUoH0IEogQqSVBBSAU4FSSpIOoAORAfQgSghHXzZ1U/YcMD4R9rZmf2ec3y448LyiNf27iLiGIAmPLrweC9Un3DhrzG6EarLNP09nlwJ1SOZ/lQr5N80/S/p2QMVCBf5N17XCfm1Y/rBHqjAG9PPHvBsz+mf9WAP+HLA9M/YA14cOP2payH7jpj+VCtk1wnTP+vj7xCy6cTpn7EHLMLp059iD1iD8eveJbVCNsSLheX1YA/YgOWnf8YeKB3Wmf7Ud6Fy4f/FHmtpxbl3YlC4MJ/Cj0bWdwPnPbARg+L0S54XQHS32WwuxClzd4CM0z9rPfeAuTtA5ulPXYQ7wZ04Y+oOoDD9KZc9YOoOoDj9s4dwFzgXR6w1wIPoOvPWA9buAHEJ173o3gWiy3AnuBUHLEbgmYwvAk1/wuM8vAgexThzbwPDkx7/DHwVXfFOxP2GmsKd4Ab6zPeAyU8CI7AHFmH2BRCBPXAyk18GzUrqAXCTiR4ssyj0VFw/oCU8+e+RZ33AWz6KMaYbIIWxB+JSLs1bsbkeMN0AqakHvoku9oA2sAfqBvbAQdw0QArsgb25aYBUQT3QgT2gB+yBuqGcHij2UCqXDZACe2Anlw2QYg/QAOyBuoE98CL3DZDCuK4/rh/Q7oGL6U+TOvcNkJoijN8X1C48+T+g75eQDrAH/qmqAVJgDwyqaoAUe4AGYA/UDZX3QLUNkEIZPRCd5+6BahsgVUgPROwBTSijB7jpVAvGHriHvmw9wAZ4BpX1ABvgmakHtPcbRuwBTWAPULgAV9D/jKDY9YRvwvgEaurD44uQHvAol7qBW7WKluVtIHiUS7GyvA0s6CiXDnxrpQfsgbqBS7GKk/2jYHCrVlGyfxTMrVo0ALdq1Q3sgSKofh0M9oA61a+D2QM0AHugbmAPqClmSRjK2apVVQ8UsySsoK1aHdgDesCtWnUDeyCrIpeFg1u3sylyWTi3btMA7IG6gT2wuuK3hoE9sKrit4YVslWLPaAN7IG6ocKt2zmY2h4O9sDiTG0PZw/QANy6XTewBxZj9ogYVHy025LMHhEz9cBn0We6B0yfERReBLfhx0/R1YQHPx/QBPbA0VwcEwf2wNFcHBPHHjiem3MC2QPHcXdSaJjA+KfgTPQ8hhfjBzHC40mhlzJ+Xq9lK4a4PCs43AVaGTed5mZq+iOXZwWHi3AnOj2wFWNcnxYe7gTxLtBKHuamP/J+Wnh8a5irB7ZC5Yk9gPX1QuXC+usHWqGyhYvUYR0a7zboUOFCNVhnk0krZAOW7wFOvzXhom2xnEbIHizTA1wEYhWW6YFGyC6c1gOcfg9wfA80Qj7g8B7g9HuCww+haIR8wf49wOn3Cvv9k8tGyC/s7gFOv3fY3QONkH+v9MBWqB7PeqDn9FcIT//kcitUn6kHOu/T/xfWzlQy3dEHhwAAAABJRU5ErkJggg==">
   </a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-87-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
+<a aria-label="All Contributors" href="#contributors-"><img alt="" src="https://img.shields.io/badge/all_contributors-90-17BB8A.svg?style=for-the-badge&labelColor=000000"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
   <a aria-label="License" href="https://github.com/blitz-js/blitz/blob/canary/LICENSE">
     <img alt="" src="https://img.shields.io/npm/l/blitz.svg?style=for-the-badge&labelColor=000000&color=blue">
@@ -319,6 +319,9 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
     <td align="center"><a href="http://twitter.com/nettofarah"><img src="https://avatars1.githubusercontent.com/u/270688?v=4" width="100px;" alt=""/><br /><sub><b>Netto Farah</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=nettofarah" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/rohanjulka19"><img src="https://avatars0.githubusercontent.com/u/19673968?v=4" width="100px;" alt=""/><br /><sub><b>Rohan Julka</b></sub></a><br /><a href="#infra-rohanjulka19" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
     <td align="center"><a href="https://www.ivansantos.me"><img src="https://avatars3.githubusercontent.com/u/301291?v=4" width="100px;" alt=""/><br /><sub><b>Ivan Santos</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=pragmaticivan" title="Code">💻</a></td>
+    <td align="center"><a href="https://able.bio"><img src="https://avatars0.githubusercontent.com/u/12991390?v=4" width="100px;" alt=""/><br /><sub><b>Soumyajit Pathak</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=drenther" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.sebastiankurpiel.com"><img src="https://avatars2.githubusercontent.com/u/16307737?v=4" width="100px;" alt=""/><br /><sub><b>Sebastian Kurpiel</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=SebastianKurp" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/scisteffan"><img src="https://avatars2.githubusercontent.com/u/2676185?v=4" width="100px;" alt=""/><br /><sub><b>Steffan</b></sub></a><br /><a href="https://github.com/blitz-js/blitz/commits?author=scisteffan" title="Code">💻</a> <a href="https://github.com/blitz-js/blitz/commits?author=scisteffan" title="Documentation">📖</a> <a href="#financial-scisteffan" title="Financial">💵</a></td>
   </tr>
 </table>
 

examples/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/auth",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "scripts": {
     "start": "blitz start",
     "studio": "blitz db studio",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@prisma/cli": "2.1.0",
     "@prisma/client": "2.1.0",
-    "blitz": "0.17.1-canary.3",
+    "blitz": "0.17.1-canary.4",
     "final-form": "4.20.1",
     "passport-github2": "0.1.11",
     "passport-twitter": "1.0.4",
@@ -60,12 +60,12 @@
     "cypress": "4.11.0",
     "eslint": "7.6.0",
     "eslint-config-react-app": "5.2.1",
+    "eslint-plugin-cypress": "2.11.1",
     "eslint-plugin-flowtype": "5.2.0",
     "eslint-plugin-import": "2.22.0",
     "eslint-plugin-jsx-a11y": "6.3.1",
     "eslint-plugin-react": "7.20.5",
     "eslint-plugin-react-hooks": "4.0.8",
-    "eslint-plugin-cypress": "2.11.1",
     "husky": "4.2.5",
     "lint-staged": "10.2.11",
     "prettier": "2.0.5",

examples/no-prisma/package.json

@@ -1,6 +1,6 @@
 {
   "name": "no-prisma",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "scripts": {
     "start": "blitz start",
     "build": "blitz build",
@@ -26,7 +26,7 @@
     ]
   },
   "dependencies": {
-    "blitz": "0.17.1-canary.3",
+    "blitz": "0.17.1-canary.4",
     "knex": "0.21.2",
     "react": "0.0.0-experimental-33c3af284",
     "react-dom": "0.0.0-experimental-33c3af284",

examples/plain-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/plain-js",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "scripts": {
     "start": "blitz start",
     "build": "blitz db migrate && blitz build",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@prisma/cli": "2.0.0",
     "@prisma/client": "2.0.0",
-    "blitz": "0.17.1-canary.3",
+    "blitz": "0.17.1-canary.4",
     "react": "0.0.0-experimental-33c3af284",
     "react-dom": "0.0.0-experimental-33c3af284"
   },

examples/store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/store",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "private": true,
   "scripts": {
     "build": "blitz db migrate && blitz build",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@prisma/cli": "2.0.0",
     "@prisma/client": "2.0.0",
-    "blitz": "0.17.1-canary.3",
+    "blitz": "0.17.1-canary.4",
     "final-form": "4.19.1",
     "react": "0.0.0-experimental-33c3af284",
     "react-dom": "0.0.0-experimental-33c3af284",

examples/tailwind/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "scripts": {
     "build": "blitz db migrate && blitz build",
     "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@prisma/cli": "2.0.0",
     "@prisma/client": "2.0.0",
-    "blitz": "0.17.1-canary.3",
+    "blitz": "0.17.1-canary.4",
     "react": "0.0.0-experimental-33c3af284",
     "react-dom": "0.0.0-experimental-33c3af284",
     "typescript": "3.8.3"

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,

packages/blitz/package.json

@@ -1,7 +1,7 @@
 {
   "name": "blitz",
   "description": "Blitz is a Rails-like framework for monolithic, full-stack React apps — built on Next.js",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "license": "MIT",
   "scripts": {
     "clean": "rimraf dist",
@@ -39,11 +39,11 @@
     "url": "https://github.com/blitz-js/blitz"
   },
   "dependencies": {
-    "@blitzjs/cli": "0.17.1-canary.3",
-    "@blitzjs/core": "0.17.1-canary.3",
-    "@blitzjs/generator": "0.17.1-canary.3",
-    "@blitzjs/installer": "0.17.1-canary.3",
-    "@blitzjs/server": "0.17.1-canary.3",
+    "@blitzjs/cli": "0.17.1-canary.4",
+    "@blitzjs/core": "0.17.1-canary.4",
+    "@blitzjs/generator": "0.17.1-canary.4",
+    "@blitzjs/installer": "0.17.1-canary.4",
+    "@blitzjs/server": "0.17.1-canary.4",
     "envinfo": "7.7.2",
     "os-name": "3.1.0",
     "pkg-dir": "4.2.0",

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/cli",
   "description": "Blitz.js CLI",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "license": "MIT",
   "scripts": {
     "b": "./bin/run",
@@ -30,8 +30,8 @@
     "/lib"
   ],
   "dependencies": {
-    "@blitzjs/display": "0.17.1-canary.3",
-    "@blitzjs/repl": "0.17.1-canary.3",
+    "@blitzjs/display": "0.17.1-canary.4",
+    "@blitzjs/repl": "0.17.1-canary.4",
     "@oclif/command": "1.5.20",
     "@oclif/config": "1.15.1",
     "@oclif/plugin-help": "2.2.3",
@@ -53,9 +53,9 @@
     "tsconfig-paths": "3.9.0"
   },
   "devDependencies": {
-    "@blitzjs/generator": "0.17.1-canary.3",
-    "@blitzjs/installer": "0.17.1-canary.3",
-    "@blitzjs/server": "0.17.1-canary.3",
+    "@blitzjs/generator": "0.17.1-canary.4",
+    "@blitzjs/installer": "0.17.1-canary.4",
+    "@blitzjs/server": "0.17.1-canary.4",
     "@oclif/dev-cli": "1.22.2",
     "@oclif/test": "1.2.5",
     "@prisma/cli": "2.0.0-beta.3",

packages/config/package.json

@@ -7,7 +7,7 @@
     "config"
   ],
   "author": "Fran Zekan <[email protected]>",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "license": "MIT",
   "scripts": {
     "clean": "rimraf dist",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/core",
   "description": "Blitz.js core functionality",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "license": "MIT",
   "scripts": {
     "clean": "rimraf dist",
@@ -40,8 +40,8 @@
     "url": "https://github.com/blitz-js/blitz"
   },
   "dependencies": {
-    "@blitzjs/config": "0.17.1-canary.3",
-    "@blitzjs/display": "0.17.1-canary.3",
+    "@blitzjs/config": "0.17.1-canary.4",
+    "@blitzjs/display": "0.17.1-canary.4",
     "bad-behavior": "1.0.1",
     "cookie-session": "1.4.0",
     "passport": "0.4.1",

packages/core/src/rpc.ts

@@ -29,7 +29,8 @@ export async function executeRpcCall(url: string, params: any, opts: Options = {
     headers[HEADER_CSRF] = antiCSRFToken
   }
 
-  const serialized = serialize(params)
+  // query hook already serializes the params because otherwise react-query will mess it up
+  const serialized = opts.fromQueryHook ? params : serialize(params)
 
   const result = await window.fetch(url, {
     method: "POST",

packages/core/src/use-infinite-query.ts

@@ -7,6 +7,7 @@ import {useIsDevPrerender, emptyQueryFn, retryFunction} from "./use-query"
 import {PromiseReturnType, InferUnaryParam, QueryFn} from "./types"
 import {getQueryCacheFunctions, QueryCacheFunctions} from "./utils/query-cache"
 import {EnhancedRpcFunction} from "./rpc"
+import {serialize} from "superjson"
 
 type RestQueryResult<T extends QueryFn> = Omit<
   InfiniteQueryResult<PromiseReturnType<T>, any>,
@@ -36,7 +37,7 @@ export function useInfiniteQuery<T extends QueryFn>(
   const {data, ...queryRest} = useInfiniteReactQuery({
     queryKey: [
       queryRpcFn._meta.apiUrl,
-      typeof params === "function" ? (params as Function)() : params,
+      serialize(typeof params === "function" ? (params as Function)() : params),
     ],
     queryFn: (_: string, params, more?) => queryRpcFn({...params, ...more}, {fromQueryHook: true}),
     config: {

packages/core/src/use-paginated-query.ts

@@ -7,6 +7,7 @@ import {useIsDevPrerender, emptyQueryFn, retryFunction} from "./use-query"
 import {PromiseReturnType, InferUnaryParam, QueryFn} from "./types"
 import {QueryCacheFunctions, getQueryCacheFunctions} from "./utils/query-cache"
 import {EnhancedRpcFunction} from "./rpc"
+import {serialize} from "superjson"
 
 type RestQueryResult<T extends QueryFn> = Omit<
   PaginatedQueryResult<PromiseReturnType<T>>,
@@ -36,7 +37,7 @@ export function usePaginatedQuery<T extends QueryFn>(
   const {resolvedData, ...queryRest} = usePaginatedReactQuery({
     queryKey: [
       queryRpcFn._meta.apiUrl,
-      typeof params === "function" ? (params as Function)() : params,
+      serialize(typeof params === "function" ? (params as Function)() : params),
     ],
     queryFn: (_: string, params) => queryRpcFn(params, {fromQueryHook: true}),
     config: {

packages/core/src/use-query.ts

@@ -2,6 +2,7 @@ import {useQuery as useReactQuery, QueryResult, QueryOptions} from "react-query"
 import {PromiseReturnType, InferUnaryParam, QueryFn} from "./types"
 import {QueryCacheFunctions, getQueryCacheFunctions} from "./utils/query-cache"
 import {EnhancedRpcFunction} from "./rpc"
+import {serialize} from "superjson"
 
 type RestQueryResult<T extends QueryFn> = Omit<QueryResult<PromiseReturnType<T>>, "data"> &
   QueryCacheFunctions<PromiseReturnType<T>>
@@ -66,7 +67,7 @@ export function useQuery<T extends QueryFn>(
   const {data, ...queryRest} = useReactQuery({
     queryKey: [
       queryRpcFn._meta.apiUrl,
-      typeof params === "function" ? (params as Function)() : params,
+      serialize(typeof params === "function" ? (params as Function)() : params),
     ],
     queryFn: (_: string, params) => queryRpcFn(params, {fromQueryHook: true}),
     config: {

packages/core/src/with-router.tsx

@@ -4,6 +4,8 @@ import {WithRouterProps as WithNextRouterProps} from "next/dist/client/with-rout
 import {useParams, extractRouterParams} from "./use-params"
 import {useRouterQuery} from "./use-router-query"
 
+export {RouterContext} from "next/dist/next-server/lib/router-context"
+
 export interface BlitzRouter extends NextRouter {
   params: ReturnType<typeof extractRouterParams>
 }

packages/core/test/use-query.test.tsx

@@ -1,6 +1,7 @@
 import React from "react"
 import {act, render, waitForElementToBeRemoved, screen} from "./test-utils"
 import {useQuery} from "../src/use-query"
+import {deserialize} from "superjson"
 
 describe("useQuery", () => {
   const setupHook = (
@@ -9,13 +10,17 @@ describe("useQuery", () => {
   ): [{data?: any}, Function] => {
     // This enhance fn does what getIsomorphicRpcHandler does during build time
     const enhance = (fn: any) => {
-      fn._meta = {
+      const newFn = (...args: any) => {
+        const [data, ...rest] = args
+        return fn(deserialize(data), ...rest)
+      }
+      newFn._meta = {
         name: "testResolver",
         type: "query",
         path: "app/test",
         apiUrl: "test/url",
       }
-      return fn
+      return newFn
     }
     let res = {}
     function TestHarness() {

packages/display/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/display",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "description": "Display package for the Blitz CLI",
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "license": "MIT",

packages/file-pipeline/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/file-pipeline",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "description": "Display package for the Blitz CLI",
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "license": "MIT",

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "0.17.1-canary.3",
+  "version": "0.17.1-canary.4",
   "description": "File generation for the Blitz CLI",
   "homepage": "https://github.com/blitz-js/blitz#readme",
   "license": "MIT",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@babel/core": "7.9.0",
     "@babel/plugin-transform-typescript": "7.9.4",
-    "@blitzjs/display": "0.17.1-canary.3",
+    "@blitzjs/display": "0.17.1-canary.4",
     "ast-types": "0.13.3",
     "chalk": "4.0.0",
     "cross-spawn": "7.0.2",

packages/generator/templates/app/.env

@@ -1,5 +1,6 @@
-# THIS FILE SHOULD NOT BE CHECKED INTO YOUR VERSION CONTROL SYSTEM	
+# THIS FILE SHOULD NOT BE CHECKED INTO YOUR VERSION CONTROL SYSTEM
 
-# You can use this file to specify secrets like your database connection information
-# if you move to a more sophisticated database than sqlite. For example, for postgres:
-DATABASE_URL=postgresql://__username__@localhost:5432/__name__
+# SQLite is ready to go out of the box, but you can switch to Postgres easily
+# by swapping the DATABASE_URL.
+DATABASE_URL="file:./db.sqlite"
+# DATABASE_URL=postgresql://__username__@localhost:5432/__name__