Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(codemod): avoid overwriting existing packageManager field #8551

Merged
merged 1 commit into from
Jun 20, 2024
Merged

fix(codemod): avoid overwriting existing packageManager field #8551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 9 additions & 28 deletions packages/turbo-codemod/__tests__/add-package-manager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,7 @@ const TEST_CASES: Array<TestCase> = [
packageManagerVersion: "1.2.3",
options: { force: false, dryRun: false, print: false },
result: {
changes: {
"package.json": {
action: "unchanged",
additions: 0,
deletions: 0,
},
},
changes: {},
},
},
{
Expand All @@ -116,13 +110,7 @@ const TEST_CASES: Array<TestCase> = [
packageManagerVersion: "1.2.3",
options: { force: false, dryRun: false, print: false },
result: {
changes: {
"package.json": {
action: "modified",
additions: 1,
deletions: 1,
},
},
changes: {},
},
},
];
Expand Down Expand Up @@ -176,13 +164,16 @@ describe("add-package-manager-2", () => {
options,
});

expect(mockGetAvailablePackageManagers).toHaveBeenCalled();
expect(mockGetWorkspaceDetails).toHaveBeenCalled();
if (existingPackageManagerString === undefined) {
expect(mockGetAvailablePackageManagers).toHaveBeenCalled();
expect(mockGetWorkspaceDetails).toHaveBeenCalled();
}

expect(JSON.parse(read("package.json") || "{}").packageManager).toEqual(
options.dryRun
? undefined
: `${packageManager}@${packageManagerVersion}`
: existingPackageManagerString ||
`${packageManager}@${packageManagerVersion}`
);

// result should be correct
Expand All @@ -194,17 +185,7 @@ describe("add-package-manager-2", () => {
options,
});
expect(repeatResult.fatalError).toBeUndefined();
expect(repeatResult.changes).toMatchObject({
"package.json": {
action: options.dryRun ? "skipped" : "unchanged",
additions: options.dryRun
? result.changes["package.json"].additions
: 0,
deletions: options.dryRun
? result.changes["package.json"].deletions
: 0,
},
});
expect(repeatResult.changes).toMatchObject({});

mockGetAvailablePackageManagers.mockRestore();
mockGetWorkspaceDetails.mockRestore();
Expand Down
9 changes: 7 additions & 2 deletions packages/turbo-codemod/src/transforms/add-package-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ export async function transformer({
options,
});

const rootPackageJsonPath = path.join(root, "package.json");
const rootPackageJson = readJsonSync(rootPackageJsonPath) as PackageJson;
if ("packageManager" in rootPackageJson) {
log.info(`"packageManager" already set in root "package.json"`);
return runner.finish();
}

log.info(`Set "packageManager" key in root "package.json" file...`);
let project: Project;
try {
Expand All @@ -41,8 +48,6 @@ export async function transformer({
}

const pkgManagerString = `${packageManager}@${version}`;
const rootPackageJsonPath = path.join(root, "package.json");
const rootPackageJson = readJsonSync(rootPackageJsonPath) as PackageJson;
const allWorkspaces = [
{
name: "package.json",
Expand Down
Loading