apify-cli 1.0.0-beta.95 → 1.0.0-beta.96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +20 -20
- package/dist/.tsbuildinfo +1 -1
- package/dist/commands/call.d.ts.map +1 -1
- package/dist/commands/call.js.map +1 -1
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +21 -15
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/edit-input-schema.js +15 -15
- package/dist/commands/edit-input-schema.js.map +1 -1
- package/dist/commands/init-wrap-scrapy.js +1 -1
- package/dist/commands/init-wrap-scrapy.js.map +1 -1
- package/dist/commands/init.js +5 -5
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/login.js +7 -7
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +1 -1
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/pull.js +2 -2
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.js +21 -19
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +26 -16
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/validate-schema.js +3 -3
- package/dist/commands/validate-schema.js.map +1 -1
- package/dist/hooks/deprecations.js +1 -1
- package/dist/hooks/deprecations.js.map +1 -1
- package/dist/lib/commands/run-on-cloud.js +9 -9
- package/dist/lib/commands/run-on-cloud.js.map +1 -1
- package/dist/lib/create-utils.js +1 -1
- package/dist/lib/create-utils.js.map +1 -1
- package/dist/lib/exec.js +1 -1
- package/dist/lib/exec.js.map +1 -1
- package/dist/lib/input_schema.js +1 -1
- package/dist/lib/input_schema.js.map +1 -1
- package/dist/lib/outputs.d.ts +18 -6
- package/dist/lib/outputs.d.ts.map +1 -1
- package/dist/lib/outputs.js +43 -18
- package/dist/lib/outputs.js.map +1 -1
- package/dist/lib/projects/scrapy/wrapScrapyProject.js +3 -3
- package/dist/lib/projects/scrapy/wrapScrapyProject.js.map +1 -1
- package/dist/lib/secrets.js +2 -2
- package/dist/lib/secrets.js.map +1 -1
- package/dist/lib/telemetry.js +1 -1
- package/dist/lib/telemetry.js.map +1 -1
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +6 -33
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/version_check.js +7 -7
- package/dist/lib/version_check.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/dist/lib/telemetry.js
CHANGED
|
@@ -29,7 +29,7 @@ export const getOrCreateLocalDistinctId = async () => {
|
|
|
29
29
|
const userInfo = await getLocalUserInfo();
|
|
30
30
|
const distinctId = userInfo.id || createLocalDistinctId();
|
|
31
31
|
// This first time we are tracking telemetry, so we want to notify user about it.
|
|
32
|
-
info(TELEMETRY_WARNING_TEXT);
|
|
32
|
+
info({ message: TELEMETRY_WARNING_TEXT });
|
|
33
33
|
ensureApifyDirectory(TELEMETRY_FILE_PATH());
|
|
34
34
|
await writeJsonFile(TELEMETRY_FILE_PATH(), { distinctId });
|
|
35
35
|
return distinctId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,QAA0B,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEpE,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;AAC5E,MAAM,sBAAsB,GAAG,iGAAiG;MAC1H,uIAAuI;MACvI,iGAAiG,CAAC;AAExG,MAAM,gBAAgB,GAAG,SAAS,CAA6B,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE9F;;;GAGG;AACH,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,OAAO,oBAAoB,EAAE,EAAE,CAAC;AAEpE;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,IAAI,EAAE;IACjD,IAAI,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAyB,mBAAmB,EAAE,CAAC,CAAC;QACpF,OAAO,SAAS,CAAC,UAAU,CAAC;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,IAAI,qBAAqB,EAAE,CAAC;QAE1D,iFAAiF;QACjF,IAAI,CAAC,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/lib/telemetry.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAiB5C,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAehF,OAAO,EAUH,QAAQ,EAIX,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,eAAO,MAAM,GAAG,iBAAkD,CAAC;AAEnE,eAAO,MAAM,QAAQ,QAAe,MAAM,6BAazC,CAAC;AAKF,eAAO,MAAM,kBAAkB,cAI9B,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,MAAM,WAKzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,aAAc,MAAM,WAKnD,CAAC;AAEF,eAAO,MAAM,wBAAwB,aAAc,MAAM,WAKxD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAa,QAAQ,QAAQ,CAazD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,4BAQlC,CAAC;AAUF;;GAEG;AACH,eAAO,MAAM,qBAAqB,WAAY,MAAM,eAAe,MAAM,KAAG,kBAiB3E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAAkB,MAAM,eAAe,MAAM,gCAkBxE,CAAC;AASF,eAAO,MAAM,kBAAkB,0CAA2C,MAAM,kBAM/E,CAAC;AAEF,eAAO,MAAM,cAAc,QAAS,MAAM,wCAAgD,CAAC;AAO3F,eAAO,MAAM,qBAAqB,QAAe,MAAM,iDA6DtD,CAAC;AAEF,eAAO,MAAM,cAAc,gBAAuB,OAAO,MAAM,EAAE,OAAO,CAAC,WAAW,MAAM,kBAGzF,CAAC;AAIF,eAAO,MAAM,WAAW,WAAkB,MAAM,kBA6B/C,CAAC;AAGF,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,GAAG,MAAM,EAAE,IAAI,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GACpH,GAAG,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,GAC/D,CAAC,CAAC;AAEJ,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9C,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,6BAA8B,CAAC,KAAG,gBAAgB,CAAC,CAU9E,CAAC;AAkCF,eAAO,MAAM,iBAAiB,UAAiB,MAAM,EAAE,OAAO,MAAM;;;;IAYnE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,SAAgB,MAAM,sBAKvD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,YAAY,YAAmB,MAAM,cAAc,MAAM,EAAE,OAAO,MAAM,kBAapF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,QAAS,MAAM;;;aAgBxC,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBAK7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,qBAK/B,CAAC;AAEF,eAAO,MAAM,yBAAyB,qBAerC,CAAC;AAEF,eAAO,MAAM,YAAY,QAAe,QAAQ,GAAG,KAAK,YAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils.js
CHANGED
|
@@ -165,7 +165,7 @@ export const getLocalConfigOrThrow = async (cwd) => {
|
|
|
165
165
|
try {
|
|
166
166
|
renameSync(getDeprecatedLocalConfigPath(cwd), `${getDeprecatedLocalConfigPath(cwd)}.deprecated`);
|
|
167
167
|
// eslint-disable-next-line max-len
|
|
168
|
-
info(`The "apify.json" file has been renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted.`);
|
|
168
|
+
info({ message: `The "apify.json" file has been renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted.` });
|
|
169
169
|
}
|
|
170
170
|
catch (e) {
|
|
171
171
|
throw new Error('Failed to rename deprecated "apify.json".');
|
|
@@ -198,7 +198,7 @@ export const getLocalConfigOrThrow = async (cwd) => {
|
|
|
198
198
|
await writeJsonFile(getLocalConfigPath(cwd), localConfig);
|
|
199
199
|
renameSync(getDeprecatedLocalConfigPath(cwd), `${getDeprecatedLocalConfigPath(cwd)}.deprecated`);
|
|
200
200
|
// eslint-disable-next-line max-len
|
|
201
|
-
info(`The "apify.json" file has been migrated to "${LOCAL_CONFIG_PATH}" and the original file renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted. Do not forget to commit the new file to your Git repository.`);
|
|
201
|
+
info({ message: `The "apify.json" file has been migrated to "${LOCAL_CONFIG_PATH}" and the original file renamed to "apify.json.deprecated". The deprecated file is no longer used by the CLI or Apify Console. If you do not need it for some specific purpose, it can be safely deleted. Do not forget to commit the new file to your Git repository.` });
|
|
202
202
|
}
|
|
203
203
|
catch (e) {
|
|
204
204
|
throw new Error(`Can not update "${LOCAL_CONFIG_PATH}" structure. Follow guide on https://github.com/apify/apify-cli/blob/master/MIGRATIONS.md and update it manually.`);
|
|
@@ -367,10 +367,10 @@ export const outputJobLog = async (job, timeout) => {
|
|
|
367
367
|
return;
|
|
368
368
|
}
|
|
369
369
|
const log = await apifyClient.log(logId).get();
|
|
370
|
-
process.
|
|
370
|
+
process.stderr.write(log);
|
|
371
371
|
return;
|
|
372
372
|
}
|
|
373
|
-
// In other case stream it to
|
|
373
|
+
// In other case stream it to stderr
|
|
374
374
|
// eslint-disable-next-line no-async-promise-executor
|
|
375
375
|
return new Promise(async (resolve) => {
|
|
376
376
|
const stream = await apifyClient.log(logId).stream();
|
|
@@ -380,12 +380,12 @@ export const outputJobLog = async (job, timeout) => {
|
|
|
380
380
|
}
|
|
381
381
|
let nodeTimeout = null;
|
|
382
382
|
stream.on('data', (chunk) => {
|
|
383
|
-
// In tests, writing to process.
|
|
383
|
+
// In tests, writing to process.stderr directly messes with vitest's output
|
|
384
384
|
// With that said, we still NEED to wait for this stream to end, as otherwise tests become flaky.
|
|
385
385
|
if (process.env.APIFY_NO_LOGS_IN_TESTS) {
|
|
386
386
|
return;
|
|
387
387
|
}
|
|
388
|
-
process.
|
|
388
|
+
process.stderr.write(chunk.toString());
|
|
389
389
|
});
|
|
390
390
|
stream.once('end', () => {
|
|
391
391
|
resolve('finished');
|
|
@@ -400,33 +400,6 @@ export const outputJobLog = async (job, timeout) => {
|
|
|
400
400
|
}, timeout);
|
|
401
401
|
}
|
|
402
402
|
});
|
|
403
|
-
// return new Promise((resolve, reject) => {
|
|
404
|
-
// const req = get(`https://api.apify.com/v2/logs/${logId}?stream=1`);
|
|
405
|
-
// let res: IncomingMessage;
|
|
406
|
-
// req.on('response', (response) => {
|
|
407
|
-
// res = response;
|
|
408
|
-
// response.on('data', (chunk) => process.stdout.write(chunk.toString()));
|
|
409
|
-
// response.on('error', (err) => {
|
|
410
|
-
// reject(err);
|
|
411
|
-
// });
|
|
412
|
-
// });
|
|
413
|
-
// req.on('error', (err) => {
|
|
414
|
-
// reject(err);
|
|
415
|
-
// });
|
|
416
|
-
// req.on('close', () => {
|
|
417
|
-
// resolve('finished');
|
|
418
|
-
// });
|
|
419
|
-
// if (timeout) {
|
|
420
|
-
// setTimeout(() => {
|
|
421
|
-
// if (res) res.removeAllListeners();
|
|
422
|
-
// if (req) {
|
|
423
|
-
// req.removeAllListeners();
|
|
424
|
-
// req.destroy();
|
|
425
|
-
// }
|
|
426
|
-
// resolve('timeouts');
|
|
427
|
-
// }, timeout);
|
|
428
|
-
// }
|
|
429
|
-
// });
|
|
430
403
|
};
|
|
431
404
|
/**
|
|
432
405
|
* Returns npm command for current os
|
package/dist/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import chalk from 'chalk';
|
|
|
4
4
|
import { gt } from 'semver';
|
|
5
5
|
import { CHECK_VERSION_EVERY_MILLIS, CURRENT_APIFY_CLI_VERSION } from './consts.js';
|
|
6
6
|
import { extendLocalState, getLocalState } from './local_state.js';
|
|
7
|
-
import { info, warning } from './outputs.js';
|
|
7
|
+
import { info, simpleLog, warning } from './outputs.js';
|
|
8
8
|
const INSTALLATION_TYPE = {
|
|
9
9
|
HOMEBREW: 'HOMEBREW',
|
|
10
10
|
NPM: 'NPM',
|
|
@@ -46,7 +46,7 @@ export const getLatestNpmVersion = async () => {
|
|
|
46
46
|
*/
|
|
47
47
|
const getAndCacheLatestNpmVersion = async () => {
|
|
48
48
|
try {
|
|
49
|
-
info('Making sure that Apify CLI is up to date...');
|
|
49
|
+
info({ message: 'Making sure that Apify CLI is up to date...' });
|
|
50
50
|
const latestNpmVersion = await getLatestNpmVersion();
|
|
51
51
|
extendLocalState({
|
|
52
52
|
latestNpmVersion,
|
|
@@ -56,7 +56,7 @@ const getAndCacheLatestNpmVersion = async () => {
|
|
|
56
56
|
}
|
|
57
57
|
catch (err) {
|
|
58
58
|
console.error(err);
|
|
59
|
-
warning('Cannot fetch the latest Apify CLI version from NPM, using the cached version instead.');
|
|
59
|
+
warning({ message: 'Cannot fetch the latest Apify CLI version from NPM, using the cached version instead.' });
|
|
60
60
|
return undefined;
|
|
61
61
|
}
|
|
62
62
|
};
|
|
@@ -77,14 +77,14 @@ export const checkLatestVersion = async (enforceUpdate = false) => {
|
|
|
77
77
|
if (latestNpmVersion && gt(latestNpmVersion, CURRENT_APIFY_CLI_VERSION)) {
|
|
78
78
|
const installationType = detectInstallationType();
|
|
79
79
|
const updateCommand = `' ${UPDATE_COMMAND[installationType]} '`;
|
|
80
|
-
|
|
81
|
-
warning('You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.');
|
|
82
|
-
|
|
80
|
+
simpleLog({ message: '' });
|
|
81
|
+
warning({ message: 'You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.' });
|
|
82
|
+
simpleLog({ message: ` ↪ Run ${chalk.bgWhite(chalk.black(updateCommand))} to update! 👍 \n` });
|
|
83
83
|
}
|
|
84
84
|
else if (shouldGetCurrentVersion) {
|
|
85
85
|
// In this case the version was refreshed from the NPM which took a while and "Info: Making sure that Apify ..." was printed
|
|
86
86
|
// so also print the state.
|
|
87
|
-
info('Apify CLI is up to date 👍 \n');
|
|
87
|
+
info({ message: 'Apify CLI is up to date 👍 \n' });
|
|
88
88
|
}
|
|
89
89
|
};
|
|
90
90
|
//# sourceMappingURL=version_check.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version_check.js","sourceRoot":"","sources":["../../src/lib/version_check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"version_check.js","sourceRoot":"","sources":["../../src/lib/version_check.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify-cli",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.96",
|
|
4
4
|
"description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
|
|
5
5
|
"exports": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|