alpha.13

alpha.12
Use alpha version for blitz dependency, fix package manager selection (#3327 )
2026-02-03 18:01:02 -05:00 · 2022-04-29 16:25:20 -04:00 · 2022-04-29 20:10:31 +02:00 · 2022-04-29 20:08:10 +02:00
29 changed files with 577 additions and 362 deletions
--- a/.changeset/breezy-cameras-double.md
+++ b/.changeset/breezy-cameras-double.md
@@ -0,0 +1,7 @@
+---
+"blitz": patch
+"@blitzjs/next": patch
+"@blitzjs/generator": patch
+---
+
+Fix codegen and postinstall to make work with pnpm
--- a/.changeset/dirty-monkeys-greet.md
+++ b/.changeset/dirty-monkeys-greet.md
@@ -0,0 +1,6 @@
+---
+"blitz": patch
+"@blitzjs/generator": patch
+---
+
+Use alpha version for blitz dependency, fix package manager selection
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -16,6 +16,8 @@
    "toolkit-app": "1.0.0"
  },
  "changesets": [
+    "breezy-cameras-double",
+    "dirty-monkeys-greet",
    "great-months-train",
    "lovely-colts-share",
    "nine-onions-admire",
--- a/apps/toolkit-app/CHANGELOG.md
+++ b/apps/toolkit-app/CHANGELOG.md
@@ -1,5 +1,27 @@
 # toolkit-app

+## 1.0.1-alpha.8
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+  - @blitzjs/next@2.0.0-alpha.13
+  - @blitzjs/auth@2.0.0-alpha.13
+  - @blitzjs/rpc@2.0.0-alpha.13
+  - @blitzjs/config@2.0.0-alpha.13
+
+## 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
--- a/apps/toolkit-app/package.json
+++ b/apps/toolkit-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "toolkit-app",
-  "version": "1.0.1-alpha.6",
+  "version": "1.0.1-alpha.8",
  "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.13",
    "next": "12.1.1",
    "prisma": "3.9.0",
    "react": "18.0.0",
--- a/packages/blitz-auth/CHANGELOG.md
+++ b/packages/blitz-auth/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @blitzjs/auth

+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11

 ### Patch Changes
--- a/packages/blitz-auth/package.json
+++ b/packages/blitz-auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/auth",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "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.13",
    "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.13",
    "@testing-library/react": "13.0.0",
    "@testing-library/react-hooks": "7.0.2",
    "@types/cookie": "0.4.1",
--- a/packages/blitz-next/CHANGELOG.md
+++ b/packages/blitz-next/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @blitzjs/next

+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+  - @blitzjs/rpc@2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
+### Patch Changes
+
+- @blitzjs/rpc@2.0.0-alpha.12
+
 ## 2.0.0-alpha.11

 ### Patch Changes
--- a/packages/blitz-next/package.json
+++ b/packages/blitz-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/next",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "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.13",
    "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.13",
    "@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.13",
    "cross-spawn": "7.0.3",
    "find-up": "4.1.0",
    "lodash.frompairs": "4.0.1",
--- a/packages/blitz-next/scripts/postinstall.js
+++ b/packages/blitz-next/scripts/postinstall.js
@@ -27,6 +27,16 @@ async function findNodeModulesRoot(src) {
  let root
  if (isInBlitzMonorepo) {
    root = path.join(src, "node_modules")
+  } else if (src.includes(".pnpm")) {
+    const blitzPkgLocation = path.dirname(
+      (await findUp("package.json", {
+        cwd: resolveFrom(src, "blitz"),
+      })) || "",
+    )
+    if (!blitzPkgLocation) {
+      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
+    }
+    root = path.join(blitzPkgLocation, "../../../../")
  } else {
    const blitzPkgLocation = path.dirname(
      (await findUp("package.json", {
@@ -96,7 +106,11 @@ function codegen() {
      const packagePath = require.resolve("blitz/package.json")
      if (packagePath) {
        const blitzPkg = require.resolve("blitz/dist/index.cjs")
-        return path.join(blitzPkg)
+        if (blitzPkg.includes(".pnpm")) {
+          return path.join(blitzPkg, "../../../../../../blitz/dist/index.cjs")
+        } else {
+          return path.join(blitzPkg)
+        }
      }
    } catch (e) {
      //
@@ -323,6 +337,6 @@ function codegen() {
  const UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR = 'UNABLE_TO_FIND_POSTINSTALL_TRIGGER_JSON_SCHEMA_ERROR'
 }

-if (!isInstalledGlobally) {
-  codegen()
-}
+// if (!isInstalledGlobally) {
+codegen()
+// }
--- a/packages/blitz-rpc/CHANGELOG.md
+++ b/packages/blitz-rpc/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @blitzjs/rpc

+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Updated dependencies
+  - blitz@2.0.0-alpha.13
+  - @blitzjs/auth@2.0.0-alpha.13
+
+## 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
--- a/packages/blitz-rpc/package.json
+++ b/packages/blitz-rpc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/rpc",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "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.13",
    "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.13",
    "@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.13",
    "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.13",
    "next": "*"
  },
  "publishConfig": {
--- a/packages/blitz/CHANGELOG.md
+++ b/packages/blitz/CHANGELOG.md
@@ -1,5 +1,21 @@
 # blitz

+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+- Updated dependencies
+  - @blitzjs/generator@2.0.0-alpha.13
+
+## 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
--- a/packages/blitz/build.config.ts
+++ b/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,
--- a/packages/blitz/package.json
+++ b/packages/blitz/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blitz",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "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.13",
    "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.13",
    "@types/cookie": "0.4.1",
    "@types/cross-spawn": "6.0.2",
    "@types/debug": "4.1.7",
--- a/packages/blitz/src/cli/commands/new.ts
+++ b/packages/blitz/src/cli/commands/new.ts
@@ -193,13 +193,15 @@ const determinePkgManagerToInstallDeps = async () => {
        message: "Install dependencies?",
        initial: 0,
        choices: [
-          {title: "npm"},
-          {title: "yarn", disabled: !IS_YARN_INSTALLED},
-          {title: "pnpm", disabled: !IS_PNPM_INSTALLED},
+          {title: "npm", value: "npm"},
+          {title: "yarn", value: "yarn", disabled: !IS_YARN_INSTALLED},
+          {title: "pnpm", value: "pnpm", disabled: !IS_PNPM_INSTALLED},
          {title: "skip"},
        ],
      })

+      projectPkgManger = res.pkgManager
+
      if (res.pkgManager === "skip") {
        shouldInstallDeps = false
      } else {
--- a/packages/blitz/src/cli/utils/routes-manifest.ts
+++ b/packages/blitz/src/cli/utils/routes-manifest.ts
@@ -538,7 +538,11 @@ async function findNodeModulesRoot(src: string) {
      throw new Error("Internal Blitz Error: unable to find 'blitz' package location")
    }

-    root = join(blitzPkgLocation, "../")
+    if (blitzPkgLocation.includes(".pnpm")) {
+      root = join(blitzPkgLocation, "../../../../")
+    } else {
+      root = join(blitzPkgLocation, "../")
+    }
  }

  return root
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @blitzjs/config

+## 2.0.0-alpha.13
+
+## 2.0.0-alpha.12
+
 ## 2.0.0-alpha.11

 ## 2.0.0-alpha.10
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@blitzjs/config",
  "private": true,
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "license": "MIT",
  "dependencies": {
    "@typescript-eslint/eslint-plugin": "5.9.1",
--- a/packages/generator/CHANGELOG.md
+++ b/packages/generator/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @blitzjs/generator

+## 2.0.0-alpha.13
+
+### Patch Changes
+
+- Fix codegen and postinstall to make work with pnpm
+
+## 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
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@blitzjs/generator",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
  "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.13",
    "@juanm04/cpx": "2.0.1",
    "@types/babel__core": "7.1.19",
    "@types/diff": "5.0.2",
--- a/packages/generator/src/generator.ts
+++ b/packages/generator/src/generator.ts
@@ -302,7 +302,9 @@ export abstract class Generator<
      return path.join(
        __dirname,
        "..",
-        process.env.NODE_ENV === "test" ? "../templates" : "./dist/templates",
+        process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development"
+          ? "./templates"
+          : "./dist/templates",
        this.sourceRoot.path,
        ...paths,
      )
--- a/packages/generator/src/generators/app-generator.ts
+++ b/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})

@@ -235,14 +234,6 @@ export class AppGenerator extends Generator<AppGeneratorOptions> {
      }
    }

-    // if(this.options.useTs) {
-    // if(templatedPathSuffix === "pages/api/rpc/blitzrpcroute.js") {
-    //   this.fs.write(this.destinationPath("pages/api/rpc/[...blitz].js"), this.sourcePath("pages/api/rpc/blitzrpcroute.js"))
-    //  } else {
-
-    //  }
-    // }
-
    if (!this.options.skipGit && gitInitSuccessful) {
      this.commitChanges()
    }
--- a/packages/generator/src/utils/fallbackable.ts
+++ b/packages/generator/src/utils/fallbackable.ts
@@ -1,4 +1,4 @@
 export interface Fallbackable<T> {
  value: T
-  isFallback: boolean
+  isFallback?: boolean
 }
--- a/packages/generator/src/utils/get-blitz-dependency-version.ts
+++ b/packages/generator/src/utils/get-blitz-dependency-version.ts
@@ -6,16 +6,17 @@ export const getBlitzDependencyVersion = async (
  cliVersion: string,
 ): Promise<Fallbackable<string>> => {
  try {
-    const {latest, canary} = await fetchDistTags("blitz")
+    // TODO: Need to update this to handle alpha, beta and major
+    const {alpha} = await fetchDistTags("blitz")

-    if (cliVersion.includes("canary")) {
-      return {value: canary, isFallback: false}
+    if (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: ""}
  }
 }
--- a/packages/generator/src/utils/get-latest-version.ts
+++ b/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)}'` : "",
  )
 }

--- a/packages/generator/src/utils/npm-fetch.ts
+++ b/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`, {
--- a/packages/pkg-template/package.json
+++ b/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.13",
    "@types/react": "17.0.43",
    "@types/react-dom": "17.0.14",
    "react": "18.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Dillon Raphael	1e1bb73b2d	alpha.13	2022-04-29 16:25:20 -04:00
beerose	99205f52d5	alpha.12	2022-04-29 20:10:31 +02:00
Aleksandra	d03a1165d7	Use alpha version for blitz dependency, fix package manager selection (#3327 )	2022-04-29 20:08:10 +02:00