Skip to content

Commit 567aaf9

Browse files
authored
Merge pull request #873 from hoverinc/fix/post-seven-dot-oh
🐛 Post 7.0 fixes
2 parents 6f208dd + f95265d commit 567aaf9

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,13 @@ module.exports = require('@hover/javascript/prettier')
146146

147147
Or, for Jest in `jest.config.js`:
148148

149-
> ℹ️ If **ts-jest** is installed, it will automatically be used as the `preset`
149+
> ⚠️ Starting with
150+
> [**7.0**](https://github.com/hoverinc/hover-javascript/releases/tag/v7.0.0),
151+
> the default Jest `transform` is
152+
> [**@swc-node/jest**](https://github.com/swc-project/swc-node/#swc-nodejest).
153+
> If you want to continue using
154+
> [**ts-jest**](https://kulshekhar.github.io/ts-jest/), simpy install `ts-jest`
155+
> in your project and it will automatically be used as the `transform` instead.
150156
151157
```js
152158
const config = require('@hover/javascript/jest')

src/api/commit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const configs = path =>
5656
* Enumerate one level of directories
5757
*
5858
* @param {string} path - directory to enumerate
59-
* @param {DirsOptions} options -
59+
* @param {DirsOptions} [options] - options
6060
*/
6161
const dirs = (path, options) => {
6262
const {exclude, prefix} = {exclude: /^node_modules/, ...options}

src/config/jest.config.js

+11-3
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,18 @@ const jestConfig = {
3737
? Object.fromEntries(
3838
// Ensure we can resolve the preset even when
3939
// it's in a nested `node_modules` installation
40-
Object.entries(require('ts-jest/presets').transform).map(
41-
([glob, transformer]) => [
40+
Object.entries(require('ts-jest/presets').jsWithTs.transform).map(
41+
([glob, [transformer, options]]) => [
4242
glob,
43-
[require.resolve(transformer), {diagnostics: {warnOnly: true}}],
43+
[
44+
require.resolve(transformer),
45+
{
46+
...options,
47+
diagnostics: {
48+
warnOnly: true,
49+
},
50+
},
51+
],
4452
],
4553
),
4654
)
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`commit-msg adds env flag with HUSKY_GIT_PARAMS when available 1`] = `commitlint --env HUSKY_GIT_PARAMS --config ./src/config/commitlint.config.js`;
3+
exports[`commit-msg adds env flag with HUSKY_GIT_PARAMS when available 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --env HUSKY_GIT_PARAMS --config ./src/config/commitlint.config.js`;
44

5-
exports[`commit-msg calls @commitlint/cli with default args 1`] = `commitlint --config ./src/config/commitlint.config.js --edit`;
5+
exports[`commit-msg calls @commitlint/cli with default args 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --config ./src/config/commitlint.config.js --edit`;
66

7-
exports[`commit-msg defaults to \`--edit\` when no args are passed and HUSKY_GIT_PARAMS is not available 1`] = `commitlint --config ./src/config/commitlint.config.js --edit`;
7+
exports[`commit-msg defaults to \`--edit\` when no args are passed and HUSKY_GIT_PARAMS is not available 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --config ./src/config/commitlint.config.js --edit`;
88

9-
exports[`commit-msg does not use built-in config with --config 1`] = `commitlint --config ./custom-config.js`;
9+
exports[`commit-msg does not use built-in config with --config 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --config ./custom-config.js`;
1010

11-
exports[`commit-msg does not use built-in config with commitlint.config.js file 1`] = `commitlint --edit`;
11+
exports[`commit-msg does not use built-in config with commitlint.config.js file 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --edit`;
1212

13-
exports[`commit-msg forwards args 1`] = `commitlint --config ./src/config/commitlint.config.js --edit .git/COMMIT_EDITMSG`;
13+
exports[`commit-msg forwards args 1`] = `TS_NODE_TRANSPILE_ONLY=true commitlint --config ./src/config/commitlint.config.js --edit .git/COMMIT_EDITMSG`;

src/scripts/commit-msg.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ const config = useBuiltinConfig
2222
: []
2323

2424
const result = spawn.sync(
25-
resolveBin('@commitlint/cli', {executable: 'commitlint'}),
25+
`TS_NODE_TRANSPILE_ONLY=true ${resolveBin('@commitlint/cli', {
26+
executable: 'commitlint',
27+
})}`,
2628
[...env, ...config, ...args, ...defaultEdit],
2729
{
2830
stdio: 'inherit',

0 commit comments

Comments
 (0)