From e8ca1e15a59a979a796cf52c41327029b960e637 Mon Sep 17 00:00:00 2001 From: beerose Date: Sat, 13 Aug 2022 11:48:00 +0200 Subject: [PATCH 1/3] Use correct path for log utilities import --- packages/generator/src/generators/model-generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generator/src/generators/model-generator.ts b/packages/generator/src/generators/model-generator.ts index d9f935d9e1..68a231a3ad 100644 --- a/packages/generator/src/generators/model-generator.ts +++ b/packages/generator/src/generators/model-generator.ts @@ -2,7 +2,7 @@ import * as ast from "@mrleebo/prisma-ast" import {spawn} from "cross-spawn" import which from "npm-which" import path from "path" -import {log} from "src/utils/log" +import {log} from "../utils/log" import {Generator, GeneratorOptions, SourceRootType} from "../generator" import {Field} from "../prisma/field" import {Model} from "../prisma/model" From 1ee899683887239e7aeb51b4801cfe3742f52f41 Mon Sep 17 00:00:00 2001 From: beerose Date: Sat, 13 Aug 2022 11:48:42 +0200 Subject: [PATCH 2/3] Changeset --- .changeset/few-dogs-fetch.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/few-dogs-fetch.md diff --git a/.changeset/few-dogs-fetch.md b/.changeset/few-dogs-fetch.md new file mode 100644 index 0000000000..8da78852fc --- /dev/null +++ b/.changeset/few-dogs-fetch.md @@ -0,0 +1,5 @@ +--- +"@blitzjs/generator": patch +--- + +Use correct path for log utilities import From 5a594931069dce953136b6e45d67e4958a0bb714 Mon Sep 17 00:00:00 2001 From: beerose Date: Sat, 13 Aug 2022 11:51:23 +0200 Subject: [PATCH 3/3] Update lock file --- pnpm-lock.yaml | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5cd48bd8e0..0aa5c90a3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,7 +49,7 @@ importers: "@types/preview-email": 2.0.1 "@types/react": 18.0.1 "@typescript-eslint/eslint-plugin": 5.9.1 - blitz: workspace:2.0.0-alpha.69 + blitz: workspace:2.0.0-alpha.70 eslint: 7.32.0 eslint-config-next: 12.2.0 eslint-config-prettier: 8.5.0 @@ -524,8 +524,8 @@ importers: packages/blitz: specifiers: - "@blitzjs/config": workspace:2.0.0-alpha.69 - "@blitzjs/generator": 2.0.0-alpha.69 + "@blitzjs/config": workspace:2.0.0-alpha.70 + "@blitzjs/generator": 2.0.0-alpha.70 "@types/cookie": 0.4.1 "@types/cross-spawn": 6.0.2 "@types/debug": 4.1.7 @@ -635,7 +635,7 @@ importers: packages/blitz-auth: specifiers: - "@blitzjs/config": workspace:2.0.0-alpha.69 + "@blitzjs/config": workspace:2.0.0-alpha.70 "@testing-library/react": 13.0.0 "@testing-library/react-hooks": 7.0.2 "@types/b64-lite": 1.3.0 @@ -649,7 +649,7 @@ importers: "@types/secure-password": 3.1.1 b64-lite: 1.4.0 bad-behavior: 1.0.1 - blitz: 2.0.0-alpha.69 + blitz: 2.0.0-alpha.70 cookie: 0.4.1 cookie-session: 2.0.0 debug: 4.3.3 @@ -702,8 +702,8 @@ importers: packages/blitz-next: specifiers: - "@blitzjs/config": workspace:2.0.0-alpha.69 - "@blitzjs/rpc": 2.0.0-alpha.69 + "@blitzjs/config": workspace:2.0.0-alpha.70 + "@blitzjs/rpc": 2.0.0-alpha.70 "@tanstack/react-query": 4.0.10 "@testing-library/dom": 8.13.0 "@testing-library/jest-dom": 5.16.3 @@ -715,7 +715,7 @@ importers: "@types/react": 18.0.1 "@types/react-dom": 17.0.14 "@types/testing-library__react-hooks": 4.0.0 - blitz: 2.0.0-alpha.69 + blitz: 2.0.0-alpha.70 cross-spawn: 7.0.3 debug: 4.3.3 find-up: 4.1.0 @@ -765,15 +765,15 @@ importers: packages/blitz-rpc: specifiers: - "@blitzjs/auth": 2.0.0-alpha.69 - "@blitzjs/config": workspace:2.0.0-alpha.69 + "@blitzjs/auth": 2.0.0-alpha.70 + "@blitzjs/config": workspace:2.0.0-alpha.70 "@tanstack/react-query": 4.0.10 "@types/debug": 4.1.7 "@types/react": 18.0.1 "@types/react-dom": 17.0.14 b64-lite: 1.4.0 bad-behavior: 1.0.1 - blitz: 2.0.0-alpha.69 + blitz: 2.0.0-alpha.70 chalk: ^4.1.0 debug: 4.3.3 next: 12.2.0 @@ -816,12 +816,12 @@ importers: "@babel/plugin-syntax-typescript": 7.17.12 "@babel/preset-env": 7.12.10 "@blitzjs/config": workspace:* - "@blitzjs/generator": 2.0.0-alpha.69 + "@blitzjs/generator": 2.0.0-alpha.70 "@types/jscodeshift": 0.11.2 "@types/node": 17.0.16 arg: 5.0.1 ast-types: 0.14.2 - blitz: 2.0.0-alpha.69 + blitz: 2.0.0-alpha.70 chalk: ^4.1.0 cross-spawn: 7.0.3 debug: 4.3.3 @@ -876,7 +876,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.69 + "@blitzjs/config": 2.0.0-alpha.70 "@juanm04/cpx": 2.0.1 "@mrleebo/prisma-ast": 0.2.6 "@types/babel__core": 7.1.19 @@ -969,7 +969,7 @@ importers: packages/pkg-template: specifiers: - "@blitzjs/config": 2.0.0-alpha.69 + "@blitzjs/config": 2.0.0-alpha.70 "@types/react": 18.0.1 "@types/react-dom": 17.0.14 "@typescript-eslint/eslint-plugin": 5.9.1 @@ -3109,6 +3109,7 @@ packages: semver: 5.7.1 transitivePeerDependencies: - supports-color + dev: false /@babel/preset-flow/7.17.12_@babel+core@7.18.2: resolution: @@ -5539,6 +5540,7 @@ packages: typescript: 4.6.3 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/experimental-utils/5.28.0_hrkuebk64jiu2ut2d2sm4oylnu: resolution: @@ -9365,6 +9367,7 @@ packages: transitivePeerDependencies: - eslint-import-resolver-webpack - supports-color + dev: false /eslint-config-next/12.2.5_hrkuebk64jiu2ut2d2sm4oylnu: resolution: @@ -9402,6 +9405,7 @@ packages: hasBin: true peerDependencies: eslint: ">=7.0.0" + dev: false /eslint-config-prettier/8.5.0_eslint@7.32.0: resolution: @@ -12066,7 +12070,7 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.7.0_typescript@4.6.3 + ts-node: 10.7.0_fxg3r7oju3tntkxsvleuiot4fa transitivePeerDependencies: - bufferutil - canvas @@ -17352,7 +17356,6 @@ packages: typescript: 4.6.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - dev: false /ts-node/10.7.0_typescript@4.6.3: resolution: @@ -17385,6 +17388,7 @@ packages: typescript: 4.6.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: false /tsconfig-paths/3.14.1: resolution: