diff --git a/npm/ng-packs/scripts/publish.ts b/npm/ng-packs/scripts/publish.ts index 0f898a33fc..56778c5a41 100644 --- a/npm/ng-packs/scripts/publish.ts +++ b/npm/ng-packs/scripts/publish.ts @@ -31,11 +31,6 @@ program.parse(process.argv); try { await fse.remove('../dist/packages'); - await execa('yarn', ['install'], { stdout: 'inherit', cwd: '../' }); - - await updateVersion(program.nextVersion); - return; - if (!program.skipVersionValidation) { await execa( 'yarn', @@ -106,7 +101,7 @@ async function updateVersion(version: string) { await execa( 'yarn', - ['update-version', 'abpVersion', version], + ['update-version', version], { stdout: 'inherit', cwd: '../' }, ); diff --git a/npm/publish-ng.ps1 b/npm/publish-ng.ps1 index 60e0c6d619..aa506b1e55 100644 --- a/npm/publish-ng.ps1 +++ b/npm/publish-ng.ps1 @@ -15,9 +15,9 @@ if (-Not $Version) { if (-Not $Registry) { $Registry = "https://registry.npmjs.org"; } -$UpdateNgPacksCommand = "yarn update ./ng-packs abp --registry $Registry" +$UpdateNgPacksCommand = "yarn update-version $Version" $NgPacksPublishCommand = "npm run publish-packages -- --nextVersion $Version --skipGit --registry $Registry --skipVersionValidation" -$UpdateGulpCommand = "yarn update-gulp --registry $Registry" +#$UpdateGulpCommand = "yarn update-gulp --registry $Registry" $IsPrerelease = $(node publish-utils.js --prerelease --customVersion $Version) -eq "true"; @@ -28,16 +28,17 @@ if ($IsPrerelease) { } $commands = ( - "cd ng-packs\scripts", + "cd ng-packs", + "yarn install", + $UpdateNgPacksCommand, + "cd scripts", "yarn install", - # $UpdateNgPacksUpdateVersionCommand, -#"yarn remove-tilde-or-caret", $NgPacksPublishCommand, "cd ../../", "cd scripts", - "yarn remove-lock-files", - "cd .." - #$UpdateGulpCommand + "yarn remove-lock-files" + # "cd ..", + # $UpdateGulpCommand ) foreach ($command in $commands) {