@@ -148,27 +148,31 @@ const hasDevDependency = (dependency, packageJson) => {
148
148
)
149
149
}
150
150
151
- const runSValues = [ new RegExp ( 'run-s' ) ]
151
+ const runSValues = [
152
+ / n p m - r u n - a l l .* - s (?: $ | \s | & | > | < ) / ,
153
+ / n p m - r u n - a l l .* - - s e q u e n t i a l / ,
154
+ / n p m - r u n - a l l .* - - s e r i a l / ,
155
+ / r u n - s / ,
156
+ ]
152
157
153
158
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
+ }
163
162
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
+ )
169
169
}
170
170
171
- return false
171
+ if ( betterScripts ) {
172
+ return Object . values ( betterScripts ) . some ( ( script ) =>
173
+ runSValues . some ( ( runSValue ) => runSValue . test ( script ) ) ,
174
+ )
175
+ }
172
176
}
173
177
174
178
const sortScripts = onObject ( ( scripts , packageJson ) => {
@@ -195,9 +199,8 @@ const sortScripts = onObject((scripts, packageJson) => {
195
199
) ,
196
200
[ ] ,
197
201
)
198
- const toReturn = sortObjectKeys ( scripts , order )
199
202
200
- return toReturn
203
+ return sortObjectKeys ( scripts , order )
201
204
} )
202
205
203
206
// fields marked `vscode` are for `Visual Studio Code extension manifest` only
0 commit comments