Skip to content

Commit 3d14938

Browse files
committed
🐛 codeshift/util version is now used when initalising a codemod
1 parent 433b11f commit 3d14938

File tree

9 files changed

+34
-17
lines changed

9 files changed

+34
-17
lines changed

.changeset/popular-numbers-reflect.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@codeshift/initializer': patch
3+
---
4+
5+
Initialiser now uses current @codeshift/util version when publishing pacakges

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"start:codemods": "node packages/cli/bin/codeshift-cli.js",
2626
"init:codemods": "ts-node scripts/initialize.ts",
2727
"validate:codemods": "ts-node scripts/validate.ts ./community",
28-
"release:codemods": "ts-node scripts/publish.ts ./community ./.tmp",
29-
"release-all:codemods": "ts-node scripts/publish-all.ts ./community ./.tmp",
30-
"release-all-dry:codemods": "ts-node scripts/publish-all-dry.ts ./community ./.tmp",
28+
"release:codemods": "ts-node scripts/publish.ts ./community .tmp",
29+
"release-all:codemods": "ts-node scripts/publish-all.ts ./community .tmp",
30+
"release-all-dry:codemods": "ts-node scripts/publish-all-dry.ts ./community .tmp",
3131
"prerelease": "yarn validate && yarn test",
3232
"release": "yarn changeset publish"
3333
},

packages/cli/src/main.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ describe('main', () => {
4141
try {
4242
await main([], { transform: 'path/to/transform.ts' });
4343
} catch (error) {
44+
// @ts-ignore
4445
expect(error.message).toMatch(
4546
'No path provided, please specify which files your codemod should modify',
4647
);
@@ -53,6 +54,7 @@ describe('main', () => {
5354
try {
5455
await main([mockPath], {});
5556
} catch (error) {
57+
// @ts-ignore
5658
expect(error.message).toMatch(
5759
'No transform provided, please specify a transform with either the --transform or --packages flags',
5860
);
@@ -259,6 +261,7 @@ describe('main', () => {
259261
extensions: 'js',
260262
});
261263
} catch (error) {
264+
// @ts-ignore
262265
expect(error.message).toMatch(
263266
'Invalid version provided to the --packages flag. Package mylib@NOT_SEMVER is missing version. Please try: "@[scope]/[package]@[version]" for example @mylib/avatar@10.0.0',
264267
);

packages/initializer/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"license": "MIT",
77
"repository": "https://github.com/CodeshiftCommunity/CodeshiftCommunity/tree/master/packages/initializer",
88
"dependencies": {
9+
"@codeshift/utils": "*",
910
"fs-extra": "^9.1.0",
1011
"recast": "^0.20.4",
1112
"semver": "^7.3.5",

packages/initializer/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import fs from 'fs-extra';
22
import semver from 'semver';
33
import * as recast from 'recast';
4+
import { version as utilVersion } from '@codeshift/utils/package.json';
45

56
export function getPackageJson(packageName: string, version: string = '0.0.0') {
67
return JSON.stringify(
@@ -14,7 +15,7 @@ export function getPackageJson(packageName: string, version: string = '0.0.0') {
1415
test: 'jest',
1516
},
1617
dependencies: {
17-
'@codeshift/utils': '*',
18+
'@codeshift/utils': `^${utilVersion}`,
1819
},
1920
devDependencies: {
2021
'@codeshift/test-utils': '*',

packages/publisher/src/build.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ export default function buildPackages(path: string, packages: string[]) {
1212
if (error) {
1313
console.error(`exec error: ${error}`);
1414
reject('Unable to build codeshift packages');
15+
return;
16+
}
17+
18+
if (stderr) {
19+
console.error(stderr);
1520
}
1621

1722
console.log(stdout);
18-
console.error(stderr);
1923

2024
resolve();
2125
},

scripts/publish-all-dry.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ async function main(sourcePath: string, targetPath: string) {
1010

1111
const packages = getAllPackages(sourcePath);
1212

13-
console.log('Generating temporary directory');
13+
console.log('Generating temporary directory');
1414
await generatePackages(sourcePath, targetPath, packages);
1515

16-
console.log('Building all packages');
16+
console.log('🏗 Building all packages');
1717
await buildPackages(targetPath, packages);
1818
}
1919

2020
main(process.argv[2], process.argv[3]).catch(error => {
2121
console.error('Publishing error:', error.message);
22+
process.exit(1);
2223
});

scripts/publish-all.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@ async function main(sourcePath: string, targetPath: string) {
1111

1212
const packages = getAllPackages(sourcePath);
1313

14-
console.log('Generating temporary directory');
14+
console.log('Generating temporary directory');
1515
await generatePackages(sourcePath, targetPath, packages);
1616

17-
console.log('Building all packages');
17+
console.log('🏗 Building all packages');
1818
await buildPackages(targetPath, packages);
1919

20-
console.log('Publishing all packages');
2120
await publishPackages(targetPath, process.env.NPM_TOKEN!);
21+
console.log('📦 Publishing all packages');
2222

23-
console.log('Cleaning up temporary directory');
23+
console.log('🧹 Cleaning up temporary directory');
2424
cleanTargetDir(targetPath);
2525
}
2626

2727
main(process.argv[2], process.argv[3]).catch(error => {
2828
console.error('Publishing error:', error.message);
29+
process.exit(1);
2930
});

scripts/publish.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,26 @@ async function main(sourcePath: string, targetPath: string) {
1515
);
1616

1717
if (changedPackages.length === 0) {
18-
console.log('No packages changed, exiting...');
18+
console.log('🤷‍♂️ No packages changed, exiting...');
1919
process.exit(0);
2020
}
2121

22-
console.log('Changed packages', changedPackages);
22+
console.log('🚚 Changed packages', changedPackages);
2323

24-
console.log('Generating temporary directory');
24+
console.log('Generating temporary directory');
2525
await generatePackages(sourcePath, targetPath, changedPackages);
2626

27-
console.log('Building changed packages');
27+
console.log('🏗 Building changed packages');
2828
await buildPackages(targetPath, changedPackages);
2929

30-
console.log('Publishing changed packages');
30+
console.log('📦 Publishing changed packages');
3131
await publishPackages(targetPath, process.env.NPM_TOKEN!);
3232

33-
console.log('Cleaning up temporary directory');
33+
console.log('🧹 Cleaning up temporary directory');
3434
cleanTargetDir(targetPath);
3535
}
3636

3737
main(process.argv[2], process.argv[3]).catch(error => {
3838
console.error('Publishing error:', error.message);
39+
process.exit(1);
3940
});

0 commit comments

Comments
 (0)