@@ -4,11 +4,10 @@ const getPkg = require('./lib/get-pkg');
44const verifyNpmConfig = require ( './lib/verify-config' ) ;
55const verifyNpmAuth = require ( './lib/verify-auth' ) ;
66const publishNpm = require ( './lib/publish' ) ;
7- const getLastReleaseNpm = require ( './lib/get-last-release' ) ;
87
98let verified ;
109
11- async function verifyConditions ( pluginConfig , { options :{ publish, getLastRelease } , logger} ) {
10+ async function verifyConditions ( pluginConfig , { options :{ publish} , logger} ) {
1211// If the npm publish plugin is used and has `npmPublish`, `tarballDir` or `pkgRoot` configured, validate them now in order to prevent any release if the configuration is wrong
1312if ( publish ) {
1413const publishPlugin = castArray ( publish ) . find ( config => config . path && config . path === '@semantic-release/npm' ) ;
@@ -26,35 +25,14 @@ async function verifyConditions(pluginConfig, {options: {publish, getLastRelease
2625const pkg = await getPkg ( pluginConfig . pkgRoot ) ;
2726await verifyNpmConfig ( pluginConfig , pkg , logger ) ;
2827
29- // Verify the npm authentication only if `npmPublish` is not false and if the npm plugin is used as `getLastRelease`
30- if (
31- pluginConfig . npmPublish !== false ||
32- ( getLastRelease && ( getLastRelease === '@semantic-release/npm' || getLastRelease . path === '@semantic-release/npm' ) )
33- ) {
28+ // Verify the npm authentication only if `npmPublish` is not false
29+ if ( pluginConfig . npmPublish !== false ) {
3430setLegacyToken ( ) ;
3531await verifyNpmAuth ( pluginConfig , pkg , logger ) ;
3632}
3733verified = true ;
3834}
3935
40- async function getLastRelease ( pluginConfig , { options :{ publish, branch} , logger} ) {
41- setLegacyToken ( ) ;
42- // Reload package.json in case a previous external step updated it
43- const pkg = await getPkg ( pluginConfig . pkgRoot ) ;
44- if ( ! verified ) {
45- if ( publish ) {
46- const publishPlugin = castArray ( publish ) . find ( config => config . path && config . path === '@semantic-release/npm' ) ;
47- if ( publishPlugin && publishPlugin . pkgRoot ) {
48- pluginConfig . pkgRoot = publishPlugin . pkgRoot ;
49- }
50- }
51- await verifyNpmConfig ( pluginConfig , pkg , logger ) ;
52- await verifyNpmAuth ( pluginConfig , pkg , logger ) ;
53- verified = true ;
54- }
55- return getLastReleaseNpm ( pkg , branch , logger ) ;
56- }
57-
5836async function publish ( pluginConfig , { nextRelease :{ version} , logger} ) {
5937setLegacyToken ( ) ;
6038// Reload package.json in case a previous external step updated it
@@ -69,4 +47,4 @@ async function publish(pluginConfig, {nextRelease: {version}, logger}) {
6947await publishNpm ( pluginConfig , pkg , version , logger ) ;
7048}
7149
72- module . exports = { verifyConditions, getLastRelease , publish} ;
50+ module . exports = { verifyConditions, publish} ;