Merge branch 'main' into fix/generator-loads-hardcoded-prisma-schema-…

…path
blitz-js · Oct 3, 2022 · ef3efc9 · ef3efc9
2 parents 26cdd04 + 8e0c9d7
commit ef3efc9
Show file tree

Hide file tree

Showing 175 changed files with 8,350 additions and 347 deletions.
diff --git a/.changeset/honest-cherries-push.md b/.changeset/honest-cherries-push.md
@@ -2,4 +2,4 @@
 "blitz": patch
 ---
 
-Add a global Blitz version check when generating a new Blitz project to ensure users use the latest Blitz. 
+Add a global Blitz version check when generating a new Blitz project to ensure users use the latest Blitz.
diff --git a/.changeset/thirty-spies-applaud.md b/.changeset/thirty-spies-applaud.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/rpc": patch
+"blitz": patch
+---
+Migrate over recipe functionality from legacy framework & expose recipe builder helper functions that find and modify next.config.js, blitz-server & blitz-client.
diff --git a/.github/workflows/changeset_check.yml b/.github/workflows/changeset_check.yml
@@ -1,6 +1,6 @@
 name: Changeset
 
-on: 
+on:
   pull_request:
     types: [opened, synchronize, labeled, unlabeled]
 
@@ -24,4 +24,3 @@ jobs:
       - name: Check if changeset is added
         run: |
           npx @changesets/[email protected] status --since=origin/${GITHUB_BASE_REF}
-          
diff --git a/integration-tests/get-initial-props/vitest.config.ts b/integration-tests/get-initial-props/vitest.config.ts
@@ -0,0 +1,8 @@
+import {defineConfig} from "vitest/config"
+
+export default defineConfig({
+  test: {
+    testTimeout: 5000 * 60 * 2,
+    hookTimeout: 100000,
+  },
+})
diff --git a/integration-tests/middleware/vitest.config.ts b/integration-tests/middleware/vitest.config.ts
@@ -3,6 +3,7 @@ import {defineConfig} from "vitest/config"
 
 export default defineConfig({
   test: {
+    testTimeout: 5000 * 60 * 2,
     hookTimeout: 100000,
   },
 })
diff --git a/integration-tests/qm/vitest.config.ts b/integration-tests/qm/vitest.config.ts
@@ -1,12 +1,14 @@
 /// <reference types="vitest" />
 
-import { defineConfig } from 'vitest/config'
-import react from '@vitejs/plugin-react'
+import {defineConfig} from "vitest/config"
+import react from "@vitejs/plugin-react"
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
   test: {
-    environment: 'jsdom',
+    environment: "jsdom",
+    testTimeout: 5000 * 60 * 2,
+    hookTimeout: 100000,
   },
-})
+})
diff --git a/integration-tests/trailing-slash/vitest.config.ts b/integration-tests/trailing-slash/vitest.config.ts
@@ -0,0 +1,8 @@
+import {defineConfig} from "vitest/config"
+
+export default defineConfig({
+  test: {
+    testTimeout: 5000 * 60 * 2,
+    hookTimeout: 100000,
+  },
+})
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
   "workspaces": [
     "apps/*",
     "packages/*",
-    "integration-tests/*"
+    "integration-tests/*",
+    "recipes/*"
   ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -38,7 +39,7 @@
     "wait-on": "6.0.1"
   },
   "npmClient": "pnpm",
-  "packageManager": "pnpm@7.4.0-1",
+  "packageManager": "pnpm@7.11.0",
   "manypkg": {
     "ignoredRules": [
       "EXTERNAL_MISMATCH"

diff --git a/packages/blitz-rpc/package.json b/packages/blitz-rpc/package.json
@@ -3,7 +3,7 @@
   "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
-    "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts && wait-on -d 250 ../blitz-auth/dist/index-browser.d.ts",
+    "predev": "wait-on -d 400 ../blitz/dist/index-server.d.ts && wait-on -d 400 ../blitz-auth/dist/index-browser.d.ts",
     "dev": "pnpm run predev && watch unbuild src --wait=0.2",
     "lint": "eslint . --fix",
     "test": "vitest run",

diff --git a/packages/blitz/build.config.ts b/packages/blitz/build.config.ts
@@ -1,7 +1,7 @@
 import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
-  entries: ["./src/index-browser", "./src/index-server", "./src/cli/index"],
+  entries: ["./src/index-browser", "./src/index-server", "./src/cli/index", "./src/installer"],
   externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod", "react"],
   declaration: true,
   rollup: {

diff --git a/packages/blitz/installer.d.ts b/packages/blitz/installer.d.ts
@@ -0,0 +1 @@
+export * from "./dist/installer"
diff --git a/packages/blitz/installer.js b/packages/blitz/installer.js
@@ -0,0 +1 @@
+module.exports = require("./dist/installer.cjs")
diff --git a/packages/blitz/package.json b/packages/blitz/package.json
@@ -3,11 +3,12 @@
   "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
-    "dev": "watch unbuild src --wait=0.2",
+    "dev": "pnpm run predev && watch unbuild src --wait=0.2",
     "lint": "eslint . --fix",
     "test": "vitest run",
     "test-watch": "vitest",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "predev": "wait-on -d 250 ../generator/dist/index.d.ts"
   },
   "main": "./dist/index-server.cjs",
   "module": "./dist/index-server.mjs",
@@ -24,23 +25,32 @@
   },
   "dependencies": {
     "@blitzjs/generator": "2.0.0-beta.4",
+    "@mrleebo/prisma-ast": "0.2.6",
+    "@types/global-agent": "2.1.1",
     "arg": "5.0.1",
+    "ast-types": "0.14.2",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
     "chokidar": "3.5.3",
     "console-table-printer": "2.10.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",
     "detect-port": "1.3.0",
+    "diff": "5.0.0",
     "dotenv": "16.0.0",
     "dotenv-expand": "8.0.3",
     "envinfo": "7.8.1",
     "esbuild": "0.14.34",
     "esbuild-register": "3.3.3",
     "find-up": "4.1.0",
     "fs-extra": "10.0.1",
+    "global-agent": "3.0.0",
     "globby": "13.1.2",
+    "got": "^11.8.1",
     "hasbin": "1.2.3",
+    "ink": "3.2.0",
+    "ink-spinner": "4.0.3",
+    "jscodeshift": "0.13.0",
     "node-fetch": "3.2.3",
     "npm-which": "3.0.1",
     "ora": "5.3.0",
@@ -49,10 +59,12 @@
     "pkg-dir": "5.0.0",
     "progress": "2.0.3",
     "prompts": "2.4.2",
+    "recast": "0.20.5",
     "resolve-cwd": "3.0.0",
     "resolve-from": "5.0.0",
     "superjson": "1.9.1",
     "supports-color": "8.1.1",
+    "tar": "6.1.11",
     "ts-node": "10.7.0",
     "tsconfig-paths": "4.0.0",
     "tslog": "3.3.1",
@@ -68,6 +80,7 @@
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
     "@types/hasbin": "1.2.0",
+    "@types/jscodeshift": "0.11.2",
     "@types/node-fetch": "2.6.1",
     "@types/npm-which": "3.0.1",
     "@types/progress": "2.0.5",

diff --git a/packages/blitz/src/cli/commands/console.ts b/packages/blitz/src/cli/commands/console.ts
@@ -26,9 +26,7 @@ const consoleREPL: CliCommand = async () => {
   process.env.CLI_COMMAND_CONSOLE = "true"
   log.branded("You have entered the Blitz console")
   console.log(chalk.yellow("Tips: - Exit by typing .exit or pressing Ctrl-D"))
-  console.log(
-    chalk.yellow(`      - Use your db like this: ${getDbFolder()}.project.findMany()`),
-  )
+  console.log(chalk.yellow(`      - Use your db like this: ${getDbFolder()}.project.findMany()`))
   console.log(chalk.yellow("      - Use your queries/mutations like this: getProjects({})"))
 
   const {register} = require("esbuild-register/dist/node")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require("./dist/installer.cjs")