From 901a63fa9eabe073eec2ae2dc5b2017c7892eb85 Mon Sep 17 00:00:00 2001 From: "Sakamoto, Kazunori" Date: Sun, 6 Feb 2022 15:46:46 +0900 Subject: [PATCH] feat: improve blitz support --- src/generators/packageJson.ts | 14 +++++++++++++- src/generators/tsconfig.ts | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/generators/packageJson.ts b/src/generators/packageJson.ts index 3ca21fa7..f9312bea 100644 --- a/src/generators/packageJson.ts +++ b/src/generators/packageJson.ts @@ -33,6 +33,14 @@ const scriptsWithWorkspace = merge( } ); +const scriptsForBlitz = merge( + { ...scriptsWithoutWorkspace }, + { + lint: `eslint --color "./**/*.{${Extensions.eslint.join(',')}}"`, + typecheck: `tsc --noEmit --Pretty || echo 'Please try "yarn blitz codegen" if you face unknown type errors.'`, + } +); + const jsCommonDeps = [ 'eslint', 'eslint-config-prettier', @@ -85,7 +93,11 @@ export async function generatePackageJson( jsonObj.scripts = merge( jsonObj.scripts, - config.containingSubPackageJsons ? scriptsWithWorkspace : scriptsWithoutWorkspace + config.containingSubPackageJsons + ? scriptsWithWorkspace + : config.depending.blitz + ? scriptsForBlitz + : scriptsWithoutWorkspace ); jsonObj.scripts.prettify += await generatePrettierSuffix(config.dirPath); diff --git a/src/generators/tsconfig.ts b/src/generators/tsconfig.ts index 9544864b..427ed89f 100644 --- a/src/generators/tsconfig.ts +++ b/src/generators/tsconfig.ts @@ -55,6 +55,8 @@ const subJsonObj = { }; export async function generateTsconfig(config: PackageConfig, rootConfig: PackageConfig): Promise { + if (rootConfig.depending.blitz) return; + let newJsonObj: any = cloneDeep(config.root ? rootJsonObj : subJsonObj); if (!config.containingJsxOrTsx && !config.containingJsxOrTsxInPackages) { delete newJsonObj.compilerOptions.jsx;