alpha.12

.changeset/dirty-monkeys-greet.md

@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Use alpha version for blitz dependency, fix package manager selection

.changeset/pre.json

@@ -16,6 +16,7 @@
     "toolkit-app": "1.0.0"
   },
   "changesets": [
+    "dirty-monkeys-greet",
     "great-months-train",
     "lovely-colts-share",
     "nine-onions-admire",

apps/toolkit-app/CHANGELOG.md

@@ -1,5 +1,16 @@
 # toolkit-app
 
+## 1.0.1-alpha.7
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+  - @blitzjs/auth@2.0.0-alpha.12
+  - @blitzjs/next@2.0.0-alpha.12
+  - @blitzjs/rpc@2.0.0-alpha.12
+  - @blitzjs/config@2.0.0-alpha.12
+
 ## 1.0.1-alpha.6
 
 ### Patch Changes

apps/toolkit-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolkit-app",
-  "version": "1.0.1-alpha.6",
+  "version": "1.0.1-alpha.7",
   "scripts": {
     "start:dev": "pnpm run prisma:start && next dev",
     "buildapp": "prisma generate && next build",
@@ -29,7 +29,7 @@
     "@blitzjs/rpc": "workspace:*",
     "@hookform/resolvers": "2.8.8",
     "@prisma/client": "3.9.0",
-    "blitz": "workspace:2.0.0-alpha.11",
+    "blitz": "workspace:2.0.0-alpha.12",
     "next": "12.1.1",
     "prisma": "3.9.0",
     "react": "18.0.0",

packages/blitz-auth/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @blitzjs/auth
 
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11
 
 ### Patch Changes

packages/blitz-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.12",
   "scripts": {
     "build": "unbuild",
     "predev": "wait-on -d 250 ../blitz/dist/index-server.d.ts",
@@ -24,7 +24,7 @@
     "@types/secure-password": "3.1.1",
     "b64-lite": "1.4.0",
     "bad-behavior": "1.0.1",
-    "blitz": "2.0.0-alpha.11",
+    "blitz": "2.0.0-alpha.12",
     "cookie": "0.4.1",
     "debug": "4.3.3",
     "http": "0.0.1-security",
@@ -35,7 +35,7 @@
     "url": "0.11.0"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.11",
+    "@blitzjs/config": "workspace:2.0.0-alpha.12",
     "@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,11 @@
 # @blitzjs/next
 
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11
 
 ### Patch Changes

packages/blitz-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.12",
   "scripts": {
     "build": "unbuild",
     "dev": "pnpm predev && pnpm watch unbuild src --wait=0.2",
@@ -23,13 +23,13 @@
     "eslint.js"
   ],
   "dependencies": {
-    "@blitzjs/rpc": "2.0.0-alpha.11",
+    "@blitzjs/rpc": "2.0.0-alpha.12",
     "debug": "4.3.3",
     "fs-extra": "10.0.1",
     "react-query": "3.21.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "workspace:2.0.0-alpha.11",
+    "@blitzjs/config": "workspace:2.0.0-alpha.12",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.0.0",
@@ -40,7 +40,7 @@
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/testing-library__react-hooks": "4.0.0",
-    "blitz": "2.0.0-alpha.11",
+    "blitz": "2.0.0-alpha.12",
     "cross-spawn": "7.0.3",
     "find-up": "4.1.0",
     "lodash.frompairs": "4.0.1",

packages/blitz-rpc/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @blitzjs/rpc
 
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+  - @blitzjs/auth@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11
 
 ### Patch Changes

packages/blitz-rpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.12",
   "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.11",
+    "@blitzjs/auth": "2.0.0-alpha.12",
     "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.11",
+    "@blitzjs/config": "workspace:2.0.0-alpha.12",
     "@types/debug": "4.1.7",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
-    "blitz": "2.0.0-alpha.11",
+    "blitz": "2.0.0-alpha.12",
     "next": "12.1.1",
     "react": "18.0.0",
     "react-dom": "18.0.0",
@@ -43,7 +43,7 @@
     "watch": "1.0.2"
   },
   "peerDependencies": {
-    "blitz": "2.0.0-alpha.11",
+    "blitz": "2.0.0-alpha.12",
     "next": "*"
   },
   "publishConfig": {

packages/blitz/CHANGELOG.md

@@ -1,5 +1,13 @@
 # blitz
 
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Use alpha version for blitz dependency, fix package manager selection
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11
 
 ### Patch Changes

packages/blitz/build.config.ts

@@ -2,7 +2,7 @@ import {BuildConfig} from "unbuild"
 
 const config: BuildConfig = {
   entries: ["./src/index-browser", "./src/index-server", "./src/cli/index"],
-  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod", "@blitzjs/generator"],
+  externals: ["index-browser.cjs", "index-browser.mjs", "index.cjs", "zod"],
   declaration: true,
   rollup: {
     emitCJS: true,

packages/blitz/package.json

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

packages/blitz/src/cli/commands/new.ts

@@ -199,6 +199,7 @@ const determinePkgManagerToInstallDeps = async () => {
           {title: "skip"},
         ],
       })
+      projectPkgManger = res.pkgManager
 
       if (res.pkgManager === "skip") {
         shouldInstallDeps = false

packages/config/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @blitzjs/config
 
+## 2.0.0-alpha.12
+
 ## 2.0.0-alpha.11
 
 ## 2.0.0-alpha.10

packages/config/package.json

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

packages/generator/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @blitzjs/generator
 
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Use alpha version for blitz dependency, fix package manager selection
+
 ## 2.0.0-alpha.11
 
 ## 2.0.0-alpha.10

packages/generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.12",
   "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.11",
+    "@blitzjs/config": "2.0.0-alpha.12",
     "@juanm04/cpx": "2.0.1",
     "@types/babel__core": "7.1.19",
     "@types/diff": "5.0.2",

packages/generator/src/generators/app-generator.ts

@@ -111,7 +111,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     const [
       {value: newDependencies, isFallback: dependenciesUsedFallback},
       {value: newDevDependencies, isFallback: devDependenciesUsedFallback},
-      {value: blitzDependencyVersion, isFallback: blitzUsedFallback},
+      {value: blitzDependencyVersion},
     ] = await Promise.all([
       fetchLatestVersionsFor(pkg.dependencies),
       fetchLatestVersionsFor(pkg.devDependencies),
@@ -122,8 +122,7 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
     pkg.devDependencies = newDevDependencies
     pkg.dependencies.blitz = blitzDependencyVersion
 
-    const fallbackUsed =
-      dependenciesUsedFallback || devDependenciesUsedFallback || blitzUsedFallback
+    const fallbackUsed = dependenciesUsedFallback || devDependenciesUsedFallback
 
     await writeJson(pkgJsonLocation, pkg, {spaces: 2})
 

packages/generator/src/utils/fallbackable.ts

@@ -1,4 +1,4 @@
 export interface Fallbackable<T> {
   value: T
-  isFallback: boolean
+  isFallback?: boolean
 }

packages/generator/src/utils/get-blitz-dependency-version.ts

@@ -6,16 +6,16 @@ export const getBlitzDependencyVersion = async (
   cliVersion: string,
 ): Promise<Fallbackable<string>> => {
   try {
-    const {latest, canary} = await fetchDistTags("blitz")
+    const {alpha} = await fetchDistTags("blitz")
 
-    if (cliVersion.includes("canary")) {
-      return {value: canary, isFallback: false}
+    if (cliVersion.includes("alpha")) {
+      return {value: alpha}
     }
 
-    return {value: latest, isFallback: false}
+    logFailedVersionFetch("blitz")
+    return {value: ""}
   } catch (error) {
-    const fallback = "latest"
-    logFailedVersionFetch("blitz", fallback)
-    return {value: fallback, isFallback: true}
+    logFailedVersionFetch("blitz")
+    return {value: ""}
   }
 }

packages/generator/src/utils/get-latest-version.ts

@@ -2,12 +2,10 @@ import chalk from "chalk"
 import {Fallbackable} from "./fallbackable"
 import {fetchAllVersions, fetchLatestDistVersion} from "./npm-fetch"
 
-export const logFailedVersionFetch = (dependency: string, fallback: string) => {
-  // log.clearLine()
+export const logFailedVersionFetch = (dependency: string, fallback?: string) => {
   console.warn(
-    `Failed to fetch latest version of '${chalk.bold(dependency)}', falling back to '${chalk.bold(
-      fallback,
-    )}'.`,
+    `Failed to fetch latest version of '${chalk.bold(dependency)}'`,
+    fallback ? `Falling back to '${chalk.bold(fallback)}'` : "",
   )
 }
 

packages/generator/src/utils/npm-fetch.ts

@@ -12,7 +12,7 @@ export const fetchAllVersions = async (dependency: string) => {
   return Object.keys(res.versions)
 }
 
-type NpmDistTagsResponse = {latest: string; canary: string}
+type NpmDistTagsResponse = {latest: string; canary: string; alpha: string}
 
 export const fetchDistTags = async (dependency: string) => {
   const res = await got(`https://registry.npmjs.org/-/package/${dependency}/dist-tags`, {

packages/pkg-template/package.json

@@ -25,7 +25,7 @@
     "@typescript-eslint/parser": "5.9.1"
   },
   "devDependencies": {
-    "@blitzjs/config": "2.0.0-alpha.11",
+    "@blitzjs/config": "2.0.0-alpha.12",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "react": "18.0.0",

pnpm-lock.yaml

@@ -50,7 +50,7 @@ importers:
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
       "@types/react": 17.0.43
-      blitz: workspace:2.0.0-alpha.10
+      blitz: workspace:2.0.0-alpha.11
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1
@@ -263,8 +263,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.10
-      "@blitzjs/generator": 2.0.0-alpha.10
+      "@blitzjs/config": workspace:2.0.0-alpha.11
+      "@blitzjs/generator": 2.0.0-alpha.11
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -356,7 +356,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.10
+      "@blitzjs/config": workspace:2.0.0-alpha.11
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -368,7 +368,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.10
+      blitz: 2.0.0-alpha.11
       cookie: 0.4.1
       debug: 4.3.3
       http: 0.0.1-security
@@ -413,8 +413,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.10
-      "@blitzjs/rpc": 2.0.0-alpha.10
+      "@blitzjs/config": workspace:2.0.0-alpha.11
+      "@blitzjs/rpc": 2.0.0-alpha.11
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
       "@testing-library/react": 13.0.0
@@ -425,7 +425,7 @@ importers:
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.10
+      blitz: 2.0.0-alpha.11
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -472,14 +472,14 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.10
-      "@blitzjs/config": workspace:2.0.0-alpha.10
+      "@blitzjs/auth": 2.0.0-alpha.11
+      "@blitzjs/config": workspace:2.0.0-alpha.11
       "@types/debug": 4.1.7
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.10
+      blitz: 2.0.0-alpha.11
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.1.1
@@ -534,7 +534,7 @@ importers:
       "@babel/plugin-transform-typescript": 7.12.1
       "@babel/preset-env": 7.12.10
       "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-alpha.10
+      "@blitzjs/config": 2.0.0-alpha.11
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -625,7 +625,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.10
+      "@blitzjs/config": 2.0.0-alpha.11
       "@types/react": 17.0.43
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1