Skip to content

Commit 7960b83

Browse files
fix: Ignore private field of lerna root package
1 parent 265fa23 commit 7960b83

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

dist/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6978,9 +6978,20 @@ __webpack_require__.r(__webpack_exports__);
69786978
let cli;
69796979
let cliPath;
69806980
let release;
6981+
try {
6982+
await fs__WEBPACK_IMPORTED_MODULE_3__.promises.access('lerna.json');
6983+
cli = 'lerna';
6984+
release = lernaRelease;
6985+
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info('Lerna detected, releasing using lerna');
6986+
}
6987+
catch (_) {
6988+
cli = 'semantic-release';
6989+
release = semanticRelease;
6990+
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info('Lerna not detected, releasing using semantic-release');
6991+
}
69816992
try {
69826993
const pkg = JSON.parse((await fs__WEBPACK_IMPORTED_MODULE_3__.promises.readFile('package.json')).toString());
6983-
privatePackage = pkg.private || false;
6994+
privatePackage = cli !== 'lerna' && pkg.private;
69846995
scope = pkg.name.slice(0, pkg.name.indexOf('/'));
69856996
publishToGithub = publish && !privatePackage && scope === ownerScope;
69866997
publishToNPM = publish && !privatePackage && !!npmToken;
@@ -6991,17 +7002,6 @@ __webpack_require__.r(__webpack_exports__);
69917002
publishToGithub = false;
69927003
publishToNPM = false;
69937004
}
6994-
try {
6995-
await fs__WEBPACK_IMPORTED_MODULE_3__.promises.access('lerna.json');
6996-
cli = 'lerna';
6997-
release = lernaRelease;
6998-
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info('Lerna detected, releasing using lerna');
6999-
}
7000-
catch (_) {
7001-
cli = 'semantic-release';
7002-
release = semanticRelease;
7003-
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info('Lerna not detected, releasing using semantic-release');
7004-
}
70057005
if (!publish) {
70067006
_actions_core__WEBPACK_IMPORTED_MODULE_0__.info('Publishing disabled, skipping publishing to package registries');
70077007
}

src/index.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ import { promises as fs } from 'fs'
2424
env?: { [variable: string]: string }
2525
) => Promise<void>
2626

27-
try {
28-
const pkg = JSON.parse((await fs.readFile('package.json')).toString())
29-
privatePackage = pkg.private || false
30-
scope = pkg.name.slice(0, pkg.name.indexOf('/'))
31-
publishToGithub = publish && !privatePackage && scope === ownerScope
32-
publishToNPM = publish && !privatePackage && !!npmToken
33-
} catch (_) {
34-
privatePackage = true
35-
scope = ownerScope
36-
publishToGithub = false
37-
publishToNPM = false
38-
}
39-
4027
try {
4128
await fs.access('lerna.json')
4229
cli = 'lerna'
@@ -54,6 +41,19 @@ import { promises as fs } from 'fs'
5441
)
5542
}
5643

44+
try {
45+
const pkg = JSON.parse((await fs.readFile('package.json')).toString())
46+
privatePackage = cli !== 'lerna' && pkg.private
47+
scope = pkg.name.slice(0, pkg.name.indexOf('/'))
48+
publishToGithub = publish && !privatePackage && scope === ownerScope
49+
publishToNPM = publish && !privatePackage && !!npmToken
50+
} catch (_) {
51+
privatePackage = true
52+
scope = ownerScope
53+
publishToGithub = false
54+
publishToNPM = false
55+
}
56+
5757
if (!publish) {
5858
core.info(
5959
'Publishing disabled, skipping publishing to package registries'

0 commit comments

Comments
 (0)