apify-cli 0.18.2-beta.4 → 0.18.2-beta.6
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/package.json +19 -19
- package/src/commands/actor/get-input.js +1 -1
- package/src/commands/actor/get-value.js +1 -1
- package/src/commands/actor/index.js +1 -0
- package/src/commands/actor/push-data.js +1 -1
- package/src/commands/actor/set-value.js +2 -1
- package/src/commands/call.js +4 -3
- package/src/commands/check-version.js +1 -0
- package/src/commands/create.js +12 -10
- package/src/commands/edit-input-schema.js +3 -4
- package/src/commands/info.js +1 -0
- package/src/commands/init.js +5 -3
- package/src/commands/login-new.js +3 -4
- package/src/commands/login.js +2 -1
- package/src/commands/logout.js +1 -1
- package/src/commands/pull.js +6 -4
- package/src/commands/push.js +8 -6
- package/src/commands/run.js +8 -6
- package/src/commands/secrets/index.js +1 -0
- package/src/commands/vis.js +1 -0
- package/src/lib/actor.js +5 -3
- package/src/lib/apify_command.js +6 -4
- package/src/lib/consts.js +1 -0
- package/src/lib/create-utils.js +5 -4
- package/src/lib/exec.js +1 -0
- package/src/lib/files.js +3 -2
- package/src/lib/input_schema.js +5 -3
- package/src/lib/local_state.js +1 -0
- package/src/lib/secrets.js +2 -2
- package/src/lib/telemetry.js +4 -2
- package/src/lib/utils.js +18 -16
- package/src/lib/version_check.js +6 -13
- package/npm-shrinkwrap.json +0 -14224
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify-cli",
|
|
3
|
-
"version": "0.18.2-beta.
|
|
3
|
+
"version": "0.18.2-beta.6",
|
|
4
4
|
"description": "Apify command-line interface helps you create, develop, build and run Apify actors, and manage the Apify cloud platform.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -53,21 +53,21 @@
|
|
|
53
53
|
"node": ">=16.0.0"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@apify/actor-templates": "^0.1.
|
|
57
|
-
"@apify/consts": "^2.
|
|
58
|
-
"@apify/input_schema": "^3.
|
|
59
|
-
"@apify/utilities": "^2.
|
|
60
|
-
"@crawlee/memory-storage": "^3.
|
|
61
|
-
"@oclif/command": "^1.8.
|
|
62
|
-
"@oclif/config": "^1.18.
|
|
63
|
-
"@oclif/errors": "^1.3.
|
|
56
|
+
"@apify/actor-templates": "^0.1.4",
|
|
57
|
+
"@apify/consts": "^2.23.0",
|
|
58
|
+
"@apify/input_schema": "^3.5.8",
|
|
59
|
+
"@apify/utilities": "^2.9.3",
|
|
60
|
+
"@crawlee/memory-storage": "^3.5.8",
|
|
61
|
+
"@oclif/command": "^1.8.36",
|
|
62
|
+
"@oclif/config": "^1.18.17",
|
|
63
|
+
"@oclif/errors": "^1.3.6",
|
|
64
64
|
"@oclif/plugin-commands": "^2.1.0",
|
|
65
65
|
"@oclif/plugin-help": "^5.1.12",
|
|
66
66
|
"adm-zip": "^0.5.10",
|
|
67
|
-
"ajv": "^8.
|
|
68
|
-
"apify-client": "^2.2
|
|
67
|
+
"ajv": "^8.12.0",
|
|
68
|
+
"apify-client": "^2.8.2",
|
|
69
69
|
"archiver-promise": "^1.0.0",
|
|
70
|
-
"axios": "^
|
|
70
|
+
"axios": "^1.6.1",
|
|
71
71
|
"chalk": "^4.1.2",
|
|
72
72
|
"computer-name": "^0.1.0",
|
|
73
73
|
"cors": "^2.8.5",
|
|
@@ -81,24 +81,24 @@
|
|
|
81
81
|
"istextorbinary": "^6.0.0",
|
|
82
82
|
"jju": "^1.4.0",
|
|
83
83
|
"load-json-file": "^6.2.0",
|
|
84
|
-
"mime": "^
|
|
84
|
+
"mime": "^3.0.0",
|
|
85
85
|
"mixpanel": "^0.17.0",
|
|
86
86
|
"open": "^8.4.0",
|
|
87
|
-
"ow": "^0.28.
|
|
87
|
+
"ow": "^0.28.2",
|
|
88
88
|
"rimraf": "^3.0.2",
|
|
89
|
-
"semver": "^7.
|
|
90
|
-
"tiged": "^2.12.
|
|
91
|
-
"underscore": "^1.13.
|
|
89
|
+
"semver": "^7.5.4",
|
|
90
|
+
"tiged": "^2.12.5",
|
|
91
|
+
"underscore": "^1.13.6",
|
|
92
92
|
"write-json-file": "^4.3.0"
|
|
93
93
|
},
|
|
94
94
|
"devDependencies": {
|
|
95
|
-
"@apify/eslint-config": "^0.
|
|
95
|
+
"@apify/eslint-config": "^0.4.0",
|
|
96
96
|
"@oclif/dev-cli": "^1.26.0",
|
|
97
97
|
"@oclif/test": "^2.1.0",
|
|
98
98
|
"chai": "^4.3.4",
|
|
99
99
|
"chai-match": "^1.1.1",
|
|
100
100
|
"cross-env": "^7.0.3",
|
|
101
|
-
"eslint": "^8.
|
|
101
|
+
"eslint": "^8.53.0",
|
|
102
102
|
"mocha": "^10.0.0",
|
|
103
103
|
"sinon": "^9.2.4"
|
|
104
104
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const { ApifyCommand } = require('../../lib/apify_command');
|
|
2
1
|
const { getApifyStorageClient, getDefaultStorageId, APIFY_STORAGE_TYPES } = require('../../lib/actor');
|
|
2
|
+
const { ApifyCommand } = require('../../lib/apify_command');
|
|
3
3
|
|
|
4
4
|
class PushDataCommand extends ApifyCommand {
|
|
5
5
|
async init() {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
|
-
|
|
2
|
+
|
|
3
3
|
const { getApifyStorageClient, getDefaultStorageId, APIFY_STORAGE_TYPES } = require('../../lib/actor');
|
|
4
|
+
const { ApifyCommand } = require('../../lib/apify_command');
|
|
4
5
|
|
|
5
6
|
class SetValueCommand extends ApifyCommand {
|
|
6
7
|
async init() {
|
package/src/commands/call.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
1
|
const { ACT_JOB_STATUSES } = require('@apify/consts');
|
|
2
|
+
const { flags: flagsHelper } = require('@oclif/command');
|
|
3
3
|
const mime = require('mime');
|
|
4
|
+
|
|
4
5
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
6
|
+
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
7
|
+
const outputs = require('../lib/outputs');
|
|
5
8
|
const { getLocalConfig, getLoggedClientOrThrow,
|
|
6
9
|
getLocalUserInfo, getLocalInput, outputJobLog } = require('../lib/utils');
|
|
7
|
-
const outputs = require('../lib/outputs');
|
|
8
|
-
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
9
10
|
|
|
10
11
|
// TODO: Show full error messages and HTTP codes, this is not great:
|
|
11
12
|
// jan:testx$ apify call help
|
package/src/commands/create.js
CHANGED
|
@@ -1,15 +1,25 @@
|
|
|
1
|
-
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
1
|
const fs = require('fs');
|
|
3
2
|
const path = require('path');
|
|
4
3
|
const { finished } = require('stream');
|
|
5
4
|
const { promisify } = require('util');
|
|
5
|
+
|
|
6
6
|
const actorTemplates = require('@apify/actor-templates');
|
|
7
|
+
const { flags: flagsHelper } = require('@oclif/command');
|
|
7
8
|
const AdmZip = require('adm-zip');
|
|
8
9
|
const semver = require('semver');
|
|
10
|
+
|
|
9
11
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
12
|
+
const { EMPTY_LOCAL_CONFIG, LOCAL_CONFIG_PATH, PYTHON_VENV_PATH, SUPPORTED_NODEJS_VERSION } = require('../lib/consts');
|
|
13
|
+
const {
|
|
14
|
+
httpsGet,
|
|
15
|
+
ensureValidActorName,
|
|
16
|
+
getTemplateDefinition,
|
|
17
|
+
enhanceReadmeWithLocalSuffix,
|
|
18
|
+
} = require('../lib/create-utils');
|
|
10
19
|
const execWithLog = require('../lib/exec');
|
|
11
|
-
const outputs = require('../lib/outputs');
|
|
12
20
|
const { updateLocalJson } = require('../lib/files');
|
|
21
|
+
const { createPrefilledInputFileFromInputSchema } = require('../lib/input_schema');
|
|
22
|
+
const outputs = require('../lib/outputs');
|
|
13
23
|
const {
|
|
14
24
|
setLocalConfig,
|
|
15
25
|
setLocalEnv,
|
|
@@ -22,14 +32,6 @@ const {
|
|
|
22
32
|
isNodeVersionSupported,
|
|
23
33
|
detectNpmVersion,
|
|
24
34
|
} = require('../lib/utils');
|
|
25
|
-
const { EMPTY_LOCAL_CONFIG, LOCAL_CONFIG_PATH, PYTHON_VENV_PATH, SUPPORTED_NODEJS_VERSION } = require('../lib/consts');
|
|
26
|
-
const {
|
|
27
|
-
httpsGet,
|
|
28
|
-
ensureValidActorName,
|
|
29
|
-
getTemplateDefinition,
|
|
30
|
-
enhanceReadmeWithLocalSuffix,
|
|
31
|
-
} = require('../lib/create-utils');
|
|
32
|
-
const { createPrefilledInputFileFromInputSchema } = require('../lib/input_schema');
|
|
33
35
|
|
|
34
36
|
class CreateCommand extends ApifyCommand {
|
|
35
37
|
async run() {
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
2
|
const path = require('path');
|
|
3
3
|
|
|
4
|
+
const { cryptoRandomObjectId } = require('@apify/utilities');
|
|
4
5
|
const cors = require('cors');
|
|
5
6
|
const detectIndent = require('detect-indent');
|
|
6
7
|
const express = require('express');
|
|
7
8
|
const open = require('open');
|
|
8
9
|
|
|
9
|
-
const { cryptoRandomObjectId } = require('@apify/utilities');
|
|
10
|
-
|
|
11
10
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
12
|
-
const outputs = require('../lib/outputs');
|
|
13
|
-
const { readInputSchema } = require('../lib/input_schema');
|
|
14
11
|
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
12
|
+
const { readInputSchema } = require('../lib/input_schema');
|
|
13
|
+
const outputs = require('../lib/outputs');
|
|
15
14
|
|
|
16
15
|
const INPUT_SCHEMA_EDITOR_BASE_URL = 'https://apify.github.io/input-schema-editor-react/';
|
|
17
16
|
const INPUT_SCHEMA_EDITOR_ORIGIN = new URL(INPUT_SCHEMA_EDITOR_BASE_URL).origin;
|
package/src/commands/info.js
CHANGED
package/src/commands/init.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
const inquirer = require('inquirer');
|
|
2
1
|
const path = require('path');
|
|
2
|
+
|
|
3
|
+
const inquirer = require('inquirer');
|
|
4
|
+
|
|
3
5
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
4
|
-
const outputs = require('../lib/outputs');
|
|
5
|
-
const { setLocalConfig, setLocalEnv, getLocalConfig, getLocalConfigOrThrow } = require('../lib/utils');
|
|
6
6
|
const { EMPTY_LOCAL_CONFIG, DEFAULT_LOCAL_STORAGE_DIR, LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
7
7
|
const { createPrefilledInputFileFromInputSchema } = require('../lib/input_schema');
|
|
8
|
+
const outputs = require('../lib/outputs');
|
|
9
|
+
const { setLocalConfig, setLocalEnv, getLocalConfig, getLocalConfigOrThrow } = require('../lib/utils');
|
|
8
10
|
|
|
9
11
|
class InitCommand extends ApifyCommand {
|
|
10
12
|
async run() {
|
|
@@ -1,17 +1,16 @@
|
|
|
1
|
+
const { cryptoRandomObjectId } = require('@apify/utilities');
|
|
1
2
|
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
3
|
const computerName = require('computer-name');
|
|
3
4
|
const cors = require('cors');
|
|
4
5
|
const express = require('express');
|
|
6
|
+
const inquirer = require('inquirer');
|
|
5
7
|
const open = require('open');
|
|
6
8
|
|
|
7
|
-
const { cryptoRandomObjectId } = require('@apify/utilities');
|
|
8
|
-
|
|
9
|
-
const inquirer = require('inquirer');
|
|
10
9
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
11
10
|
const outputs = require('../lib/outputs');
|
|
11
|
+
const { useApifyIdentity } = require('../lib/telemetry');
|
|
12
12
|
const { getLoggedClient } = require('../lib/utils');
|
|
13
13
|
const { getLocalUserInfo } = require('../lib/utils');
|
|
14
|
-
const { useApifyIdentity } = require('../lib/telemetry');
|
|
15
14
|
|
|
16
15
|
const CONSOLE_BASE_URL = 'https://console.apify.com/account?tab=integrations';
|
|
17
16
|
// const CONSOLE_BASE_URL = 'http://localhost:3000/account?tab=integrations';
|
package/src/commands/login.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
2
|
const inquirer = require('inquirer');
|
|
3
|
+
|
|
3
4
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
4
5
|
const { success, error } = require('../lib/outputs');
|
|
6
|
+
const { useApifyIdentity } = require('../lib/telemetry');
|
|
5
7
|
const { getLoggedClient } = require('../lib/utils');
|
|
6
8
|
const { getLocalUserInfo } = require('../lib/utils');
|
|
7
|
-
const { useApifyIdentity } = require('../lib/telemetry');
|
|
8
9
|
|
|
9
10
|
class LoginCommand extends ApifyCommand {
|
|
10
11
|
async run() {
|
package/src/commands/logout.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
2
2
|
const { AUTH_FILE_PATH } = require('../lib/consts');
|
|
3
|
-
const { success } = require('../lib/outputs');
|
|
4
3
|
const { rimrafPromised } = require('../lib/files');
|
|
4
|
+
const { success } = require('../lib/outputs');
|
|
5
5
|
const { regenerateLocalDistinctId } = require('../lib/telemetry');
|
|
6
6
|
|
|
7
7
|
class LogoutCommand extends ApifyCommand {
|
package/src/commands/pull.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
2
|
const path = require('path');
|
|
3
|
-
|
|
3
|
+
|
|
4
|
+
const { flags: flagsHelper } = require('@oclif/command');
|
|
4
5
|
const AdmZip = require('adm-zip');
|
|
5
|
-
const semverGt = require('semver/functions/gt');
|
|
6
6
|
const { get } = require('axios');
|
|
7
|
-
const { flags: flagsHelper } = require('@oclif/command');
|
|
8
7
|
const jju = require('jju');
|
|
8
|
+
const semverGt = require('semver/functions/gt');
|
|
9
|
+
const tiged = require('tiged');
|
|
10
|
+
|
|
9
11
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
12
|
+
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
10
13
|
const { success, error } = require('../lib/outputs');
|
|
11
14
|
const { getLoggedClientOrThrow, getLocalConfigOrThrow, getLocalUserInfo } = require('../lib/utils');
|
|
12
|
-
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
13
15
|
|
|
14
16
|
const extractGitHubZip = async (url, directoryPath) => {
|
|
15
17
|
const { data } = await get(url, { responseType: 'arraybuffer' });
|
package/src/commands/push.js
CHANGED
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
|
-
|
|
2
|
+
|
|
3
3
|
const actorTemplates = require('@apify/actor-templates');
|
|
4
4
|
const { ACT_JOB_STATUSES, ACT_SOURCE_TYPES,
|
|
5
5
|
MAX_MULTIFILE_BYTES } = require('@apify/consts');
|
|
6
|
-
const
|
|
6
|
+
const { flags: flagsHelper } = require('@oclif/command');
|
|
7
7
|
const inquirer = require('inquirer');
|
|
8
8
|
const isCI = require('is-ci');
|
|
9
|
+
const open = require('open');
|
|
10
|
+
|
|
9
11
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
12
|
+
const { UPLOADS_STORE_NAME, LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
13
|
+
const { sumFilesSizeInBytes } = require('../lib/files');
|
|
14
|
+
const outputs = require('../lib/outputs');
|
|
15
|
+
const { transformEnvToEnvVars } = require('../lib/secrets');
|
|
10
16
|
const { createActZip, getLoggedClientOrThrow,
|
|
11
17
|
outputJobLog, getLocalUserInfo, getActorLocalFilePaths,
|
|
12
18
|
createSourceFiles, getLocalConfigOrThrow } = require('../lib/utils');
|
|
13
|
-
const { sumFilesSizeInBytes } = require('../lib/files');
|
|
14
|
-
const { UPLOADS_STORE_NAME, LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
15
|
-
const { transformEnvToEnvVars } = require('../lib/secrets');
|
|
16
|
-
const outputs = require('../lib/outputs');
|
|
17
19
|
|
|
18
20
|
const TEMP_ZIP_FILE_NAME = 'temp_file.zip';
|
|
19
21
|
const DEFAULT_RUN_OPTIONS = {
|
package/src/commands/run.js
CHANGED
|
@@ -1,19 +1,21 @@
|
|
|
1
|
-
const { flags: flagsHelper } = require('@oclif/command');
|
|
2
1
|
const fs = require('fs');
|
|
3
2
|
const path = require('path');
|
|
4
|
-
|
|
3
|
+
|
|
5
4
|
const { APIFY_ENV_VARS } = require('@apify/consts');
|
|
5
|
+
const { flags: flagsHelper } = require('@oclif/command');
|
|
6
|
+
const loadJson = require('load-json-file');
|
|
6
7
|
const semver = require('semver');
|
|
7
|
-
|
|
8
|
-
const { LEGACY_LOCAL_STORAGE_DIR, DEFAULT_LOCAL_STORAGE_DIR, SUPPORTED_NODEJS_VERSION, LANGUAGE } = require('../lib/consts');
|
|
8
|
+
|
|
9
9
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
10
|
+
const { LEGACY_LOCAL_STORAGE_DIR, DEFAULT_LOCAL_STORAGE_DIR, SUPPORTED_NODEJS_VERSION, LANGUAGE } = require('../lib/consts');
|
|
11
|
+
const execWithLog = require('../lib/exec');
|
|
12
|
+
const { error, info, warning } = require('../lib/outputs');
|
|
13
|
+
const { replaceSecretsValue } = require('../lib/secrets');
|
|
10
14
|
const {
|
|
11
15
|
getLocalUserInfo, purgeDefaultQueue, purgeDefaultKeyValueStore,
|
|
12
16
|
purgeDefaultDataset, getLocalConfigOrThrow, getNpmCmd, checkIfStorageIsEmpty,
|
|
13
17
|
detectLocalActorLanguage, isPythonVersionSupported, getPythonCommand, isNodeVersionSupported,
|
|
14
18
|
} = require('../lib/utils');
|
|
15
|
-
const { error, info, warning } = require('../lib/outputs');
|
|
16
|
-
const { replaceSecretsValue } = require('../lib/secrets');
|
|
17
19
|
|
|
18
20
|
class RunCommand extends ApifyCommand {
|
|
19
21
|
async run() {
|
package/src/commands/vis.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const { validateInputSchema } = require('@apify/input_schema');
|
|
2
2
|
const Ajv = require('ajv');
|
|
3
|
+
|
|
3
4
|
const { ApifyCommand } = require('../lib/apify_command');
|
|
4
5
|
const { LOCAL_CONFIG_PATH } = require('../lib/consts');
|
|
5
6
|
const { readInputSchema } = require('../lib/input_schema');
|
package/src/lib/actor.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
const { ApifyClient } = require('apify-client');
|
|
2
1
|
const { pipeline } = require('stream');
|
|
3
2
|
const { promisify } = require('util');
|
|
4
|
-
|
|
5
|
-
const { MemoryStorage } = require('@crawlee/memory-storage');
|
|
3
|
+
|
|
6
4
|
const { ACTOR_ENV_VARS, LOCAL_ACTOR_ENV_VARS, APIFY_ENV_VARS, KEY_VALUE_STORE_KEYS } = require('@apify/consts');
|
|
5
|
+
const { MemoryStorage } = require('@crawlee/memory-storage');
|
|
6
|
+
const { ApifyClient } = require('apify-client');
|
|
7
|
+
const { default: ow } = require('ow');
|
|
8
|
+
|
|
7
9
|
const { getLocalUserInfo, getLocalStorageDir, getApifyClientOptions } = require('./utils');
|
|
8
10
|
|
|
9
11
|
const pipelinePromise = promisify(pipeline);
|
package/src/lib/apify_command.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
const { Command } = require('@oclif/command');
|
|
2
1
|
const { finished } = require('stream');
|
|
3
2
|
const { promisify } = require('util');
|
|
4
|
-
|
|
3
|
+
|
|
4
|
+
const { Command } = require('@oclif/command');
|
|
5
|
+
|
|
6
|
+
const { LANGUAGE, COMMANDS_WITHIN_ACTOR } = require('./consts');
|
|
5
7
|
const { maybeTrackTelemetry } = require('./telemetry');
|
|
6
|
-
const {
|
|
8
|
+
const { argsToCamelCase } = require('./utils');
|
|
7
9
|
const { detectLocalActorLanguage } = require('./utils');
|
|
8
|
-
const {
|
|
10
|
+
const { detectInstallationType } = require('./version_check');
|
|
9
11
|
|
|
10
12
|
/**
|
|
11
13
|
* Adding parsing flags to oclif Command class
|
package/src/lib/consts.js
CHANGED
package/src/lib/create-utils.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
const
|
|
2
|
-
const inquirer = require('inquirer');
|
|
1
|
+
const fs = require('fs');
|
|
3
2
|
const https = require('https');
|
|
4
3
|
const { pipeline } = require('stream');
|
|
5
4
|
const { promisify } = require('util');
|
|
6
|
-
const fs = require('fs');
|
|
7
5
|
|
|
8
|
-
const
|
|
6
|
+
const chalk = require('chalk');
|
|
7
|
+
const inquirer = require('inquirer');
|
|
8
|
+
|
|
9
9
|
const {
|
|
10
10
|
warning,
|
|
11
11
|
} = require('./outputs');
|
|
12
|
+
const { validateActorName } = require('./utils');
|
|
12
13
|
|
|
13
14
|
const PROGRAMMING_LANGUAGES = ['JavaScript', 'TypeScript', 'Python'];
|
|
14
15
|
|
package/src/lib/exec.js
CHANGED
package/src/lib/files.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
const loadJson = require('load-json-file');
|
|
2
|
-
const writeJson = require('write-json-file');
|
|
3
1
|
const fs = require('fs');
|
|
4
2
|
const path = require('path');
|
|
3
|
+
|
|
4
|
+
const loadJson = require('load-json-file');
|
|
5
5
|
const rimraf = require('rimraf');
|
|
6
|
+
const writeJson = require('write-json-file');
|
|
6
7
|
|
|
7
8
|
const updateLocalJson = async (jsonFilePath, updateAttrs = {}, nestedObjectAttr = null) => {
|
|
8
9
|
const currentObject = await loadJson(jsonFilePath);
|
package/src/lib/input_schema.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
2
|
const path = require('path');
|
|
3
|
-
|
|
3
|
+
|
|
4
|
+
const { KEY_VALUE_STORE_KEYS } = require('@apify/consts');
|
|
4
5
|
const { validateInputSchema } = require('@apify/input_schema');
|
|
6
|
+
const Ajv = require('ajv');
|
|
5
7
|
const _ = require('underscore');
|
|
6
|
-
const { KEY_VALUE_STORE_KEYS } = require('@apify/consts');
|
|
7
8
|
const writeJsonFile = require('write-json-file');
|
|
9
|
+
|
|
8
10
|
const { ACTOR_SPECIFICATION_FOLDER } = require('./consts');
|
|
9
|
-
const { getLocalConfig, getJsonFileContent, getLocalKeyValueStorePath } = require('./utils');
|
|
10
11
|
const { warning } = require('./outputs');
|
|
12
|
+
const { getLocalConfig, getJsonFileContent, getLocalKeyValueStorePath } = require('./utils');
|
|
11
13
|
|
|
12
14
|
const DEFAULT_INPUT_SCHEMA_PATHS = [
|
|
13
15
|
'.actor/INPUT_SCHEMA.json',
|
package/src/lib/local_state.js
CHANGED
package/src/lib/secrets.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const loadJson = require('load-json-file');
|
|
2
|
-
const writeJson = require('write-json-file');
|
|
3
2
|
const _ = require('underscore');
|
|
3
|
+
const writeJson = require('write-json-file');
|
|
4
|
+
|
|
4
5
|
const { SECRETS_FILE_PATH } = require('./consts');
|
|
5
6
|
const { warning } = require('./outputs');
|
|
6
7
|
|
|
@@ -62,7 +63,6 @@ const replaceSecretsValue = (env, secrets) => {
|
|
|
62
63
|
if (secrets[secretKey]) {
|
|
63
64
|
updatedEnv[key] = secrets[secretKey];
|
|
64
65
|
} else {
|
|
65
|
-
// eslint-disable-next-line max-len
|
|
66
66
|
warning(`Value for ${secretKey} not found in local secrets. Set it by calling "apify secrets:add ${secretKey} [SECRET_VALUE]"`);
|
|
67
67
|
}
|
|
68
68
|
} else {
|
package/src/lib/telemetry.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
const Mixpanel = require('mixpanel');
|
|
2
1
|
const { promisify } = require('util');
|
|
2
|
+
|
|
3
|
+
const { cryptoRandomObjectId } = require('@apify/utilities');
|
|
3
4
|
const loadJson = require('load-json-file');
|
|
5
|
+
const Mixpanel = require('mixpanel');
|
|
4
6
|
const writeJson = require('write-json-file');
|
|
5
|
-
|
|
7
|
+
|
|
6
8
|
const { MIXPANEL_TOKEN, TELEMETRY_FILE_PATH } = require('./consts');
|
|
7
9
|
const outputs = require('./outputs');
|
|
8
10
|
const { getLocalUserInfo } = require('./utils');
|
package/src/lib/utils.js
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
const
|
|
1
|
+
const {
|
|
2
|
+
execSync,
|
|
3
|
+
spawnSync,
|
|
4
|
+
} = require('child_process');
|
|
2
5
|
const fs = require('fs');
|
|
3
|
-
const
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
const globby = require('globby');
|
|
7
|
-
const archiver = require('archiver-promise');
|
|
8
|
-
const loadJson = require('load-json-file');
|
|
9
|
-
const writeJson = require('write-json-file');
|
|
10
|
-
const inquirer = require('inquirer');
|
|
6
|
+
const https = require('https');
|
|
7
|
+
const path = require('path');
|
|
8
|
+
|
|
11
9
|
const {
|
|
12
10
|
ACT_JOB_TERMINAL_STATUSES,
|
|
13
11
|
ACTOR_ENV_VARS,
|
|
@@ -18,14 +16,18 @@ const {
|
|
|
18
16
|
LOCAL_STORAGE_SUBDIRS,
|
|
19
17
|
SOURCE_FILE_FORMATS,
|
|
20
18
|
} = require('@apify/consts');
|
|
21
|
-
const https = require('https');
|
|
22
19
|
const { ApifyClient } = require('apify-client');
|
|
23
|
-
const
|
|
24
|
-
execSync,
|
|
25
|
-
spawnSync,
|
|
26
|
-
} = require('child_process');
|
|
27
|
-
const semver = require('semver');
|
|
20
|
+
const archiver = require('archiver-promise');
|
|
28
21
|
const escapeStringRegexp = require('escape-string-regexp');
|
|
22
|
+
const globby = require('globby');
|
|
23
|
+
const inquirer = require('inquirer');
|
|
24
|
+
const { getEncoding } = require('istextorbinary');
|
|
25
|
+
const loadJson = require('load-json-file');
|
|
26
|
+
const mime = require('mime');
|
|
27
|
+
const semver = require('semver');
|
|
28
|
+
const _ = require('underscore');
|
|
29
|
+
const writeJson = require('write-json-file');
|
|
30
|
+
|
|
29
31
|
const {
|
|
30
32
|
GLOBAL_CONFIGS_FOLDER,
|
|
31
33
|
AUTH_FILE_PATH,
|
|
@@ -175,7 +177,7 @@ const getLocalConfigOrThrow = async () => {
|
|
|
175
177
|
const answer = await inquirer.prompt([{
|
|
176
178
|
name: 'isConfirm',
|
|
177
179
|
type: 'confirm',
|
|
178
|
-
|
|
180
|
+
|
|
179
181
|
message: `The new version of Apify CLI uses the "${LOCAL_CONFIG_PATH}" instead of the "apify.json" file. Since we have found both files in your actor directory, "apify.json" will be renamed to "apify.json.deprecated". Going forward, all commands will use "${LOCAL_CONFIG_PATH}". You can read about the differences between the old and the new config at https://github.com/apify/apify-cli/blob/master/MIGRATIONS.md. Do you want to continue?`,
|
|
180
182
|
}]);
|
|
181
183
|
if (!answer.isConfirm) {
|
package/src/lib/version_check.js
CHANGED
|
@@ -1,19 +1,14 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
2
|
const process = require('process');
|
|
3
|
+
|
|
3
4
|
const axios = require('axios');
|
|
4
5
|
const chalk = require('chalk');
|
|
5
6
|
const semver = require('semver');
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
} = require('./
|
|
9
|
-
const {
|
|
10
|
-
|
|
11
|
-
info,
|
|
12
|
-
} = require('./outputs');
|
|
13
|
-
const {
|
|
14
|
-
getLocalState,
|
|
15
|
-
extendLocalState,
|
|
16
|
-
} = require('./local_state');
|
|
7
|
+
|
|
8
|
+
const { CHECK_VERSION_EVERY_MILLIS } = require('./consts');
|
|
9
|
+
const { getLocalState, extendLocalState } = require('./local_state');
|
|
10
|
+
const { warning, info } = require('./outputs');
|
|
11
|
+
const { version: CURRENT_APIFY_CLI_VERSION } = require('../../package.json');
|
|
17
12
|
|
|
18
13
|
const INSTALLATION_TYPE = {
|
|
19
14
|
HOMEBREW: 'HOMEBREW',
|
|
@@ -30,8 +25,6 @@ const SKIP_UPDATE_CHECK = (
|
|
|
30
25
|
&& !['0', 'false'].includes(process.env.APIFY_CLI_SKIP_UPDATE_CHECK.toLowerCase())
|
|
31
26
|
);
|
|
32
27
|
|
|
33
|
-
const CURRENT_APIFY_CLI_VERSION = require('../../package.json').version;
|
|
34
|
-
|
|
35
28
|
/**
|
|
36
29
|
* Detect through which package manager the Apify CLI was installed.
|
|
37
30
|
* @returns {INSTALLATION_TYPE} The installation type of the CLI.
|