Skip to content

Commit e348f48

Browse files
chore(deps): update dependency globby to v16 (#969)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vlad Frangu <me@vladfrangu.dev>
1 parent e086fc0 commit e348f48

6 files changed

Lines changed: 45 additions & 27 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"escape-string-regexp": "~5.0.0",
9393
"execa": "^9.5.2",
9494
"express": "~5.2.0",
95-
"globby": "~15.0.0",
95+
"globby": "~16.1.0",
9696
"handlebars": "~4.7.8",
9797
"indent-string": "^5.0.0",
9898
"is-ci": "~4.1.0",

test/api/commands/call.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('[api] apify call', () => {
7070

7171
toggleCwdBetweenFullAndParentPath();
7272

73-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true, flags_force: true });
73+
await testRunCommand(ActorsPushCommand, { flags_force: true });
7474

7575
actorId = `${username}/${ACTOR_NAME}`;
7676

test/api/commands/push.test.ts

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { createHmacSignature } from '@apify/utilities';
88

99
import { testRunCommand } from '../../../src/lib/command-framework/apify-command.js';
1010
import { LOCAL_CONFIG_PATH } from '../../../src/lib/consts.js';
11+
import { execWithLog } from '../../../src/lib/exec.js';
1112
import { createSourceFiles, getActorLocalFilePaths, getLocalUserInfo } from '../../../src/lib/utils.js';
1213
import { testUserClient } from '../../__setup__/config.js';
1314
import { TEST_TIMEOUT } from '../../__setup__/consts.js';
@@ -89,7 +90,7 @@ describe('[api] apify push', () => {
8990
};
9091
writeFileSync(joinPath(LOCAL_CONFIG_PATH), JSON.stringify(actorJson, null, '\t'), { flag: 'w' });
9192

92-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true, flags_force: true });
93+
await testRunCommand(ActorsPushCommand, { flags_force: true });
9394

9495
const userInfo = await getLocalUserInfo();
9596
const { name } = actorJson;
@@ -128,7 +129,6 @@ describe('[api] apify push', () => {
128129

129130
await testRunCommand(ActorsPushCommand, {
130131
args_actorId: testActor.id,
131-
flags_noPrompt: true,
132132
flags_force: true,
133133
});
134134

@@ -182,7 +182,7 @@ describe('[api] apify push', () => {
182182
delete actorJson.environmentVariables;
183183
writeFileSync(joinPath(LOCAL_CONFIG_PATH), JSON.stringify(actorJson, null, '\t'), { flag: 'w' });
184184

185-
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id, flags_noPrompt: true });
185+
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id });
186186

187187
testActor = (await testActorClient.get())!;
188188
const testActorVersion = await testActorClient.version(actorJson.version).get();
@@ -229,7 +229,7 @@ describe('[api] apify push', () => {
229229
// Create large file to ensure Actor will be uploaded as zip
230230
writeFileSync(joinPath('3mb-file.txt'), Buffer.alloc(1024 * 1024 * 3));
231231

232-
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id, flags_noPrompt: true });
232+
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id });
233233

234234
// Remove the big file so sources in following tests are not zipped
235235
unlinkSync(joinPath('3mb-file.txt'));
@@ -275,7 +275,7 @@ describe('[api] apify push', () => {
275275

276276
writeFileSync(joinPath('some-typescript-file.ts'), `console.log('ok');`);
277277

278-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true, flags_force: true });
278+
await testRunCommand(ActorsPushCommand, { flags_force: true });
279279

280280
if (existsSync(joinPath('some-typescript-file.ts'))) unlinkSync(joinPath('some-typescript-file.ts'));
281281

@@ -307,7 +307,7 @@ describe('[api] apify push', () => {
307307
// @ts-expect-error Wrong typing of update method
308308
await testActorClient.version(actorJson.version).update({ buildTag: 'beta' });
309309

310-
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id, flags_noPrompt: true });
310+
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id });
311311
if (testActor) await testActorClient.delete();
312312

313313
expect(lastErrorMessage()).to.includes('is already on the platform');
@@ -325,7 +325,7 @@ describe('[api] apify push', () => {
325325
actorJson.description = 'This is a custom description for the actor.';
326326

327327
writeFileSync(joinPath(LOCAL_CONFIG_PATH), JSON.stringify(actorJson, null, '\t'), { flag: 'w' });
328-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true, flags_force: true });
328+
await testRunCommand(ActorsPushCommand, { flags_force: true });
329329

330330
const userInfo = await getLocalUserInfo();
331331
const actorId = `${userInfo.username}/${actorJson.name}`;
@@ -359,7 +359,7 @@ describe('[api] apify push', () => {
359359
delete actorJson.description;
360360
writeFileSync(joinPath(LOCAL_CONFIG_PATH), JSON.stringify(actorJson, null, '\t'), { flag: 'w' });
361361

362-
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id, flags_noPrompt: true });
362+
await testRunCommand(ActorsPushCommand, { args_actorId: testActor.id });
363363

364364
testActor = (await testActorClient.get())!;
365365

@@ -381,7 +381,7 @@ describe('[api] apify push', () => {
381381

382382
forceNewCwd('empty-dir');
383383

384-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true });
384+
await testRunCommand(ActorsPushCommand, {});
385385

386386
expect(lastErrorMessage()).to.include(
387387
'You need to call this command from a folder that has an Actor in it',
@@ -401,7 +401,13 @@ describe('[api] apify push', () => {
401401

402402
await writeFile(joinCwdPath('owo.txt'), 'Lorem ipsum');
403403

404-
await testRunCommand(ActorsPushCommand, { flags_noPrompt: true });
404+
await execWithLog({
405+
cmd: 'git',
406+
args: ['init'],
407+
opts: { cwd: joinCwdPath() },
408+
});
409+
410+
await testRunCommand(ActorsPushCommand, {});
405411

406412
expect(lastErrorMessage()).to.include('A valid Actor could not be found in the current directory.');
407413
},

test/api/commands/task/run.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ describe('[api] apify task run', () => {
5959
toggleCwdBetweenFullAndParentPath();
6060

6161
await testRunCommand(ActorsPushCommand, {
62-
flags_noPrompt: true,
6362
flags_force: true,
6463
});
6564

test/local/lib/utils.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ describe('Utils', () => {
3535
beforeAll(async () => {
3636
await beforeAllCalls();
3737

38+
await execWithLog({
39+
cmd: 'git',
40+
args: ['init'],
41+
opts: { cwd: tmpPath },
42+
});
43+
3844
FOLDERS.concat(FOLDERS_TO_IGNORE).forEach((folder) => {
3945
ensureFolderExistsSync(tmpPath, folder);
4046
});

yarn.lock

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,7 +2357,7 @@ __metadata:
23572357
eslint-config-prettier: "npm:^10.1.2"
23582358
execa: "npm:^9.5.2"
23592359
express: "npm:~5.2.0"
2360-
globby: "npm:~15.0.0"
2360+
globby: "npm:~16.1.0"
23612361
handlebars: "npm:~4.7.8"
23622362
indent-string: "npm:^5.0.0"
23632363
is-ci: "npm:~4.1.0"
@@ -5004,17 +5004,17 @@ __metadata:
50045004
languageName: node
50055005
linkType: hard
50065006

5007-
"globby@npm:~15.0.0":
5008-
version: 15.0.0
5009-
resolution: "globby@npm:15.0.0"
5007+
"globby@npm:~16.1.0":
5008+
version: 16.1.0
5009+
resolution: "globby@npm:16.1.0"
50105010
dependencies:
50115011
"@sindresorhus/merge-streams": "npm:^4.0.0"
50125012
fast-glob: "npm:^3.3.3"
50135013
ignore: "npm:^7.0.5"
5014-
path-type: "npm:^6.0.0"
5014+
is-path-inside: "npm:^4.0.0"
50155015
slash: "npm:^5.1.0"
5016-
unicorn-magic: "npm:^0.3.0"
5017-
checksum: 10c0/e4107be0579bcdd9642b8dff86aeafeaf62b2b9dd116669ab6e02e0e0c07ada0d972c2db182dee7588b460fe8c8919ddcc6b1cc4db405ca3a2adc9d35fa6eb21
5016+
unicorn-magic: "npm:^0.4.0"
5017+
checksum: 10c0/45dd4dd8311401b37ed426ad7ea7a6e8fdda2518bb0d62fbf0a46c2e6b81bcbd2c8d4fbcbcf4c0600bba15c5a8f4621785d0177acbb1b545f02f6b49f2cdbe24
50185018
languageName: node
50195019
linkType: hard
50205020

@@ -5654,6 +5654,13 @@ __metadata:
56545654
languageName: node
56555655
linkType: hard
56565656

5657+
"is-path-inside@npm:^4.0.0":
5658+
version: 4.0.0
5659+
resolution: "is-path-inside@npm:4.0.0"
5660+
checksum: 10c0/51188d7e2b1d907a9a5f7c18d99a90b60870b951ed87cf97595d9aaa429d4c010652c3350bcbf31182e7f4b0eab9a1860b43e16729b13cb1a44baaa6cdb64c46
5661+
languageName: node
5662+
linkType: hard
5663+
56575664
"is-plain-obj@npm:^4.1.0":
56585665
version: 4.1.0
56595666
resolution: "is-plain-obj@npm:4.1.0"
@@ -7327,13 +7334,6 @@ __metadata:
73277334
languageName: node
73287335
linkType: hard
73297336

7330-
"path-type@npm:^6.0.0":
7331-
version: 6.0.0
7332-
resolution: "path-type@npm:6.0.0"
7333-
checksum: 10c0/55baa8b1187d6dc683d5a9cfcc866168d6adff58e5db91126795376d818eee46391e00b2a4d53e44d844c7524a7d96aa68cc68f4f3e500d3d069a39e6535481c
7334-
languageName: node
7335-
linkType: hard
7336-
73377337
"pathe@npm:^2.0.1, pathe@npm:^2.0.3":
73387338
version: 2.0.3
73397339
resolution: "pathe@npm:2.0.3"
@@ -9223,6 +9223,13 @@ __metadata:
92239223
languageName: node
92249224
linkType: hard
92259225

9226+
"unicorn-magic@npm:^0.4.0":
9227+
version: 0.4.0
9228+
resolution: "unicorn-magic@npm:0.4.0"
9229+
checksum: 10c0/cd6eff90967a5528dfa2016bdb5b38b0cd64c8558f9ba04fb5c2c23f3a232a67dfe2bfa4c45af3685d5f1a40dbac6a36d48e053f80f97ae4da1e0f6a55431685
9230+
languageName: node
9231+
linkType: hard
9232+
92269233
"unique-filename@npm:^5.0.0":
92279234
version: 5.0.0
92289235
resolution: "unique-filename@npm:5.0.0"

0 commit comments

Comments
 (0)