Skip to content

Commit 2aca521

Browse files
fix(codemods): Use .cjs extension for CommonJS files (#7333)
* bug(codemods): rename CommonJS files to .cjs Rename CommonJS files in codemods to distinguish them from ES module files otherwise used in this project. Resolve an issue occuring since package.json in codemods is removed when publishing causing module type data to be lost. Fix issue #7154 * Fix knip errors * Add file extension to tests * Update migration doc --------- Co-authored-by: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
1 parent 2ffd9fb commit 2aca521

28 files changed

+90
-78
lines changed

docs/framework/react/guides/migrating-to-v5.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ If you want to run it against `.js` or `.jsx` files, please use the command belo
9191
```
9292
npx jscodeshift@latest ./path/to/src/ \
9393
--extensions=js,jsx \
94-
--transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js
94+
--transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.cjs
9595
```
9696

9797
If you want to run it against `.ts` or `.tsx` files, please use the command below:
@@ -100,7 +100,7 @@ If you want to run it against `.ts` or `.tsx` files, please use the command belo
100100
npx jscodeshift@latest ./path/to/src/ \
101101
--extensions=ts,tsx \
102102
--parser=tsx \
103-
--transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js
103+
--transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.cjs
104104
```
105105

106106
Please note in the case of `TypeScript` you need to use `tsx` as the parser; otherwise, the codemod won't be applied properly!

knip.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"ignoreWorkspaces": ["examples/**", "integrations/**"],
44
"workspaces": {
55
"packages/query-codemods": {
6-
"entry": ["src/v4/*.js", "src/v5/*/*.js"],
6+
"entry": ["src/v4/**/*.cjs", "src/v5/**/*.cjs"],
77
"ignore": ["**/__testfixtures__/**"]
88
},
99
"packages/vue-query": {
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// eslint-disable-next-line @typescript-eslint/no-var-requires
2+
const defineTest = require('jscodeshift/dist/testUtils').defineTest
3+
4+
defineTest(__dirname, 'key-transformation.cjs', null, 'default-import', {
5+
parser: 'tsx',
6+
})
7+
8+
defineTest(__dirname, 'key-transformation.cjs', null, 'named-import', {
9+
parser: 'tsx',
10+
})
11+
12+
defineTest(__dirname, 'key-transformation.cjs', null, 'namespaced-import', {
13+
parser: 'tsx',
14+
})
15+
16+
defineTest(
17+
__dirname,
18+
'key-transformation.cjs',
19+
null,
20+
'parameter-is-identifier',
21+
{
22+
parser: 'tsx',
23+
},
24+
)
25+
26+
defineTest(
27+
__dirname,
28+
'key-transformation.cjs',
29+
null,
30+
'parameter-is-object-expression',
31+
{
32+
parser: 'tsx',
33+
},
34+
)
35+
36+
defineTest(__dirname, 'key-transformation.cjs', null, 'type-arguments', {
37+
parser: 'tsx',
38+
})

packages/query-codemods/src/v4/__tests__/key-transformation.test.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.js renamed to packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const defineTest = require('jscodeshift/dist/testUtils').defineTest
33

44
defineTest(
55
__dirname,
6-
'replace-import-specifier',
6+
'replace-import-specifier.cjs',
77
null,
88
'replace-import-specifier',
99
{

packages/query-codemods/src/v4/key-transformation.js renamed to packages/query-codemods/src/v4/key-transformation.cjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// eslint-disable-next-line @typescript-eslint/no-var-requires
2-
const createUtilsObject = require('../utils')
2+
const createUtilsObject = require('../utils/index.cjs')
33
// eslint-disable-next-line @typescript-eslint/no-var-requires
4-
const createKeyReplacer = require('./utils/replacers/key-replacer')
4+
const createKeyReplacer = require('./utils/replacers/key-replacer.cjs')
55
// eslint-disable-next-line @typescript-eslint/no-var-requires
6-
const createUseQueryLikeTransformer = require('../utils/transformers/use-query-like-transformer')
6+
const createUseQueryLikeTransformer = require('../utils/transformers/use-query-like-transformer.cjs')
77
// eslint-disable-next-line @typescript-eslint/no-var-requires
8-
const createQueryClientTransformer = require('../utils/transformers/query-client-transformer')
8+
const createQueryClientTransformer = require('../utils/transformers/query-client-transformer.cjs')
99
// eslint-disable-next-line @typescript-eslint/no-var-requires
10-
const createQueryCacheTransformer = require('../utils/transformers/query-cache-transformer')
10+
const createQueryCacheTransformer = require('../utils/transformers/query-cache-transformer.cjs')
1111

1212
const transformQueryClientUsages = ({
1313
jscodeshift,

0 commit comments

Comments
 (0)