rename test-get-initial-props

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/pre.json

@@ -43,18 +43,24 @@
     "cuddly-pugs-crash",
     "curly-rules-speak",
     "curly-seas-serve",
+    "cyan-bulldogs-heal",
+    "cyan-cars-greet",
     "dirty-monkeys-greet",
     "dirty-planets-chew",
+    "early-lamps-itch",
     "eleven-humans-sort",
     "empty-berries-rule",
     "empty-turkeys-wave",
     "fair-carrots-guess",
+    "fair-kangaroos-clean",
     "fair-wombats-sneeze",
     "famous-kings-explain",
+    "fast-clocks-push",
     "fast-trainers-kneel",
     "few-dogs-fetch",
     "flat-bees-approve",
     "fluffy-mangos-begin",
+    "fluffy-mice-wash",
     "forty-timers-rhyme",
     "four-brooms-juggle",
     "four-meals-fry",
@@ -76,6 +82,7 @@
     "happy-hotels-visit",
     "healthy-rice-shout",
     "heavy-apes-judge",
+    "honest-candles-yawn",
     "hot-cups-rhyme",
     "hot-drinks-approve",
     "hungry-baboons-swim",
@@ -86,15 +93,18 @@
     "lemon-seas-push",
     "light-donkeys-double",
     "long-bees-hope",
+    "long-dancers-jog",
     "long-lobsters-drop",
     "lovely-berries-sell",
     "lovely-colts-share",
     "lucky-cows-try",
+    "lucky-months-guess",
     "mean-gorillas-reply",
     "modern-cameras-pull",
     "modern-ligers-behave",
     "moody-bags-walk",
     "moody-squids-cheer",
+    "nasty-suns-wash",
     "nervous-beds-travel",
     "nervous-dolls-rule",
     "new-coats-turn",
@@ -125,19 +135,23 @@
     "quiet-feet-travel",
     "quiet-pans-hunt",
     "quiet-sloths-rule",
+    "rare-crews-sleep",
     "red-badgers-retire",
     "rich-chairs-invent",
     "rich-queens-travel",
     "rotten-rocks-remember",
     "shaggy-carpets-brake",
     "sharp-falcons-begin",
+    "sharp-olives-sip",
     "shy-olives-hang",
     "shy-pumpkins-try",
     "silent-colts-reply",
     "silly-apricots-share",
+    "silly-shoes-agree",
     "six-apricots-kick",
     "slimy-humans-impress",
     "slimy-needles-taste",
+    "slow-walls-camp",
     "slow-walls-poke",
     "small-socks-confess",
     "smooth-planets-admire",
@@ -184,6 +198,7 @@
     "wicked-rings-walk",
     "wise-eels-visit",
     "wise-frogs-give",
-    "wise-rabbits-complain"
+    "wise-rabbits-complain",
+    "young-birds-talk"
   ]
 }

.github/workflows/main.yml

@@ -1,5 +1,3 @@
-# https://github.com/vercel/next.js/commits/canary/.github/workflows/build_test_deploy.yml
-
 name: CI
 
 on:
@@ -16,14 +14,8 @@ env:
 
 jobs:
   lint:
-    name: "Lint: ${{ matrix.os }}"
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        node_version:
-          - 16
+    name: Lint
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
@@ -32,7 +24,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: 16
           cache: "pnpm"
       - name: Install dependencies
         run: pnpm install  --frozen-lockfile
@@ -48,14 +40,8 @@ jobs:
         run: pnpm lint -- --api="http://127.0.0.1:9080"
 
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        node_version:
-          - 16
-    name: Build - ${{ matrix.os }}
+    runs-on: ubuntu-latest
+    name: Build
     steps:
       - uses: actions/checkout@v2
       - uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
@@ -64,7 +50,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: 16
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm manypkg check
@@ -78,19 +64,17 @@ jobs:
       - name: Build Apps
         run: pnpm build:apps -- --api="http://127.0.0.1:9080"
 
-  test:
-    name: "Test: ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})"
+  Unit-Tests:
+    name: "Unit Test: ${{ matrix.os }} (node@16)"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os:
           - ubuntu-latest
           - windows-latest
-        node_version:
-          - 16
       fail-fast: false
     env:
-      NODE_VERSION: ${{ matrix.NODE_VERSION }}
+      NODE_VERSION: 16
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -100,6 +84,74 @@ jobs:
         with:
           version: 6.32.6
 
+      - name: Setup node@16
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+        shell: bash
+
+      - run: pnpm manypkg check
+        shell: bash
+
+      - name: Turborepo local server
+        uses: felixmosh/turborepo-gh-artifacts@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          server-token: ${{ env.TURBO_TOKEN }}
+
+      - name: Build
+        run: pnpm build -- --api="http://127.0.0.1:9080"
+        shell: bash
+
+      - name: Test Packages
+        run: pnpm test -- --filter=./packages/*
+        shell: bash
+
+      - name: Test Apps
+        run: pnpm test -- --filter=./apps/*
+        shell: bash
+
+  find-integration-tests:
+    name: "Find Integration Tests"
+    runs-on: ubuntu-latest
+    outputs:
+      folders: ${{ steps.set-matrix.outputs.folders }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: set-matrix
+        name: "Find all folders"
+        shell: bash
+        run: |
+          cd ./integration-tests
+          tree -J -d -L 1 | jq -c  '.[0].contents | map(.name | tostring)'
+          folders=$(tree -J -d -L 1 | jq -c  '.[0].contents | map(.name | tostring)')
+          echo "::set-output name=folders::$folders"
+
+  Integration-Tests:
+    name: "Integration Test: ${{matrix.folder}} @ ${{ matrix.os }} "
+    needs: [find-integration-tests]
+    strategy:
+      matrix:
+        folder: ${{fromJSON(needs.find-integration-tests.outputs.folders)}}
+        os:
+          - ubuntu-latest
+          - windows-latest
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - run: echo ${{matrix.folder}}
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PNPM
+        uses: pnpm/action-setup@646cdf48217256a3d0b80361c5a50727664284f2
+        with:
+          version: 6.32.6
+
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v2
         with:
@@ -123,6 +175,6 @@ jobs:
         run: pnpm build -- --api="http://127.0.0.1:9080"
         shell: bash
 
-      - name: Test
-        run: pnpm test -- --api="http://127.0.0.1:9080"
+      - name: Test Packages
+        run: pnpm test -- --filter=./integration-tests/${{matrix.folder}}
         shell: bash

apps/toolkit-app-passportjs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "toolkit-app",
+  "name": "toolkit-app-passport",
   "version": "1.0.1-alpha.16",
   "scripts": {
     "start:dev": "pnpm run prisma:start && blitz dev",
@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.3",
+    "blitz": "workspace:2.0.0-beta.4",
     "next": "12.2.5",
     "openid-client": "5.1.8",
     "prisma": "4.0.0",

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "4.0.0",
-    "blitz": "workspace:2.0.0-beta.3",
+    "blitz": "workspace:2.0.0-beta.4",
     "next": "12.2.5",
     "prisma": "4.0.0",
     "react": "18.2.0",

integration-tests/auth/package.json

@@ -2,6 +2,9 @@
   "name": "test-auth",
   "version": "0.0.0",
   "private": true,
+  "prisma": {
+    "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
+  },
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
     "test": "pnpm run prisma:start && vitest run",
@@ -9,7 +12,7 @@
     "start": "next start",
     "lint": "next lint",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
-    "prisma:start": "prisma generate && prisma migrate deploy",
+    "prisma:start": "prisma generate && prisma migrate dev",
     "prisma:studio": "prisma studio"
   },
   "dependencies": {

integration-tests/auth/prisma/seed.ts

@@ -1,8 +1,8 @@
 import prisma from "./index"
-import {SecurePassword} from "@blitzjs/auth"
+import { SecurePassword } from "@blitzjs/auth"
 
 const seed = async () => {
-  await prisma.$reset()
+  // await prisma.$reset()
 
   const hashedPassword = await SecurePassword.hash("abcd1234")
 
@@ -12,7 +12,11 @@ const seed = async () => {
       hashedPassword,
       role: "user",
     },
-  })
+  }).catch(console.error)
+
+  process.exit(0);
 }
 
+seed()
+
 export default seed

integration-tests/auth/test/index.test.ts

@@ -128,7 +128,7 @@ describe("Auth Tests", () => {
       try {
         appPort = await findPort()
         app = await launchApp(appDir, appPort, {cwd: process.cwd()})
-        await seed()
+        // await seed()
       } catch (error) {
         console.log(error)
       }

integration-tests/get-initial-props/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "test-trailing-slash",
+  "name": "test-get-initial-props",
   "version": "0.0.0",
   "private": true,
   "scripts": {

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/auth
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- 713aead9: Allow specifying custom strategy name in Blitz's passport adapter
+- Updated dependencies [c213d521]
+- Updated dependencies [0b94a450]
+- Updated dependencies [161270e3]
+  - blitz@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -26,7 +26,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-beta.3",
+    "blitz": "2.0.0-beta.4",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -40,7 +40,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.3",
+    "@blitzjs/config": "workspace:2.0.0-beta.4",
     "@testing-library/react": "13.0.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/cookie": "0.4.1",

packages/blitz-next/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @blitzjs/next
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- 69fb2803: Allow setting static page properties (e.g. `getInitialProps`) on the App component
+- 0b94a450: Upgrade superjson to the latest version
+- Updated dependencies [c213d521]
+- Updated dependencies [0b94a450]
+- Updated dependencies [f6dac093]
+  - @blitzjs/rpc@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -24,7 +24,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-beta.3",
+    "@blitzjs/rpc": "2.0.0-beta.4",
     "@tanstack/react-query": "4.0.10",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
@@ -34,7 +34,7 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.3",
+    "@blitzjs/config": "workspace:2.0.0-beta.4",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -44,7 +44,7 @@
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-beta.3",
+    "blitz": "2.0.0-beta.4",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "next": "12.2.5",

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/rpc
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- c213d521: Fix issue with the route name that's generated for nested routes in @blitzjs/rpc. This was causing issues for windows users.
+- 0b94a450: Upgrade superjson to the latest version
+- f6dac093: Improve RPC logging: print `resolverName()` insetad of `/resolverName()`
+- Updated dependencies [713aead9]
+  - @blitzjs/auth@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-beta.3",
+  "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",
@@ -20,7 +20,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@blitzjs/auth": "2.0.0-beta.3",
+    "@blitzjs/auth": "2.0.0-beta.4",
     "@tanstack/react-query": "4.0.10",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
@@ -30,11 +30,11 @@
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.3",
+    "@blitzjs/config": "workspace:2.0.0-beta.4",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-beta.3",
+    "blitz": "2.0.0-beta.4",
     "next": "12.2.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/blitz/CHANGELOG.md

@@ -1,5 +1,19 @@
 # blitz
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- c213d521: Fix issue with the route name that's generated for nested routes in @blitzjs/rpc. This was causing issues for windows users.
+- 0b94a450: Upgrade superjson to the latest version
+- 161270e3: Only run the prisma generate command when the schema file changes.
+- Updated dependencies [7498aef4]
+- Updated dependencies [22344d05]
+- Updated dependencies [8fa9a56f]
+- Updated dependencies [c53978d5]
+- Updated dependencies [a84b8de4]
+  - @blitzjs/generator@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-beta.3",
+    "@blitzjs/generator": "2.0.0-beta.4",
     "arg": "5.0.1",
     "boxen": "7.0.0",
     "chalk": "^4.1.0",
@@ -55,7 +55,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-beta.3",
+    "@blitzjs/config": "workspace:2.0.0-beta.4",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/codemod/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @blitzjs/codemod
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- d3403cf8: Show file path on error when running the upgrade legacy codemod.
+- 74a4ce8e: Add `AuthenticatedSessionContext` to the `upgrade-legacy` codemod import map
+- 43e65cfe: Remove TypeScript type annotations from `next.config.js` (a JavaScript file) in the `upgrade-legacy` codemod.
+- da914c92: Convert import statements to require when creating the next.config.js file in the codemod
+- Updated dependencies [7498aef4]
+- Updated dependencies [c213d521]
+- Updated dependencies [0b94a450]
+- Updated dependencies [22344d05]
+- Updated dependencies [8fa9a56f]
+- Updated dependencies [c53978d5]
+- Updated dependencies [a84b8de4]
+- Updated dependencies [161270e3]
+  - @blitzjs/generator@2.0.0-beta.4
+  - blitz@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -25,9 +25,9 @@
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-syntax-jsx": "7.17.12",
     "@babel/plugin-syntax-typescript": "7.17.12",
-    "@blitzjs/generator": "2.0.0-beta.3",
+    "@blitzjs/generator": "2.0.0-beta.4",
     "arg": "5.0.1",
-    "blitz": "2.0.0-beta.3",
+    "blitz": "2.0.0-beta.4",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/config/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/config
 
+## 2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ## 2.0.0-beta.2

packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blitzjs/config",
   "private": true,
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "license": "MIT",
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "5.9.1",

packages/generator/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @blitzjs/generator
 
+## 2.0.0-beta.4
+
+### Patch Changes
+
+- 7498aef4: Fix tsconfig.json referencing blitz-env.d.ts insetad of next-env.d.ts in new app templates
+- 22344d05: New apps generated by the cli was missing the getLayout function in \_app, so when you used the getLayout property on your page, it didn't render. **You'll need to manually update your \_app if you generated an app with blitz v2**.
+- 8fa9a56f: Fix eslint and types setup in minimal app template
+- c53978d5: Fix upgrade-legacy `Update imports` step — import `getAntiCSRFToken` and `AuthenticatedMiddlewareCtx` from correct locations
+- a84b8de4: Remove `-cookie-prefix` appended to the `cookiePrefix` config property in the new app template. It will also fix auth and CSRF issues for users upgrading from a legacy framework.
+
 ## 2.0.0-beta.3
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -46,7 +46,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.3",
+    "@blitzjs/config": "2.0.0-beta.4",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-beta.3",
+    "@blitzjs/config": "2.0.0-beta.4",
     "@types/react": "18.0.17",
     "@types/react-dom": "17.0.14",
     "react": "18.2.0",