Skip to content

Commit ec379e4

Browse files
authored
Merge pull request #4081 from aryaemami59/fix-codemods
Fix codemods to work with TypeScript 4.7+
2 parents d1fa1b1 + 9eb7331 commit ec379e4

35 files changed

+2321
-1210
lines changed

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
"examples/action-listener/*"
2424
],
2525
"devDependencies": {
26+
"@typescript-eslint/eslint-plugin": "6.12.0",
27+
"@typescript-eslint/parser": "6.12.0",
2628
"eslint": "^7.25.0",
2729
"eslint-config-prettier": "^9.1.0",
2830
"eslint-config-react-app": "^7.0.1",
@@ -47,7 +49,6 @@
4749
"@babel/types": "7.19.3",
4850
"esbuild": "0.19.7",
4951
"jest-snapshot": "29.3.1",
50-
"jscodeshift": "0.13.1",
5152
"react-redux": "npm:8.0.2",
5253
"react": "npm:18.2.0",
5354
"react-dom": "npm:18.2.0",
@@ -65,9 +66,7 @@
6566
"docs/@types/react-dom": "npm:17.0.11",
6667
"docs/@types/react": "npm:17.0.11",
6768
"type-fest": "2.19.0",
68-
"console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch",
69-
"@typescript-eslint/eslint-plugin": "6.12.0",
70-
"@typescript-eslint/parser": "6.12.0"
69+
"console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch"
7170
},
7271
"scripts": {
7372
"build": "yarn build:packages",

packages/rtk-codemods/.eslintignore

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

packages/rtk-codemods/.eslintrc.js

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

packages/rtk-codemods/.eslintrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"env": { "node": true },
3+
"extends": ["eslint:recommended"],
4+
"ignorePatterns": ["node_modules"],
5+
"parserOptions": { "ecmaVersion": "latest" },
6+
"plugins": ["node"],
7+
"rules": {
8+
"no-unused-vars": [0],
9+
"eol-last": [0]
10+
}
11+
}

packages/rtk-codemods/.gitignore

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,32 @@
1+
# Dependencies
12
/node_modules
2-
/.eslintcache
3+
4+
# Production
5+
/build
6+
7+
# Generated files
8+
.docusaurus
9+
.cache-loader
10+
11+
# Misc
12+
.DS_Store
13+
.env.local
14+
.env.development.local
15+
.env.test.local
16+
.env.production.local
17+
18+
npm-debug.log*
19+
yarn-debug.log*
20+
yarn-error.log*
21+
.cache
22+
.yarnrc
23+
.yarn/*
24+
!.yarn/patches
25+
!.yarn/releases
26+
!.yarn/plugins
27+
!.yarn/sdks
28+
!.yarn/versions
29+
.pnp.*
30+
*.tgz
31+
32+
/.eslintcache

packages/rtk-codemods/.prettierrc

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "none",
4+
"printWidth": 80,
5+
"semi": false
6+
}

packages/rtk-codemods/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ node ./bin/cli.js <TRANSFORM NAME> path/of/files/ or/some**/*glob.js
2727

2828
- [createReducerBuilder](transforms/createReducerBuilder/README.md)
2929
- [createSliceBuilder](transforms/createSliceBuilder/README.md)
30+
- [createSliceReducerBuilder](transforms/createSliceReducerBuilder/README.md)
3031
<!--TRANSFORMS_END-->
3132

3233
## Contributing

packages/rtk-codemods/bin/cli.js

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,39 @@
11
#!/usr/bin/env node
2-
const path = require('path');
2+
import { execaSync } from 'execa'
3+
import { globbySync } from 'globby'
4+
import { createRequire } from 'node:module'
5+
import path from 'node:path'
6+
import { fileURLToPath } from 'node:url'
37

4-
require('ts-node').register({
5-
project: path.join(__dirname, './tsconfig.json'),
6-
});
8+
const require = createRequire(import.meta.url)
79

8-
require('codemod-cli').runTransform(
10+
const __filename = fileURLToPath(import.meta.url)
11+
const __dirname = path.dirname(__filename)
12+
13+
const transformerDirectory = path.join(
914
__dirname,
10-
process.argv[2] /* transform name */,
11-
process.argv.slice(3) /* paths or globs */
12-
);
15+
'..',
16+
'transforms',
17+
`${process.argv[2]}/index.ts`
18+
)
19+
20+
const jscodeshiftExecutable = require.resolve('.bin/jscodeshift')
21+
22+
const extensions = 'ts,js,tsx,jsx'
23+
24+
execaSync(
25+
jscodeshiftExecutable,
26+
[
27+
'-t',
28+
transformerDirectory,
29+
'--extensions',
30+
extensions,
31+
...(process.argv.slice(3).length === 1
32+
? globbySync(process.argv[3])
33+
: globbySync(process.argv.slice(3)))
34+
],
35+
{
36+
stdio: 'inherit',
37+
stripFinalNewline: false
38+
}
39+
)

packages/rtk-codemods/bin/tsconfig.json

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

0 commit comments

Comments
 (0)