pnpmlock

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

.changeset/olive-bees-buy.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+Fix templates source in RPC codemod step

.changeset/pre.json

@@ -39,6 +39,7 @@
     "nice-starfishes-live",
     "nine-onions-admire",
     "ninety-pets-heal",
+    "olive-bees-buy",
     "olive-feet-rhyme",
     "plenty-bottles-swim",
     "poor-peas-lick",
@@ -55,6 +56,7 @@
     "tasty-news-collect",
     "ten-rivers-burn",
     "tender-pianos-check",
+    "thick-parrots-float",
     "thirty-countries-build",
     "twenty-beans-pump",
     "two-kiwis-help",

.changeset/thick-parrots-float.md

@@ -0,0 +1,5 @@
+---
+"@blitzjs/codemod": patch
+---
+
+allow extension catch in getAllFiles codemod util

apps/toolkit-app/package.json

@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.31",
+    "blitz": "workspace:2.0.0-alpha.33",
     "next": "12.1.6-canary.17",
     "prisma": "3.9.0",
     "react": "18.0.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- blitz@2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "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-alpha.31",
+    "blitz": "2.0.0-alpha.33",
     "cookie": "0.4.1",
     "cookie-session": "2.0.0",
     "debug": "4.3.3",
@@ -39,7 +39,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.31",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@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,17 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.31",
+    "@blitzjs/rpc": "2.0.0-alpha.33",
     "@types/hoist-non-react-statics": "3.3.1",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
@@ -32,7 +32,7 @@
     "superjson": "1.8.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.31",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -43,7 +43,7 @@
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.31",
+    "blitz": "2.0.0-alpha.33",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.33
+- blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/auth@2.0.0-alpha.32
+- blitz@2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "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-alpha.31",
+    "@blitzjs/auth": "2.0.0-alpha.33",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
     "chalk": "^4.1.0",
@@ -30,11 +30,11 @@
     "zod": "3.10.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.31",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@types/debug": "4.1.7",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.31",
+    "blitz": "2.0.0-alpha.33",
     "next": "12.1.6-canary.17",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.31",
+    "blitz": "2.0.0-alpha.33",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,17 @@
 # blitz
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- @blitzjs/generator@2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/blitz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitz",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "scripts": {
     "build": "unbuild",
     "dev": "watch unbuild src --wait=0.2",
@@ -23,7 +23,7 @@
     "blitz": "bin/blitz"
   },
   "dependencies": {
-    "@blitzjs/generator": "2.0.0-alpha.31",
+    "@blitzjs/generator": "2.0.0-alpha.33",
     "arg": "5.0.1",
     "chalk": "^4.1.0",
     "console-table-printer": "2.10.0",
@@ -52,7 +52,7 @@
     "watchpack": "2.1.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.31",
+    "@blitzjs/config": "workspace:2.0.0-alpha.33",
     "@types/cookie": "0.4.1",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",

packages/codemod/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @blitzjs/codemod
 
+## 2.0.0-alpha.33
+
+### Patch Changes
+
+- 9e05d6e1: allow extension catch in getAllFiles codemod util
+  - @blitzjs/generator@2.0.0-alpha.33
+  - blitz@2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
+### Patch Changes
+
+- e6fb09d4: Fix templates source in RPC codemod step
+  - @blitzjs/generator@2.0.0-alpha.32
+  - blitz@2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/codemod",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "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-alpha.31",
+    "@blitzjs/generator": "2.0.0-alpha.33",
     "arg": "5.0.1",
-    "blitz": "2.0.0-alpha.31",
+    "blitz": "2.0.0-alpha.33",
     "chalk": "^4.1.0",
     "cross-spawn": "7.0.3",
     "debug": "4.3.3",

packages/codemod/src/upgrade-legacy.ts

@@ -170,7 +170,7 @@ const upgradeLegacy = async () => {
         BlitzLayout: "@blitzjs/next",
       }
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((filename) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((filename) => {
         const program = getCollectionFromSource(path.resolve(appDir, filename))
         const parsedProgram = program.get()
 
@@ -213,7 +213,7 @@ const upgradeLegacy = async () => {
   steps.push({
     name: "update NextJS' default imports",
     action: async () => {
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
 
         const nextImage = findImport(program, "next/image")
@@ -308,7 +308,12 @@ const upgradeLegacy = async () => {
     name: "create pages/api/rpc directory and add [[...blitz]].ts wildecard API route",
     action: async () => {
       const pagesDir = path.resolve("pages/api/rpc")
-      const templatePath = path.join(require.resolve("@blitzjs/generator"), "..", "..", "templates")
+      const templatePath = path.join(
+        require.resolve("@blitzjs/generator"),
+        "..",
+        "..",
+        isInternalBlitzMonorepoDevelopment ? "templates" : "dist/templates",
+      )
       const rpcRoute = fs
         .readFileSync(path.join(templatePath, "app", "pages", "api", "rpc", "blitzrpcroute.ts"))
         .toString()
@@ -472,7 +477,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       //First check ./pages
       const pagesDir = path.resolve("pages")
-      getAllFiles(pagesDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(pagesDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const filepath = path.resolve(pagesDir, file)
         const program = getCollectionFromSource(filepath)
 
@@ -515,7 +520,7 @@ const upgradeLegacy = async () => {
         fs.writeFileSync(filepath, program.toSource())
       })
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const filepath = path.resolve(appDir, file)
         const program = getCollectionFromSource(filepath)
 
@@ -645,7 +650,7 @@ const upgradeLegacy = async () => {
     name: "wrap getServerSideProps, getStaticProps and API handlers with gSSP, gSP, and api",
     action: async () => {
       const pagesDir = path.resolve("pages")
-      getAllFiles(pagesDir, [], ["api"]).forEach((file) => {
+      getAllFiles(pagesDir, [], ["api"], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
 
         // 1. getServerSideProps
@@ -669,7 +674,12 @@ const upgradeLegacy = async () => {
 
       // 3. api
       if (fs.existsSync(path.join(pagesDir, "api"))) {
-        getAllFiles(path.join(pagesDir, "api"), [], ["rpc"]).forEach((file) => {
+        getAllFiles(
+          path.join(pagesDir, "api"),
+          [],
+          ["rpc"],
+          [".ts", ".tsx", ".js", ".jsx"],
+        ).forEach((file) => {
           const program = getCollectionFromSource(file)
 
           const defaultExportPath = findDefaultExportPath(program)
@@ -692,7 +702,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       let errors = 0
 
-      getAllFiles(appDir, [], ["components"], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], ["components"], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const middlewarePath = findVariable(program, "middleware")
         if (middlewarePath?.length) {
@@ -712,7 +722,7 @@ const upgradeLegacy = async () => {
     action: async () => {
       let errors = 0
 
-      getAllFiles(appDir, [], [], [".css"]).forEach((file) => {
+      getAllFiles(appDir, [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
         if (invokeWithMiddlewarePath?.length) {
@@ -721,7 +731,7 @@ const upgradeLegacy = async () => {
         }
       })
 
-      getAllFiles(path.resolve("pages"), [], [], [".css"]).forEach((file) => {
+      getAllFiles(path.resolve("pages"), [], [], [".ts", ".tsx", ".js", ".jsx"]).forEach((file) => {
         const program = getCollectionFromSource(file)
         const invokeWithMiddlewarePath = findCallExpression(program, "invokeWithMiddleware")
         if (invokeWithMiddlewarePath?.length) {

packages/codemod/src/utils.ts

@@ -192,17 +192,21 @@ export function getAllFiles(
   dirPath: string,
   accFiles: string[] = [],
   skipDirs?: string[],
-  skipExt?: string[],
+  allowedExt?: string[],
 ) {
   let currentFiles = fs.readdirSync(dirPath)
 
   currentFiles.forEach((file) => {
     if (fs.statSync(dirPath + "/" + file).isDirectory()) {
       if (!skipDirs?.includes(file)) {
-        accFiles = getAllFiles(dirPath + "/" + file, accFiles, skipDirs, skipExt)
+        accFiles = getAllFiles(dirPath + "/" + file, accFiles, skipDirs, allowedExt)
       }
     } else {
-      if (!skipExt?.includes(path.extname(file))) {
+      if (allowedExt?.length) {
+        if (allowedExt?.includes(path.extname(file))) {
+          accFiles.push(path.join(dirPath, "/", file))
+        }
+      } else {
         accFiles.push(path.join(dirPath, "/", file))
       }
     }

packages/config/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ## 2.0.0-alpha.30

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.33
+
+## 2.0.0-alpha.32
+
 ## 2.0.0-alpha.31
 
 ### Patch Changes

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.33",
   "scripts": {
     "dev": "watch unbuild src --wait=0.2",
     "build": "unbuild && pnpm build:templates",
@@ -45,7 +45,7 @@
     "vinyl": "2.2.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.31",
+    "@blitzjs/config": "2.0.0-alpha.33",
     "@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-alpha.31",
+    "@blitzjs/config": "2.0.0-alpha.33",
     "@types/react": "18.0.1",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",