Skip to content

Commit dd8c480

Browse files
committed
chore: fix remarks
1 parent 9e2780f commit dd8c480

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

index.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,27 +148,31 @@ const hasDevDependency = (dependency, packageJson) => {
148148
)
149149
}
150150

151-
const runSValues = [new RegExp('run-s')]
151+
const runSValues = [
152+
/npm-run-all .* -s(?:$|\s|&|>|<)/,
153+
/npm-run-all .* --sequential/,
154+
/npm-run-all .* --serial/,
155+
/run-s/,
156+
]
152157

153158
const hasRunS = (packageJson) => {
154-
if (hasDevDependency('npm-run-all', packageJson)) {
155-
const scripts = packageJson.scripts
156-
const betterScripts = packageJson.betterScripts
157-
158-
if (scripts) {
159-
return Object.values(scripts).some((script) =>
160-
runSValues.some((runSValue) => runSValue.test(script)),
161-
)
162-
}
159+
if (!hasDevDependency('npm-run-all', packageJson)) {
160+
return false
161+
}
163162

164-
if (betterScripts) {
165-
return Object.values(betterScripts).some((script) =>
166-
runSValues.some((runSValue) => runSValue.test(script)),
167-
)
168-
}
163+
const scripts = packageJson.scripts
164+
const betterScripts = packageJson.betterScripts
165+
if (scripts) {
166+
return Object.values(scripts).some((script) =>
167+
runSValues.some((runSValue) => runSValue.test(script)),
168+
)
169169
}
170170

171-
return false
171+
if (betterScripts) {
172+
return Object.values(betterScripts).some((script) =>
173+
runSValues.some((runSValue) => runSValue.test(script)),
174+
)
175+
}
172176
}
173177

174178
const sortScripts = onObject((scripts, packageJson) => {
@@ -195,9 +199,8 @@ const sortScripts = onObject((scripts, packageJson) => {
195199
),
196200
[],
197201
)
198-
const toReturn = sortObjectKeys(scripts, order)
199202

200-
return toReturn
203+
return sortObjectKeys(scripts, order)
201204
})
202205

203206
// fields marked `vscode` are for `Visual Studio Code extension manifest` only

0 commit comments

Comments
 (0)