From c4bd98b1f4994b38f76973c698ff3e3c8170c38b Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Tue, 30 Apr 2019 09:16:23 -0400 Subject: [PATCH 1/2] Fix lint-staged and husky internally --- package.json | 4 ++-- src/index.js | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 38c72e474..8db9f7f74 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ } }, "lint-staged": { - "lib/*.js": [ - "prettier --trailing-comma es5 --single-quote --write", + "*.{js,css,json,md,ts,tsx}": [ + "prettier --write", "git add" ] }, diff --git a/src/index.js b/src/index.js index af1753a45..e8df4c7b7 100755 --- a/src/index.js +++ b/src/index.js @@ -139,6 +139,26 @@ prog prepare: 'npm run build', test: 'tsdx test', }, + husky: { + hooks: { + 'pre-commit': 'lint-staged', + }, + }, + 'lint-staged': { + linters: { + '*.{ts,tsx,js,jsx,md}': [ + 'prettier --trailing-comma es5 --single-quote --write', + 'git add', + ], + ignore: ['**/dist/*, **/node_modules/*'], + }, + }, + prettier: { + printWidth: 80, + semi: true, + singleQuote: true, + trailingComma: 'es5', + }, }; await fs.outputJSON(path.resolve(projectPath, 'package.json'), pkgJson); bootSpinner.succeed(`Created ${chalk.bold.green(pkg)}`); @@ -148,7 +168,14 @@ prog logError(error); process.exit(1); } - const deps = ['@types/jest', 'tsdx', 'typescript']; + const deps = [ + '@types/jest', + 'husky', + 'lint-staged', + 'prettier', + 'tsdx', + 'typescript', + ]; const installSpinner = ora(Messages.installing(deps)).start(); try { From 570b9c58f21be3256fc6fe9e48a21f6e14273739 Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Tue, 30 Apr 2019 09:20:16 -0400 Subject: [PATCH 2/2] Add prettier, husky, lint-staged to template --- package.json | 6 +++--- src/index.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8db9f7f74..1e46a62d8 100644 --- a/package.json +++ b/package.json @@ -81,8 +81,8 @@ } }, "lint-staged": { - "*.{js,css,json,md,ts,tsx}": [ - "prettier --write", + "src/*.js": [ + "prettier --trailing-comma es5 --single-quote --write", "git add" ] }, @@ -92,4 +92,4 @@ "singleQuote": true, "trailingComma": "es5" } -} +} \ No newline at end of file diff --git a/src/index.js b/src/index.js index e8df4c7b7..d6d4a73e7 100755 --- a/src/index.js +++ b/src/index.js @@ -146,7 +146,7 @@ prog }, 'lint-staged': { linters: { - '*.{ts,tsx,js,jsx,md}': [ + '*.{ts,tsx,js,jsx,css,scss,md}': [ 'prettier --trailing-comma es5 --single-quote --write', 'git add', ],