Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
update
  • Loading branch information
wanlwanl committed Dec 12, 2024
commit 23824ea1bf29729821b2ce719d0c572ad54a8272
24 changes: 14 additions & 10 deletions tools/js-sdk-release-tools/src/common/migration.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { logger } from "../utils/logger";
import { getNpmPackageInfo } from "./npmUtils";
import { runCommand, runCommandOptions } from "./utils";
import { load } from "@npmcli/package-json";

export async function migratePackage(packageDirectory: string): Promise<void> {
const info = await getNpmPackageInfo(packageDirectory);
logger.info(`Start to migrate package '${info.name}'`);
await runCommand(
"npx",
`dev-tool admin migrate-package --package-name=${info.name}`.split(" "),
{ ...runCommandOptions, cwd: packageDirectory }
);
logger.info(`Migrated package '${info.name}' successfully`);
// TODO: remove when emitter is ready
export async function migratePackage(packageDirectory: string, rushxScript: string): Promise<void> {
let packageJson = await load(packageDirectory);
packageJson.content.scripts![
"migrate"
] = `dev-tool admin migrate-package --package-name=${packageJson.content.name}`;
packageJson = packageJson.update(packageJson.content);
packageJson.save();
await runCommand("node", [rushxScript, "migrate"], {
...runCommandOptions,
cwd: packageDirectory,
});
logger.info(`Migrated package '${packageJson.content.name}' successfully`);
}
2 changes: 1 addition & 1 deletion tools/js-sdk-release-tools/src/common/rushUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export async function buildPackage(
rushxScript: string
) {
const relativePackageDirectoryToSdkRoot = relative(normalize(options.sdkRepoRoot), normalize(packageDirectory));
logger.info(`Start building package in '${relativePackageDirectoryToSdkRoot}'.`);
logger.info(`Start to build package in '${relativePackageDirectoryToSdkRoot}'.`);

const { name } = await getNpmPackageInfo(relativePackageDirectoryToSdkRoot);
await updateRushJson({
Expand Down
2 changes: 1 addition & 1 deletion tools/js-sdk-release-tools/src/hlc/generateMgmt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export async function generateMgmt(options: {
}
}

await migratePackage(packagePath);
await migratePackage(packagePath, "common/scripts/install-run-rushx.js");

logger.info(`Start to run command: 'rush update'.`);
execSync('node common/scripts/install-run-rush.js update', {stdio: 'inherit'});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export async function generateRLCInPipeline(options: {
}
}

await migratePackage(packagePath);
await migratePackage(packagePath, "common/scripts/install-run-rushx.js");

logger.info(`Start to update rush.`);
execSync('node common/scripts/install-run-rush.js update', {stdio: 'inherit'});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export async function generateAzureSDKPackage(options: ModularClientPackageOptio
await generateTypeScriptCodeFromTypeSpec(options, originalNpmPackageInfo?.version, packageDirectory);
const relativePackageDirToSdkRoot = relative(normalize(options.sdkRepoRoot), normalize(packageDirectory));

await migratePackage(packageDirectory);
await migratePackage(packageDirectory, rushxScript);
await buildPackage(packageDirectory, options, packageResult, rushScript, rushxScript);

// changelog generation will compute package version and bump it in package.json,
Expand Down
Loading