From 37ad0da31b2e2df5c5970e5305756388366ab4ad Mon Sep 17 00:00:00 2001 From: Pavel Jacko Date: Mon, 26 Feb 2024 23:21:17 +0100 Subject: [PATCH 01/46] add support for multiple providers in merged tasks --- packages/core/src/tasks/index.ts | 8 ++++++-- packages/core/src/tasks/types.ts | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/src/tasks/index.ts b/packages/core/src/tasks/index.ts index 16b6bc8971..9bad24c63d 100644 --- a/packages/core/src/tasks/index.ts +++ b/packages/core/src/tasks/index.ts @@ -53,6 +53,7 @@ const _getTaskOption = ({ taskInstance }: TaskObj, provider?: string): TaskOptio isGlobalScope: taskInstance.isGlobalScope, isPrivate: taskInstance.isPrivate, params: taskInstance.params, + providers: [], }; if (taskInstance.description && taskInstance.description !== '') { @@ -65,7 +66,7 @@ const _getTaskOption = ({ taskInstance }: TaskObj, provider?: string): TaskOptio output.subCommand = asArray[1]; if (provider) { - output.provider = provider; + output.providers.push(provider); } return output; @@ -90,18 +91,20 @@ const _getTaskObj = (taskInstance: RnvTask) => { export const getAllSuitableTasks = (c: RnvContext): Record => { const REGISTERED_ENGINES = getRegisteredEngines(c); const suitableTasks: Record = {}; + REGISTERED_ENGINES.forEach((engine) => { Object.values(engine.tasks).forEach((taskInstance) => { let taskObj: TaskOption = _getTaskOption(_getTaskObj(taskInstance), engine?.config?.id); if (!suitableTasks[taskObj.value]) { suitableTasks[taskObj.value] = taskObj; } else { - taskObj = suitableTasks[taskObj.value]; // In case of multiple competing tasks (same task name but coming from different engines) + taskObj = suitableTasks[taskObj.value]; // We try to revert to generic description instead. taskObj.description = DEFAULT_TASK_DESCRIPTIONS[taskObj.value] || taskObj.description; // In case of multiple competing tasks we assume they are "commonly used" taskObj.isPriorityOrder = true; + taskObj.providers.push(engine?.config?.id); } }); }); @@ -145,6 +148,7 @@ export const findSuitableTask = async (c: RnvContext, specificTask?: string): Pr name: `${task.command}...`, command: task.command, value: task.command, + providers: [], }; taskGroups[task.command] = groupTask; groupedTasks.push(groupTask); diff --git a/packages/core/src/tasks/types.ts b/packages/core/src/tasks/types.ts index b3de74f2a6..8fb3f8d4d7 100644 --- a/packages/core/src/tasks/types.ts +++ b/packages/core/src/tasks/types.ts @@ -26,7 +26,7 @@ export type TaskOption = { isGlobalScope?: boolean; isPrivate?: boolean; isPriorityOrder?: boolean; - provider?: string; + providers: string[]; params?: Array; }; From d525767494881110fea26b4b06d6db0a440425c8 Mon Sep 17 00:00:00 2001 From: Pavel Jacko Date: Mon, 26 Feb 2024 23:51:36 +0100 Subject: [PATCH 02/46] refactor engine core --- packages/core/src/tasks/constants.ts | 42 ------ packages/engine-core/src/constants.ts | 142 +++++------------- packages/engine-core/src/index.ts | 14 +- .../src/{crypto.ts => tasks/crypto/common.ts} | 4 +- .../taskCryptoDecrypt.ts} | 3 +- .../taskCryptoEncrypt.ts} | 3 +- .../tasks/{ => hooks}/task.rnv.hooks.list.ts | 0 .../tasks/{ => hooks}/task.rnv.hooks.pipes.ts | 0 .../tasks/{ => hooks}/task.rnv.hooks.run.ts | 0 .../engine-core/src/tasks/linking/common.ts | 106 +++++++++++++ .../{task.rnv.link.ts => linking/taskLink.ts} | 3 +- .../taskUnlink.ts} | 3 +- .../src/tasks/task.rnv.project.configure.ts | 2 +- .../src/tasks/task.rnv.template.apply.ts | 3 +- .../src/tasks/task.rnv.template.list.ts | 2 +- 15 files changed, 162 insertions(+), 165 deletions(-) rename packages/engine-core/src/{crypto.ts => tasks/crypto/common.ts} (96%) rename packages/engine-core/src/tasks/{task.rnv.crypto.decrypt.ts => crypto/taskCryptoDecrypt.ts} (98%) rename packages/engine-core/src/tasks/{task.rnv.crypto.encrypt.ts => crypto/taskCryptoEncrypt.ts} (98%) rename packages/engine-core/src/tasks/{ => hooks}/task.rnv.hooks.list.ts (100%) rename packages/engine-core/src/tasks/{ => hooks}/task.rnv.hooks.pipes.ts (100%) rename packages/engine-core/src/tasks/{ => hooks}/task.rnv.hooks.run.ts (100%) create mode 100644 packages/engine-core/src/tasks/linking/common.ts rename packages/engine-core/src/tasks/{task.rnv.link.ts => linking/taskLink.ts} (95%) rename packages/engine-core/src/tasks/{task.rnv.unlink.ts => linking/taskUnlink.ts} (95%) diff --git a/packages/core/src/tasks/constants.ts b/packages/core/src/tasks/constants.ts index 740daf620a..f976d1cf72 100644 --- a/packages/core/src/tasks/constants.ts +++ b/packages/core/src/tasks/constants.ts @@ -2,64 +2,22 @@ import type { RnvTaskParameter } from './types'; export const TASK_RUN = 'run'; export const TASK_CONFIGURE = 'configure'; -export const TASK_DOCTOR = 'doctor'; -export const TASK_NEW = 'new'; -export const TASK_HELP = 'help'; export const TASK_BUILD = 'build'; -export const TASK_INFO = 'info'; export const TASK_START = 'start'; export const TASK_EXPORT = 'export'; export const TASK_DEBUG = 'debug'; export const TASK_PACKAGE = 'package'; export const TASK_DEPLOY = 'deploy'; export const TASK_LOG = 'log'; -export const TASK_CLEAN = 'clean'; -export const TASK_LINK = 'link'; -export const TASK_UNLINK = 'unlink'; export const TASK_INSTALL = 'install'; export const TASK_PUBLISH = 'publish'; -export const TASK_STATUS = 'status'; -export const TASK_SWITCH = 'switch'; -export const TASK_TARGET_LAUNCH = 'target launch'; -export const TASK_TARGET_LIST = 'target list'; -export const TASK_TARGET = 'target'; -export const TASK_TEMPLATE_ADD = 'template add'; -export const TASK_TEMPLATE_LIST = 'template list'; -export const TASK_TEMPLATE_APPLY = 'template apply'; -export const TASK_WORKSPACE_ADD = 'workspace add'; -export const TASK_WORKSPACE_CONNECT = 'workspace connect'; -export const TASK_WORKSPACE_LIST = 'workspace list'; -export const TASK_WORKSPACE_UPDATE = 'workspace update'; -export const TASK_PLATFORM_CONFIGURE = 'platform configure'; -export const TASK_PLATFORM_CONNECT = 'platform connect'; -export const TASK_PLATFORM_EJECT = 'platform eject'; -export const TASK_PLATFORM_LIST = 'platform list'; -export const TASK_PLATFORM_SETUP = 'platform setup'; export const TASK_PROJECT_CONFIGURE = 'project configure'; -export const TASK_PROJECT_UPGRADE = 'project upgrade'; -export const TASK_PLUGIN_ADD = 'plugin add'; -export const TASK_PLUGIN_LIST = 'plugin list'; -export const TASK_PLUGIN_UPDATE = 'plugin update'; -export const TASK_CRYPTO_ENCRYPT = 'crypto encrypt'; -export const TASK_CRYPTO_DECRYPT = 'crypto decrypt'; export const TASK_CRYPTO_INSTALL_CERTS = 'crypto installCerts'; export const TASK_CRYPTO_INSTALL_PROFILES = 'crypto installProfiles'; export const TASK_CRYPTO_INSTALL_PROFILE = 'crypto installProfile'; export const TASK_CRYPTO_UPDATE_PROFILE = 'crypto updateProfile'; export const TASK_CRYPTO_UPDATE_PROFILES = 'crypto updateProfiles'; -export const TASK_HOOKS_RUN = 'hooks run'; -export const TASK_HOOKS_LIST = 'hooks list'; -export const TASK_HOOKS_PIPES = 'hooks pipes'; -export const TASK_PKG = 'pkg'; -export const TASK_APP_CONFIGURE = 'app configure'; -export const TASK_APP_CREATE = 'app create'; -export const TASK_WORKSPACE_CONFIGURE = 'workspace configure'; export const TASK_CONFIGURE_SOFT = 'configureSoft'; -export const TASK_KILL = 'kill'; -export const TASK_EJECT = 'eject'; -export const TASK_TELEMETRY_DISABLE = 'telemetry disable'; -export const TASK_TELEMETRY_ENABLE = 'telemetry enable'; -export const TASK_TELEMETRY_STATUS = 'telemetry status'; export const DEFAULT_TASK_DESCRIPTIONS: Record = { [TASK_RUN]: 'Run your app on target device or emulator', diff --git a/packages/engine-core/src/constants.ts b/packages/engine-core/src/constants.ts index d7455b2fe4..c23f7862e7 100644 --- a/packages/engine-core/src/constants.ts +++ b/packages/engine-core/src/constants.ts @@ -1,103 +1,39 @@ -export const RNV_PACKAGES = [ - { - packageName: '@rnv/renative', - folderName: 'renative', - skipLinking: false, - }, - { - packageName: '@rnv/core', - folderName: 'core', - }, - { - packageName: '@rnv/engine-core', - folderName: 'engine-core', - }, - { - packageName: '@rnv/cli', - folderName: 'cli', - }, - { - packageName: '@rnv/template-starter', - folderName: 'template-starter', - }, - { - packageName: 'rnv', - folderName: 'rnv', - }, - { - packageName: '@rnv/engine-lightning', - folderName: 'engine-lightning', - }, - { - packageName: '@rnv/engine-rn', - folderName: 'engine-rn', - }, - { - packageName: '@rnv/engine-rn-electron', - folderName: 'engine-rn-electron', - }, - { - packageName: '@rnv/engine-rn-windows', - folderName: 'engine-rn-windows', - }, - { - packageName: '@rnv/engine-rn-next', - folderName: 'engine-rn-next', - }, - { - packageName: '@rnv/engine-rn-tvos', - folderName: 'engine-rn-tvos', - }, - { - packageName: '@rnv/engine-rn-web', - folderName: 'engine-rn-web', - }, - { - packageName: '@rnv/engine-roku', - folderName: 'engine-roku', - }, - { - packageName: '@rnv/integration-docker', - folderName: 'integration-docker', - }, - { - packageName: '@rnv/integration-ftp', - folderName: 'integration-ftp', - }, - { - packageName: '@rnv/integration-vercel', - folderName: 'integration-vercel', - }, - { - packageName: '@rnv/build-hooks-git', - folderName: 'build-hooks-git', - }, - { - packageName: '@rnv/sdk-apple', - folderName: 'sdk-apple', - }, - { - packageName: '@rnv/sdk-android', - folderName: 'sdk-android', - }, - { - packageName: '@rnv/sdk-tizen', - folderName: 'sdk-tizen', - }, - { - packageName: '@rnv/sdk-kaios', - folderName: 'sdk-kaios', - }, - { - packageName: '@rnv/sdk-react-native', - folderName: 'sdk-react-native', - }, - { - packageName: '@rnv/sdk-webpack', - folderName: 'sdk-webpack', - }, - { - packageName: '@rnv/sdk-webos', - folderName: 'sdk-webos', - }, -]; +export const TASK_DOCTOR = 'doctor'; +export const TASK_NEW = 'new'; +export const TASK_HELP = 'help'; +export const TASK_INFO = 'info'; +export const TASK_CLEAN = 'clean'; + +export const TASK_APP_CONFIGURE = 'app configure'; +export const TASK_APP_CREATE = 'app create'; +export const TASK_STATUS = 'status'; +export const TASK_SWITCH = 'switch'; +export const TASK_TARGET_LAUNCH = 'target launch'; +export const TASK_TARGET_LIST = 'target list'; +export const TASK_TARGET = 'target'; +export const TASK_TEMPLATE_ADD = 'template add'; +export const TASK_TEMPLATE_LIST = 'template list'; +export const TASK_TEMPLATE_APPLY = 'template apply'; +export const TASK_WORKSPACE_ADD = 'workspace add'; +export const TASK_WORKSPACE_CONNECT = 'workspace connect'; +export const TASK_WORKSPACE_LIST = 'workspace list'; +export const TASK_WORKSPACE_UPDATE = 'workspace update'; +export const TASK_PLATFORM_CONFIGURE = 'platform configure'; +export const TASK_PLATFORM_CONNECT = 'platform connect'; +export const TASK_PLATFORM_EJECT = 'platform eject'; +export const TASK_PLATFORM_LIST = 'platform list'; +export const TASK_PLATFORM_SETUP = 'platform setup'; +export const TASK_PROJECT_UPGRADE = 'project upgrade'; +export const TASK_PLUGIN_ADD = 'plugin add'; +export const TASK_PLUGIN_LIST = 'plugin list'; +export const TASK_PLUGIN_UPDATE = 'plugin update'; +export const TASK_KILL = 'kill'; +export const TASK_EJECT = 'eject'; +export const TASK_TELEMETRY_DISABLE = 'telemetry disable'; +export const TASK_TELEMETRY_ENABLE = 'telemetry enable'; +export const TASK_TELEMETRY_STATUS = 'telemetry status'; +export const TASK_HOOKS_RUN = 'hooks run'; +export const TASK_HOOKS_LIST = 'hooks list'; +export const TASK_HOOKS_PIPES = 'hooks pipes'; +export const TASK_PKG = 'pkg'; +export const TASK_WORKSPACE_CONFIGURE = 'workspace configure'; diff --git a/packages/engine-core/src/index.ts b/packages/engine-core/src/index.ts index 2567767491..4f06af7b18 100644 --- a/packages/engine-core/src/index.ts +++ b/packages/engine-core/src/index.ts @@ -1,7 +1,7 @@ import { RnvEngine, generateEngineTasks } from '@rnv/core'; -import taskRnvCryptoDecrypt from './tasks/task.rnv.crypto.decrypt'; -import taskRnvCryptoEncrypt from './tasks/task.rnv.crypto.encrypt'; +import taskRnvCryptoDecrypt from './tasks/crypto/taskCryptoDecrypt'; +import taskRnvCryptoEncrypt from './tasks/crypto/taskCryptoEncrypt'; import taskRnvPlatformEject from './tasks/task.rnv.platform.eject'; import taskRnvPlatformConnect from './tasks/task.rnv.platform.connect'; import taskRnvPlatformList from './tasks/task.rnv.platform.list'; @@ -17,9 +17,9 @@ import taskRnvWorkspaceList from './tasks/task.rnv.workspace.list'; import taskRnvWorkspaceAdd from './tasks/task.rnv.workspace.add'; import taskRnvWorkspaceConnect from './tasks/task.rnv.workspace.connect'; import taskRnvWorkspaceUpdate from './tasks/task.rnv.workspace.update'; -import taskRnvHooksList from './tasks/task.rnv.hooks.list'; -import taskRnvHooksRun from './tasks/task.rnv.hooks.run'; -import taskRnvHooksPipes from './tasks/task.rnv.hooks.pipes'; +import taskRnvHooksList from './tasks/hooks/task.rnv.hooks.list'; +import taskRnvHooksRun from './tasks/hooks/task.rnv.hooks.run'; +import taskRnvHooksPipes from './tasks/hooks/task.rnv.hooks.pipes'; import taskRnvClean from './tasks/task.rnv.clean'; import taskRnvStatus from './tasks/task.rnv.status'; import taskRnvConfig from './tasks/task.rnv.config'; @@ -36,8 +36,8 @@ import taskRvnKill from './tasks/task.rnv.kill'; import taskRvnDoctor from './tasks/task.rnv.doctor'; import taskRnvTargetList from './tasks/task.rnv.target.list'; import taskRnvTargetLaunch from './tasks/task.rnv.target.launch'; -import taskRnvLink from './tasks/task.rnv.link'; -import taskRnvUnlink from './tasks/task.rnv.unlink'; +import taskRnvLink from './tasks/linking/taskLink'; +import taskRnvUnlink from './tasks/linking/taskUnlink'; import taskRnvTelemetryStatus from './tasks/task.rnv.telemetry.status'; import taskRnvTelemetryEnable from './tasks/task.rnv.telemetry.enable'; import taskRnvTelemetryDisable from './tasks/task.rnv.telemetry.disable'; diff --git a/packages/engine-core/src/crypto.ts b/packages/engine-core/src/tasks/crypto/common.ts similarity index 96% rename from packages/engine-core/src/crypto.ts rename to packages/engine-core/src/tasks/crypto/common.ts index f0526ca5f3..6fbf8681bf 100644 --- a/packages/engine-core/src/crypto.ts +++ b/packages/engine-core/src/tasks/crypto/common.ts @@ -1,6 +1,5 @@ import { RnvContext, - TASK_CRYPTO_DECRYPT, chalk, executeTask, fsExistsSync, @@ -14,6 +13,9 @@ import { } from '@rnv/core'; import path from 'path'; +export const TASK_CRYPTO_ENCRYPT = 'crypto encrypt'; +export const TASK_CRYPTO_DECRYPT = 'crypto decrypt'; + export const getEnvExportCmd = (envVar: string, key: string) => { if (isSystemWin) { return `${chalk().white(`setx ${envVar} "${key}"`)}`; diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts b/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts similarity index 98% rename from packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts rename to packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts index aff6a680b4..ae8c7a660c 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts +++ b/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts @@ -14,14 +14,13 @@ import { fsReadFileSync, inquirerPrompt, executeTask, - TASK_CRYPTO_DECRYPT, TASK_PROJECT_CONFIGURE, PARAMS, RnvContext, RnvTaskFn, RnvTask, } from '@rnv/core'; -import { getEnvExportCmd, getEnvVar } from '../crypto'; +import { TASK_CRYPTO_DECRYPT, getEnvExportCmd, getEnvVar } from './common'; const iocane = require('iocane'); diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts b/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts similarity index 98% rename from packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts rename to packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts index dcb3ee122b..4bd0a71ef3 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts +++ b/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts @@ -17,7 +17,6 @@ import { fsReaddir, inquirerPrompt, executeTask, - TASK_CRYPTO_ENCRYPT, TASK_PROJECT_CONFIGURE, PARAMS, RnvContext, @@ -26,7 +25,7 @@ import { RnvTask, } from '@rnv/core'; import { statSync } from 'fs'; -import { getEnvExportCmd, getEnvVar } from '../crypto'; +import { TASK_CRYPTO_ENCRYPT, getEnvExportCmd, getEnvVar } from './common'; const iocane = require('iocane'); diff --git a/packages/engine-core/src/tasks/task.rnv.hooks.list.ts b/packages/engine-core/src/tasks/hooks/task.rnv.hooks.list.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.hooks.list.ts rename to packages/engine-core/src/tasks/hooks/task.rnv.hooks.list.ts diff --git a/packages/engine-core/src/tasks/task.rnv.hooks.pipes.ts b/packages/engine-core/src/tasks/hooks/task.rnv.hooks.pipes.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.hooks.pipes.ts rename to packages/engine-core/src/tasks/hooks/task.rnv.hooks.pipes.ts diff --git a/packages/engine-core/src/tasks/task.rnv.hooks.run.ts b/packages/engine-core/src/tasks/hooks/task.rnv.hooks.run.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.hooks.run.ts rename to packages/engine-core/src/tasks/hooks/task.rnv.hooks.run.ts diff --git a/packages/engine-core/src/tasks/linking/common.ts b/packages/engine-core/src/tasks/linking/common.ts new file mode 100644 index 0000000000..b74c70861c --- /dev/null +++ b/packages/engine-core/src/tasks/linking/common.ts @@ -0,0 +1,106 @@ +export const RNV_PACKAGES = [ + { + packageName: '@rnv/renative', + folderName: 'renative', + skipLinking: false, + }, + { + packageName: '@rnv/core', + folderName: 'core', + }, + { + packageName: '@rnv/engine-core', + folderName: 'engine-core', + }, + { + packageName: '@rnv/cli', + folderName: 'cli', + }, + { + packageName: '@rnv/template-starter', + folderName: 'template-starter', + }, + { + packageName: 'rnv', + folderName: 'rnv', + }, + { + packageName: '@rnv/engine-lightning', + folderName: 'engine-lightning', + }, + { + packageName: '@rnv/engine-rn', + folderName: 'engine-rn', + }, + { + packageName: '@rnv/engine-rn-electron', + folderName: 'engine-rn-electron', + }, + { + packageName: '@rnv/engine-rn-windows', + folderName: 'engine-rn-windows', + }, + { + packageName: '@rnv/engine-rn-next', + folderName: 'engine-rn-next', + }, + { + packageName: '@rnv/engine-rn-tvos', + folderName: 'engine-rn-tvos', + }, + { + packageName: '@rnv/engine-rn-web', + folderName: 'engine-rn-web', + }, + { + packageName: '@rnv/engine-roku', + folderName: 'engine-roku', + }, + { + packageName: '@rnv/integration-docker', + folderName: 'integration-docker', + }, + { + packageName: '@rnv/integration-ftp', + folderName: 'integration-ftp', + }, + { + packageName: '@rnv/integration-vercel', + folderName: 'integration-vercel', + }, + { + packageName: '@rnv/build-hooks-git', + folderName: 'build-hooks-git', + }, + { + packageName: '@rnv/sdk-apple', + folderName: 'sdk-apple', + }, + { + packageName: '@rnv/sdk-android', + folderName: 'sdk-android', + }, + { + packageName: '@rnv/sdk-tizen', + folderName: 'sdk-tizen', + }, + { + packageName: '@rnv/sdk-kaios', + folderName: 'sdk-kaios', + }, + { + packageName: '@rnv/sdk-react-native', + folderName: 'sdk-react-native', + }, + { + packageName: '@rnv/sdk-webpack', + folderName: 'sdk-webpack', + }, + { + packageName: '@rnv/sdk-webos', + folderName: 'sdk-webos', + }, +]; + +export const TASK_LINK = 'link'; +export const TASK_UNLINK = 'unlink'; diff --git a/packages/engine-core/src/tasks/task.rnv.link.ts b/packages/engine-core/src/tasks/linking/taskLink.ts similarity index 95% rename from packages/engine-core/src/tasks/task.rnv.link.ts rename to packages/engine-core/src/tasks/linking/taskLink.ts index ea6754796b..581e54a804 100644 --- a/packages/engine-core/src/tasks/task.rnv.link.ts +++ b/packages/engine-core/src/tasks/linking/taskLink.ts @@ -10,9 +10,8 @@ import { RnvTaskFn, RnvContext, RnvTask, - TASK_LINK, } from '@rnv/core'; -import { RNV_PACKAGES } from '../constants'; +import { RNV_PACKAGES, TASK_LINK } from './common'; const _linkPackage = (c: RnvContext, key: string, folder: string) => { const rnvPath = path.join(c.paths.project.nodeModulesDir, key); diff --git a/packages/engine-core/src/tasks/task.rnv.unlink.ts b/packages/engine-core/src/tasks/linking/taskUnlink.ts similarity index 95% rename from packages/engine-core/src/tasks/task.rnv.unlink.ts rename to packages/engine-core/src/tasks/linking/taskUnlink.ts index 35f70c1d43..e201750c13 100644 --- a/packages/engine-core/src/tasks/task.rnv.unlink.ts +++ b/packages/engine-core/src/tasks/linking/taskUnlink.ts @@ -11,9 +11,8 @@ import { RnvTaskFn, RnvContext, RnvTask, - TASK_UNLINK, } from '@rnv/core'; -import { RNV_PACKAGES } from '../constants'; +import { RNV_PACKAGES, TASK_UNLINK } from './common'; const _unlinkPackage = (c: RnvContext, key: string) => { const rnvPath = path.join(c.paths.project.nodeModulesDir, key); diff --git a/packages/engine-core/src/tasks/task.rnv.project.configure.ts b/packages/engine-core/src/tasks/task.rnv.project.configure.ts index e2b0edac37..8c7940326d 100644 --- a/packages/engine-core/src/tasks/task.rnv.project.configure.ts +++ b/packages/engine-core/src/tasks/task.rnv.project.configure.ts @@ -37,7 +37,7 @@ import { RnvTask, generateLocalJsonSchemas, } from '@rnv/core'; -import { checkCrypto } from '../crypto'; +import { checkCrypto } from './crypto/common'; const checkIsRenativeProject = async (c: RnvContext) => { if (!c.paths.project.configExists) { diff --git a/packages/engine-core/src/tasks/task.rnv.template.apply.ts b/packages/engine-core/src/tasks/task.rnv.template.apply.ts index 70e82ae765..be6ec4cd6d 100644 --- a/packages/engine-core/src/tasks/task.rnv.template.apply.ts +++ b/packages/engine-core/src/tasks/task.rnv.template.apply.ts @@ -3,14 +3,13 @@ import { applyTemplate, getInstalledTemplateOptions, executeTask, - TASK_TEMPLATE_APPLY, TASK_PROJECT_CONFIGURE, - TASK_APP_CONFIGURE, PARAMS, RnvTaskFn, inquirerPrompt, RnvTask, } from '@rnv/core'; +import { TASK_APP_CONFIGURE, TASK_TEMPLATE_APPLY } from '../constants'; export const taskRnvTemplateApply: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvTemplateApply', `template: ${c.program.template}`); diff --git a/packages/engine-core/src/tasks/task.rnv.template.list.ts b/packages/engine-core/src/tasks/task.rnv.template.list.ts index abd2a649ba..bcbcb73a5e 100644 --- a/packages/engine-core/src/tasks/task.rnv.template.list.ts +++ b/packages/engine-core/src/tasks/task.rnv.template.list.ts @@ -3,12 +3,12 @@ import { logTask, getTemplateOptions, executeTask, - TASK_TEMPLATE_LIST, TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, RnvTask, } from '@rnv/core'; +import { TASK_TEMPLATE_LIST } from '../constants'; export const taskRnvTemplateList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvTemplateList'); From 019d0946b403367f56fab2ebdb6ed54876bcd6e1 Mon Sep 17 00:00:00 2001 From: Pavel Jacko Date: Tue, 27 Feb 2024 01:04:41 +0100 Subject: [PATCH 03/46] refactor core engine --- packages/core/src/tasks/constants.ts | 9 --- packages/engine-core/src/constants.ts | 39 ---------- packages/engine-core/src/index.ts | 76 +++++++++---------- .../engine-core/src/tasks/app/constants.ts | 3 + .../taskAppConfigure.ts} | 2 +- .../taskAppCreate.ts} | 4 +- .../taskAppSwitch.ts} | 8 +- .../engine-core/src/tasks/crypto/common.ts | 4 +- .../engine-core/src/tasks/crypto/constants.ts | 2 + .../src/tasks/crypto/taskCryptoDecrypt.ts | 5 +- .../src/tasks/crypto/taskCryptoEncrypt.ts | 5 +- .../engine-core/src/tasks/global/constants.ts | 20 +++++ .../taskClean.ts} | 0 .../taskConfig.ts} | 0 .../taskConfigureSoft.ts} | 4 +- .../taskDoctor.ts} | 0 .../{task.rnv.help.ts => global/taskHelp.ts} | 0 .../taskInstall.ts} | 0 .../{task.rnv.kill.ts => global/taskKill.ts} | 0 .../{task.rnv.new.ts => global/taskNew.ts} | 0 .../taskStatus.ts} | 0 .../engine-core/src/tasks/hooks/constants.ts | 3 + ...ask.rnv.hooks.list.ts => taskHooksList.ts} | 0 ...k.rnv.hooks.pipes.ts => taskHooksPipes.ts} | 15 +--- ...{task.rnv.hooks.run.ts => taskHooksRun.ts} | 4 +- .../tasks/linking/{common.ts => constants.ts} | 0 .../engine-core/src/tasks/linking/taskLink.ts | 2 +- .../src/tasks/linking/taskUnlink.ts | 2 +- .../src/tasks/platform/constants.ts | 5 ++ .../taskPlatformConfigure.ts} | 10 +-- .../taskPlatformConnect.ts} | 4 +- .../taskPlatformEject.ts} | 4 +- .../taskPlatformList.ts} | 4 +- .../taskPlatformSetup.ts} | 14 +--- .../engine-core/src/tasks/plugin/constants.ts | 3 + .../taskPluginAdd.ts} | 8 +- .../taskPluginList.ts} | 2 +- .../taskPluginUpdate.ts} | 0 .../src/tasks/project/constants.ts | 2 + .../taskProjectConfigure.ts} | 14 ++-- .../taskProjectUpgrade.ts} | 0 .../engine-core/src/tasks/target/constants.ts | 3 + .../taskTargetLaunch.ts} | 6 +- .../taskTargetList.ts} | 19 ++--- .../src/tasks/telemetry/constants.ts | 3 + .../taskTelemetryDisable.ts} | 12 +-- .../taskTelemetryEnable.ts} | 12 +-- .../taskTelemetryStatus.ts} | 3 +- .../src/tasks/template/constants.ts | 3 + .../taskTemplateAdd.ts} | 4 +- .../taskTemplateApply.ts} | 5 +- .../taskTemplateList.ts} | 14 +--- .../src/tasks/workspace/constants.ts | 5 ++ .../taskWorkspaceAdd.ts} | 4 +- .../taskWorkspaceConfigure.ts} | 0 .../taskWorkspaceConnect.ts} | 4 +- .../taskWorkspaceList.ts} | 15 +--- .../taskWorkspaceUpdate.ts} | 12 +-- 58 files changed, 171 insertions(+), 230 deletions(-) delete mode 100644 packages/engine-core/src/constants.ts create mode 100644 packages/engine-core/src/tasks/app/constants.ts rename packages/engine-core/src/tasks/{task.rnv.app.configure.ts => app/taskAppConfigure.ts} (99%) rename packages/engine-core/src/tasks/{task.rnv.app.create.ts => app/taskAppCreate.ts} (98%) rename packages/engine-core/src/tasks/{task.rnv.switch.ts => app/taskAppSwitch.ts} (75%) create mode 100644 packages/engine-core/src/tasks/crypto/constants.ts create mode 100644 packages/engine-core/src/tasks/global/constants.ts rename packages/engine-core/src/tasks/{task.rnv.clean.ts => global/taskClean.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.config.ts => global/taskConfig.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.configureSoft.ts => global/taskConfigureSoft.ts} (87%) rename packages/engine-core/src/tasks/{task.rnv.doctor.ts => global/taskDoctor.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.help.ts => global/taskHelp.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.install.ts => global/taskInstall.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.kill.ts => global/taskKill.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.new.ts => global/taskNew.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.status.ts => global/taskStatus.ts} (100%) create mode 100644 packages/engine-core/src/tasks/hooks/constants.ts rename packages/engine-core/src/tasks/hooks/{task.rnv.hooks.list.ts => taskHooksList.ts} (100%) rename packages/engine-core/src/tasks/hooks/{task.rnv.hooks.pipes.ts => taskHooksPipes.ts} (70%) rename packages/engine-core/src/tasks/hooks/{task.rnv.hooks.run.ts => taskHooksRun.ts} (93%) rename packages/engine-core/src/tasks/linking/{common.ts => constants.ts} (100%) create mode 100644 packages/engine-core/src/tasks/platform/constants.ts rename packages/engine-core/src/tasks/{task.rnv.platform.configure.ts => platform/taskPlatformConfigure.ts} (85%) rename packages/engine-core/src/tasks/{task.rnv.platform.connect.ts => platform/taskPlatformConnect.ts} (96%) rename packages/engine-core/src/tasks/{task.rnv.platform.eject.ts => platform/taskPlatformEject.ts} (95%) rename packages/engine-core/src/tasks/{task.rnv.platform.list.ts => platform/taskPlatformList.ts} (86%) rename packages/engine-core/src/tasks/{task.rnv.platform.setup.ts => platform/taskPlatformSetup.ts} (80%) create mode 100644 packages/engine-core/src/tasks/plugin/constants.ts rename packages/engine-core/src/tasks/{task.rnv.plugin.add.ts => plugin/taskPluginAdd.ts} (94%) rename packages/engine-core/src/tasks/{task.rnv.plugin.list.ts => plugin/taskPluginList.ts} (93%) rename packages/engine-core/src/tasks/{task.rnv.plugin.update.ts => plugin/taskPluginUpdate.ts} (100%) create mode 100644 packages/engine-core/src/tasks/project/constants.ts rename packages/engine-core/src/tasks/{task.rnv.project.configure.ts => project/taskProjectConfigure.ts} (92%) rename packages/engine-core/src/tasks/{task.rnv.project.upgrade.ts => project/taskProjectUpgrade.ts} (100%) create mode 100644 packages/engine-core/src/tasks/target/constants.ts rename packages/engine-core/src/tasks/{task.rnv.target.launch.ts => target/taskTargetLaunch.ts} (93%) rename packages/engine-core/src/tasks/{task.rnv.target.list.ts => target/taskTargetList.ts} (81%) create mode 100644 packages/engine-core/src/tasks/telemetry/constants.ts rename packages/engine-core/src/tasks/{task.rnv.telemetry.disable.ts => telemetry/taskTelemetryDisable.ts} (82%) rename packages/engine-core/src/tasks/{task.rnv.telemetry.enable.ts => telemetry/taskTelemetryEnable.ts} (83%) rename packages/engine-core/src/tasks/{task.rnv.telemetry.status.ts => telemetry/taskTelemetryStatus.ts} (93%) create mode 100644 packages/engine-core/src/tasks/template/constants.ts rename packages/engine-core/src/tasks/{task.rnv.template.add.ts => template/taskTemplateAdd.ts} (92%) rename packages/engine-core/src/tasks/{task.rnv.template.apply.ts => template/taskTemplateApply.ts} (89%) rename packages/engine-core/src/tasks/{task.rnv.template.list.ts => template/taskTemplateList.ts} (73%) create mode 100644 packages/engine-core/src/tasks/workspace/constants.ts rename packages/engine-core/src/tasks/{task.rnv.workspace.add.ts => workspace/taskWorkspaceAdd.ts} (93%) rename packages/engine-core/src/tasks/{task.rnv.workspace.configure.ts => workspace/taskWorkspaceConfigure.ts} (100%) rename packages/engine-core/src/tasks/{task.rnv.workspace.connect.ts => workspace/taskWorkspaceConnect.ts} (90%) rename packages/engine-core/src/tasks/{task.rnv.workspace.list.ts => workspace/taskWorkspaceList.ts} (78%) rename packages/engine-core/src/tasks/{task.rnv.workspace.update.ts => workspace/taskWorkspaceUpdate.ts} (72%) diff --git a/packages/core/src/tasks/constants.ts b/packages/core/src/tasks/constants.ts index f976d1cf72..8f56d9f226 100644 --- a/packages/core/src/tasks/constants.ts +++ b/packages/core/src/tasks/constants.ts @@ -9,15 +9,6 @@ export const TASK_DEBUG = 'debug'; export const TASK_PACKAGE = 'package'; export const TASK_DEPLOY = 'deploy'; export const TASK_LOG = 'log'; -export const TASK_INSTALL = 'install'; -export const TASK_PUBLISH = 'publish'; -export const TASK_PROJECT_CONFIGURE = 'project configure'; -export const TASK_CRYPTO_INSTALL_CERTS = 'crypto installCerts'; -export const TASK_CRYPTO_INSTALL_PROFILES = 'crypto installProfiles'; -export const TASK_CRYPTO_INSTALL_PROFILE = 'crypto installProfile'; -export const TASK_CRYPTO_UPDATE_PROFILE = 'crypto updateProfile'; -export const TASK_CRYPTO_UPDATE_PROFILES = 'crypto updateProfiles'; -export const TASK_CONFIGURE_SOFT = 'configureSoft'; export const DEFAULT_TASK_DESCRIPTIONS: Record = { [TASK_RUN]: 'Run your app on target device or emulator', diff --git a/packages/engine-core/src/constants.ts b/packages/engine-core/src/constants.ts deleted file mode 100644 index c23f7862e7..0000000000 --- a/packages/engine-core/src/constants.ts +++ /dev/null @@ -1,39 +0,0 @@ -export const TASK_DOCTOR = 'doctor'; -export const TASK_NEW = 'new'; -export const TASK_HELP = 'help'; -export const TASK_INFO = 'info'; -export const TASK_CLEAN = 'clean'; - -export const TASK_APP_CONFIGURE = 'app configure'; -export const TASK_APP_CREATE = 'app create'; -export const TASK_STATUS = 'status'; -export const TASK_SWITCH = 'switch'; -export const TASK_TARGET_LAUNCH = 'target launch'; -export const TASK_TARGET_LIST = 'target list'; -export const TASK_TARGET = 'target'; -export const TASK_TEMPLATE_ADD = 'template add'; -export const TASK_TEMPLATE_LIST = 'template list'; -export const TASK_TEMPLATE_APPLY = 'template apply'; -export const TASK_WORKSPACE_ADD = 'workspace add'; -export const TASK_WORKSPACE_CONNECT = 'workspace connect'; -export const TASK_WORKSPACE_LIST = 'workspace list'; -export const TASK_WORKSPACE_UPDATE = 'workspace update'; -export const TASK_PLATFORM_CONFIGURE = 'platform configure'; -export const TASK_PLATFORM_CONNECT = 'platform connect'; -export const TASK_PLATFORM_EJECT = 'platform eject'; -export const TASK_PLATFORM_LIST = 'platform list'; -export const TASK_PLATFORM_SETUP = 'platform setup'; -export const TASK_PROJECT_UPGRADE = 'project upgrade'; -export const TASK_PLUGIN_ADD = 'plugin add'; -export const TASK_PLUGIN_LIST = 'plugin list'; -export const TASK_PLUGIN_UPDATE = 'plugin update'; -export const TASK_KILL = 'kill'; -export const TASK_EJECT = 'eject'; -export const TASK_TELEMETRY_DISABLE = 'telemetry disable'; -export const TASK_TELEMETRY_ENABLE = 'telemetry enable'; -export const TASK_TELEMETRY_STATUS = 'telemetry status'; -export const TASK_HOOKS_RUN = 'hooks run'; -export const TASK_HOOKS_LIST = 'hooks list'; -export const TASK_HOOKS_PIPES = 'hooks pipes'; -export const TASK_PKG = 'pkg'; -export const TASK_WORKSPACE_CONFIGURE = 'workspace configure'; diff --git a/packages/engine-core/src/index.ts b/packages/engine-core/src/index.ts index 4f06af7b18..0847efc3a7 100644 --- a/packages/engine-core/src/index.ts +++ b/packages/engine-core/src/index.ts @@ -2,46 +2,46 @@ import { RnvEngine, generateEngineTasks } from '@rnv/core'; import taskRnvCryptoDecrypt from './tasks/crypto/taskCryptoDecrypt'; import taskRnvCryptoEncrypt from './tasks/crypto/taskCryptoEncrypt'; -import taskRnvPlatformEject from './tasks/task.rnv.platform.eject'; -import taskRnvPlatformConnect from './tasks/task.rnv.platform.connect'; -import taskRnvPlatformList from './tasks/task.rnv.platform.list'; -import taskRnvPlatformConfigure from './tasks/task.rnv.platform.configure'; -import taskRnvPlatformSetup from './tasks/task.rnv.platform.setup'; -import taskRnvTemplateAdd from './tasks/task.rnv.template.add'; -import taskRnvTemplateApply from './tasks/task.rnv.template.apply'; -import taskRnvTemplateList from './tasks/task.rnv.template.list'; -import taskRnvPluginAdd from './tasks/task.rnv.plugin.add'; -import taskRnvPluginList from './tasks/task.rnv.plugin.list'; -import taskRnvPluginUpdate from './tasks/task.rnv.plugin.update'; -import taskRnvWorkspaceList from './tasks/task.rnv.workspace.list'; -import taskRnvWorkspaceAdd from './tasks/task.rnv.workspace.add'; -import taskRnvWorkspaceConnect from './tasks/task.rnv.workspace.connect'; -import taskRnvWorkspaceUpdate from './tasks/task.rnv.workspace.update'; -import taskRnvHooksList from './tasks/hooks/task.rnv.hooks.list'; -import taskRnvHooksRun from './tasks/hooks/task.rnv.hooks.run'; -import taskRnvHooksPipes from './tasks/hooks/task.rnv.hooks.pipes'; -import taskRnvClean from './tasks/task.rnv.clean'; -import taskRnvStatus from './tasks/task.rnv.status'; -import taskRnvConfig from './tasks/task.rnv.config'; -import taskRnvHelp from './tasks/task.rnv.help'; -import taskRnvNew from './tasks/task.rnv.new'; -import taskRnvInstall from './tasks/task.rnv.install'; -import taskRnvProjectConfigure from './tasks/task.rnv.project.configure'; -import taskRnvProjectUpgrade from './tasks/task.rnv.project.upgrade'; -import taskRnvAppConfigure from './tasks/task.rnv.app.configure'; -import taskRnvAppCreate from './tasks/task.rnv.app.create'; -import taskRnvWorkspaceConfigure from './tasks/task.rnv.workspace.configure'; -import taskRnvConfigureSoft from './tasks/task.rnv.configureSoft'; -import taskRvnKill from './tasks/task.rnv.kill'; -import taskRvnDoctor from './tasks/task.rnv.doctor'; -import taskRnvTargetList from './tasks/task.rnv.target.list'; -import taskRnvTargetLaunch from './tasks/task.rnv.target.launch'; +import taskRnvPlatformEject from './tasks/platform/task.rnv.platform.eject'; +import taskRnvPlatformConnect from './tasks/platform/task.rnv.platform.connect'; +import taskRnvPlatformList from './tasks/platform/task.rnv.platform.list'; +import taskRnvPlatformConfigure from './tasks/platform/task.rnv.platform.configure'; +import taskRnvPlatformSetup from './tasks/platform/task.rnv.platform.setup'; +import taskRnvTemplateAdd from './tasks/template/task.rnv.template.add'; +import taskRnvTemplateApply from './tasks/template/task.rnv.template.apply'; +import taskRnvTemplateList from './tasks/template/task.rnv.template.list'; +import taskRnvPluginAdd from './tasks/plugin/task.rnv.plugin.add'; +import taskRnvPluginList from './tasks/plugin/task.rnv.plugin.list'; +import taskRnvPluginUpdate from './tasks/plugin/task.rnv.plugin.update'; +import taskRnvWorkspaceList from './tasks/workspace/taskWorkspaceList'; +import taskRnvWorkspaceAdd from './tasks/workspace/taskWorkspaceAdd'; +import taskRnvWorkspaceConnect from './tasks/workspace/taskWorkspaceConnect'; +import taskRnvWorkspaceUpdate from './tasks/workspace/taskWorkspaceUpdate'; +import taskRnvHooksList from './tasks/hooks/taskHooksList'; +import taskRnvHooksRun from './tasks/hooks/taskHooksRun'; +import taskRnvHooksPipes from './tasks/hooks/taskHooksPipes'; +import taskRnvClean from './tasks/global/task.rnv.clean'; +import taskRnvStatus from './tasks/global/task.rnv.status'; +import taskRnvConfig from './tasks/global/task.rnv.config'; +import taskRnvHelp from './tasks/global/task.rnv.help'; +import taskRnvNew from './tasks/global/task.rnv.new'; +import taskRnvInstall from './tasks/global/task.rnv.install'; +import taskRnvProjectConfigure from './tasks/project/taskProjectConfigure'; +import taskRnvProjectUpgrade from './tasks/project/taskProjectUpgrade'; +import taskRnvAppConfigure from './tasks/app/taskAppConfigure'; +import taskRnvAppCreate from './tasks/app/taskAppCreate'; +import taskRnvWorkspaceConfigure from './tasks/workspace/taskWorkspaceConfigure'; +import taskRnvConfigureSoft from './tasks/global/task.rnv.configureSoft'; +import taskRvnKill from './tasks/global/task.rnv.kill'; +import taskRvnDoctor from './tasks/global/task.rnv.doctor'; +import taskRnvTargetList from './tasks/target/taskTargetList'; +import taskRnvTargetLaunch from './tasks/target/taskTargetLaunch'; import taskRnvLink from './tasks/linking/taskLink'; import taskRnvUnlink from './tasks/linking/taskUnlink'; -import taskRnvTelemetryStatus from './tasks/task.rnv.telemetry.status'; -import taskRnvTelemetryEnable from './tasks/task.rnv.telemetry.enable'; -import taskRnvTelemetryDisable from './tasks/task.rnv.telemetry.disable'; -import taskRnvSwitch from './tasks/task.rnv.switch'; +import taskRnvTelemetryStatus from './tasks/telemetry/taskTelemetryStatus'; +import taskRnvTelemetryEnable from './tasks/telemetry/taskTelemetryEnable'; +import taskRnvTelemetryDisable from './tasks/telemetry/taskTelemetryDisable'; +import taskRnvSwitch from './tasks/app/taskAppSwitch'; const Engine: RnvEngine = { // initializeRuntimeConfig: () => { diff --git a/packages/engine-core/src/tasks/app/constants.ts b/packages/engine-core/src/tasks/app/constants.ts new file mode 100644 index 0000000000..01f0d43156 --- /dev/null +++ b/packages/engine-core/src/tasks/app/constants.ts @@ -0,0 +1,3 @@ +export const TASK_APP_CONFIGURE = 'app configure'; +export const TASK_APP_CREATE = 'app create'; +export const TASK_APP_SWITCH = 'app switch'; diff --git a/packages/engine-core/src/tasks/task.rnv.app.configure.ts b/packages/engine-core/src/tasks/app/taskAppConfigure.ts similarity index 99% rename from packages/engine-core/src/tasks/task.rnv.app.configure.ts rename to packages/engine-core/src/tasks/app/taskAppConfigure.ts index bd8758a945..c92d17b08a 100644 --- a/packages/engine-core/src/tasks/task.rnv.app.configure.ts +++ b/packages/engine-core/src/tasks/app/taskAppConfigure.ts @@ -12,7 +12,6 @@ import { fsExistsSync, fsReadFileSync, fsRenameSync, - TASK_APP_CONFIGURE, PARAMS, listAppConfigsFoldersSync, updateRenativeConfigs, @@ -21,6 +20,7 @@ import { inquirerSeparator, RnvTask, } from '@rnv/core'; +import { TASK_APP_CONFIGURE } from './constants'; const _loadAppConfigIDfromDir = (dirName: string, appConfigsDir: string) => { logDebug(`_loadAppConfigIDfromDir:${dirName}:${appConfigsDir}`, chalk().grey); diff --git a/packages/engine-core/src/tasks/task.rnv.app.create.ts b/packages/engine-core/src/tasks/app/taskAppCreate.ts similarity index 98% rename from packages/engine-core/src/tasks/task.rnv.app.create.ts rename to packages/engine-core/src/tasks/app/taskAppCreate.ts index 0367610c9a..cee0042ce8 100644 --- a/packages/engine-core/src/tasks/task.rnv.app.create.ts +++ b/packages/engine-core/src/tasks/app/taskAppCreate.ts @@ -13,11 +13,11 @@ import { inquirerPrompt, logInfo, logTask, - TASK_APP_CREATE, PARAMS, RnvTask, + ConfigFileApp, } from '@rnv/core'; -import { ConfigFileApp } from '@rnv/core/lib/schema/configFiles/types'; +import { TASK_APP_CREATE } from './constants'; export const taskRnvAppCreate: RnvTaskFn = async (c) => { logTask('taskRnvAppCreate'); diff --git a/packages/engine-core/src/tasks/task.rnv.switch.ts b/packages/engine-core/src/tasks/app/taskAppSwitch.ts similarity index 75% rename from packages/engine-core/src/tasks/task.rnv.switch.ts rename to packages/engine-core/src/tasks/app/taskAppSwitch.ts index d0eef1266b..e53eae4612 100644 --- a/packages/engine-core/src/tasks/task.rnv.switch.ts +++ b/packages/engine-core/src/tasks/app/taskAppSwitch.ts @@ -3,20 +3,20 @@ import { configureFonts, copyRuntimeAssets, executeTask, - TASK_SWITCH, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, generatePlatformAssetsRuntimeConfig, RnvTask, } from '@rnv/core'; +import { TASK_APP_SWITCH } from './constants'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; export const taskRnvSwitch: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvSwitch'); c.program.appConfigID = true; - await executeTask(c, TASK_PROJECT_CONFIGURE, TASK_SWITCH, originTask); + await executeTask(c, TASK_PROJECT_CONFIGURE, TASK_APP_SWITCH, originTask); await copyRuntimeAssets(c); await generatePlatformAssetsRuntimeConfig(c); @@ -28,7 +28,7 @@ export const taskRnvSwitch: RnvTaskFn = async (c, _parentTask, originTask) => { const Task: RnvTask = { description: 'Switch between different app configs in current project', fn: taskRnvSwitch, - task: TASK_SWITCH, + task: TASK_APP_SWITCH, params: PARAMS.withBase(), platforms: [], }; diff --git a/packages/engine-core/src/tasks/crypto/common.ts b/packages/engine-core/src/tasks/crypto/common.ts index 6fbf8681bf..656901f357 100644 --- a/packages/engine-core/src/tasks/crypto/common.ts +++ b/packages/engine-core/src/tasks/crypto/common.ts @@ -12,9 +12,7 @@ import { logWarning, } from '@rnv/core'; import path from 'path'; - -export const TASK_CRYPTO_ENCRYPT = 'crypto encrypt'; -export const TASK_CRYPTO_DECRYPT = 'crypto decrypt'; +import { TASK_CRYPTO_DECRYPT } from './constants'; export const getEnvExportCmd = (envVar: string, key: string) => { if (isSystemWin) { diff --git a/packages/engine-core/src/tasks/crypto/constants.ts b/packages/engine-core/src/tasks/crypto/constants.ts new file mode 100644 index 0000000000..d3b3fdb53c --- /dev/null +++ b/packages/engine-core/src/tasks/crypto/constants.ts @@ -0,0 +1,2 @@ +export const TASK_CRYPTO_ENCRYPT = 'crypto encrypt'; +export const TASK_CRYPTO_DECRYPT = 'crypto decrypt'; diff --git a/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts b/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts index ae8c7a660c..f792cc0372 100644 --- a/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts +++ b/packages/engine-core/src/tasks/crypto/taskCryptoDecrypt.ts @@ -14,13 +14,14 @@ import { fsReadFileSync, inquirerPrompt, executeTask, - TASK_PROJECT_CONFIGURE, PARAMS, RnvContext, RnvTaskFn, RnvTask, } from '@rnv/core'; -import { TASK_CRYPTO_DECRYPT, getEnvExportCmd, getEnvVar } from './common'; +import { getEnvExportCmd, getEnvVar } from './common'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_CRYPTO_DECRYPT } from './constants'; const iocane = require('iocane'); diff --git a/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts b/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts index 4bd0a71ef3..802e1685ad 100644 --- a/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts +++ b/packages/engine-core/src/tasks/crypto/taskCryptoEncrypt.ts @@ -17,7 +17,6 @@ import { fsReaddir, inquirerPrompt, executeTask, - TASK_PROJECT_CONFIGURE, PARAMS, RnvContext, RnvTaskFn, @@ -25,7 +24,9 @@ import { RnvTask, } from '@rnv/core'; import { statSync } from 'fs'; -import { TASK_CRYPTO_ENCRYPT, getEnvExportCmd, getEnvVar } from './common'; +import { getEnvExportCmd, getEnvVar } from './common'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_CRYPTO_ENCRYPT } from './constants'; const iocane = require('iocane'); diff --git a/packages/engine-core/src/tasks/global/constants.ts b/packages/engine-core/src/tasks/global/constants.ts new file mode 100644 index 0000000000..ffa291e28d --- /dev/null +++ b/packages/engine-core/src/tasks/global/constants.ts @@ -0,0 +1,20 @@ +export const TASK_DOCTOR = 'doctor'; +export const TASK_NEW = 'new'; +export const TASK_HELP = 'help'; +export const TASK_INFO = 'info'; +export const TASK_CLEAN = 'clean'; + +export const TASK_STATUS = 'status'; + +export const TASK_KILL = 'kill'; +export const TASK_EJECT = 'eject'; +export const TASK_PKG = 'pkg'; + +export const TASK_INSTALL = 'install'; +export const TASK_PUBLISH = 'publish'; +export const TASK_CRYPTO_INSTALL_CERTS = 'crypto installCerts'; +export const TASK_CRYPTO_INSTALL_PROFILES = 'crypto installProfiles'; +export const TASK_CRYPTO_INSTALL_PROFILE = 'crypto installProfile'; +export const TASK_CRYPTO_UPDATE_PROFILE = 'crypto updateProfile'; +export const TASK_CRYPTO_UPDATE_PROFILES = 'crypto updateProfiles'; +export const TASK_CONFIGURE_SOFT = 'configureSoft'; diff --git a/packages/engine-core/src/tasks/task.rnv.clean.ts b/packages/engine-core/src/tasks/global/taskClean.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.clean.ts rename to packages/engine-core/src/tasks/global/taskClean.ts diff --git a/packages/engine-core/src/tasks/task.rnv.config.ts b/packages/engine-core/src/tasks/global/taskConfig.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.config.ts rename to packages/engine-core/src/tasks/global/taskConfig.ts diff --git a/packages/engine-core/src/tasks/task.rnv.configureSoft.ts b/packages/engine-core/src/tasks/global/taskConfigureSoft.ts similarity index 87% rename from packages/engine-core/src/tasks/task.rnv.configureSoft.ts rename to packages/engine-core/src/tasks/global/taskConfigureSoft.ts index e4d197d95a..4a1e1e6754 100644 --- a/packages/engine-core/src/tasks/task.rnv.configureSoft.ts +++ b/packages/engine-core/src/tasks/global/taskConfigureSoft.ts @@ -9,8 +9,8 @@ import { logTask, RnvTask, } from '@rnv/core'; -import { checkAndConfigureSdks, checkSdk } from '../common'; -import { isBuildSchemeSupported } from '../buildSchemes'; +import { checkAndConfigureSdks, checkSdk } from '../../common'; +import { isBuildSchemeSupported } from '../../buildSchemes'; export const taskRnvConfigureSoft: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvConfigureSoft'); diff --git a/packages/engine-core/src/tasks/task.rnv.doctor.ts b/packages/engine-core/src/tasks/global/taskDoctor.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.doctor.ts rename to packages/engine-core/src/tasks/global/taskDoctor.ts diff --git a/packages/engine-core/src/tasks/task.rnv.help.ts b/packages/engine-core/src/tasks/global/taskHelp.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.help.ts rename to packages/engine-core/src/tasks/global/taskHelp.ts diff --git a/packages/engine-core/src/tasks/task.rnv.install.ts b/packages/engine-core/src/tasks/global/taskInstall.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.install.ts rename to packages/engine-core/src/tasks/global/taskInstall.ts diff --git a/packages/engine-core/src/tasks/task.rnv.kill.ts b/packages/engine-core/src/tasks/global/taskKill.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.kill.ts rename to packages/engine-core/src/tasks/global/taskKill.ts diff --git a/packages/engine-core/src/tasks/task.rnv.new.ts b/packages/engine-core/src/tasks/global/taskNew.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.new.ts rename to packages/engine-core/src/tasks/global/taskNew.ts diff --git a/packages/engine-core/src/tasks/task.rnv.status.ts b/packages/engine-core/src/tasks/global/taskStatus.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.status.ts rename to packages/engine-core/src/tasks/global/taskStatus.ts diff --git a/packages/engine-core/src/tasks/hooks/constants.ts b/packages/engine-core/src/tasks/hooks/constants.ts new file mode 100644 index 0000000000..b631f8c004 --- /dev/null +++ b/packages/engine-core/src/tasks/hooks/constants.ts @@ -0,0 +1,3 @@ +export const TASK_HOOKS_RUN = 'hooks run'; +export const TASK_HOOKS_LIST = 'hooks list'; +export const TASK_HOOKS_PIPES = 'hooks pipes'; diff --git a/packages/engine-core/src/tasks/hooks/task.rnv.hooks.list.ts b/packages/engine-core/src/tasks/hooks/taskHooksList.ts similarity index 100% rename from packages/engine-core/src/tasks/hooks/task.rnv.hooks.list.ts rename to packages/engine-core/src/tasks/hooks/taskHooksList.ts diff --git a/packages/engine-core/src/tasks/hooks/task.rnv.hooks.pipes.ts b/packages/engine-core/src/tasks/hooks/taskHooksPipes.ts similarity index 70% rename from packages/engine-core/src/tasks/hooks/task.rnv.hooks.pipes.ts rename to packages/engine-core/src/tasks/hooks/taskHooksPipes.ts index c83afa38cd..5672063bcf 100644 --- a/packages/engine-core/src/tasks/hooks/task.rnv.hooks.pipes.ts +++ b/packages/engine-core/src/tasks/hooks/taskHooksPipes.ts @@ -1,15 +1,6 @@ -import { - logTask, - logRaw, - generateOptions, - buildHooks, - executeTask, - TASK_HOOKS_PIPES, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; +import { logTask, logRaw, generateOptions, buildHooks, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_HOOKS_PIPES } from './constants'; export const taskRnvHooksPipes: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvHooksPipes'); diff --git a/packages/engine-core/src/tasks/hooks/task.rnv.hooks.run.ts b/packages/engine-core/src/tasks/hooks/taskHooksRun.ts similarity index 93% rename from packages/engine-core/src/tasks/hooks/task.rnv.hooks.run.ts rename to packages/engine-core/src/tasks/hooks/taskHooksRun.ts index 1429c8b505..94d9aa9ea1 100644 --- a/packages/engine-core/src/tasks/hooks/task.rnv.hooks.run.ts +++ b/packages/engine-core/src/tasks/hooks/taskHooksRun.ts @@ -4,14 +4,14 @@ import { buildHooks, executeTask, fsExistsSync, - TASK_HOOKS_RUN, - TASK_PROJECT_CONFIGURE, PARAMS, PARAM_KEYS, RnvTaskFn, inquirerPrompt, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_HOOKS_RUN } from './constants'; export const taskRnvHooksRun: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvHooksRun'); diff --git a/packages/engine-core/src/tasks/linking/common.ts b/packages/engine-core/src/tasks/linking/constants.ts similarity index 100% rename from packages/engine-core/src/tasks/linking/common.ts rename to packages/engine-core/src/tasks/linking/constants.ts diff --git a/packages/engine-core/src/tasks/linking/taskLink.ts b/packages/engine-core/src/tasks/linking/taskLink.ts index 581e54a804..05be73160b 100644 --- a/packages/engine-core/src/tasks/linking/taskLink.ts +++ b/packages/engine-core/src/tasks/linking/taskLink.ts @@ -11,7 +11,7 @@ import { RnvContext, RnvTask, } from '@rnv/core'; -import { RNV_PACKAGES, TASK_LINK } from './common'; +import { RNV_PACKAGES, TASK_LINK } from './constants'; const _linkPackage = (c: RnvContext, key: string, folder: string) => { const rnvPath = path.join(c.paths.project.nodeModulesDir, key); diff --git a/packages/engine-core/src/tasks/linking/taskUnlink.ts b/packages/engine-core/src/tasks/linking/taskUnlink.ts index e201750c13..123d74f641 100644 --- a/packages/engine-core/src/tasks/linking/taskUnlink.ts +++ b/packages/engine-core/src/tasks/linking/taskUnlink.ts @@ -12,7 +12,7 @@ import { RnvContext, RnvTask, } from '@rnv/core'; -import { RNV_PACKAGES, TASK_UNLINK } from './common'; +import { RNV_PACKAGES, TASK_UNLINK } from './constants'; const _unlinkPackage = (c: RnvContext, key: string) => { const rnvPath = path.join(c.paths.project.nodeModulesDir, key); diff --git a/packages/engine-core/src/tasks/platform/constants.ts b/packages/engine-core/src/tasks/platform/constants.ts new file mode 100644 index 0000000000..a120f052b0 --- /dev/null +++ b/packages/engine-core/src/tasks/platform/constants.ts @@ -0,0 +1,5 @@ +export const TASK_PLATFORM_CONFIGURE = 'platform configure'; +export const TASK_PLATFORM_CONNECT = 'platform connect'; +export const TASK_PLATFORM_EJECT = 'platform eject'; +export const TASK_PLATFORM_LIST = 'platform list'; +export const TASK_PLATFORM_SETUP = 'platform setup'; diff --git a/packages/engine-core/src/tasks/task.rnv.platform.configure.ts b/packages/engine-core/src/tasks/platform/taskPlatformConfigure.ts similarity index 85% rename from packages/engine-core/src/tasks/task.rnv.platform.configure.ts rename to packages/engine-core/src/tasks/platform/taskPlatformConfigure.ts index c0b2e9ab0d..39d81763a3 100644 --- a/packages/engine-core/src/tasks/task.rnv.platform.configure.ts +++ b/packages/engine-core/src/tasks/platform/taskPlatformConfigure.ts @@ -12,14 +12,14 @@ import { executeTask, shouldSkipTask, PARAMS, - TASK_PLATFORM_CONFIGURE, - TASK_PROJECT_CONFIGURE, - TASK_INSTALL, RnvTaskFn, RnvTask, } from '@rnv/core'; -import { checkAndConfigureSdks, checkSdk } from '../common'; -import { isBuildSchemeSupported } from '../buildSchemes'; +import { checkAndConfigureSdks, checkSdk } from '../../common'; +import { isBuildSchemeSupported } from '../../buildSchemes'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLATFORM_CONFIGURE } from './constants'; +import { TASK_INSTALL } from '../global/constants'; export const taskRnvPlatformConfigure: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvPlatformConfigure', ''); diff --git a/packages/engine-core/src/tasks/task.rnv.platform.connect.ts b/packages/engine-core/src/tasks/platform/taskPlatformConnect.ts similarity index 96% rename from packages/engine-core/src/tasks/task.rnv.platform.connect.ts rename to packages/engine-core/src/tasks/platform/taskPlatformConnect.ts index 9ffcf8a957..616a009db2 100644 --- a/packages/engine-core/src/tasks/task.rnv.platform.connect.ts +++ b/packages/engine-core/src/tasks/platform/taskPlatformConnect.ts @@ -9,14 +9,14 @@ import { removeDirs, generatePlatformChoices, executeTask, - TASK_PROJECT_CONFIGURE, - TASK_PLATFORM_CONNECT, PARAMS, RnvTaskFn, inquirerPrompt, PlatformKey, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLATFORM_CONNECT } from './constants'; export const taskRnvPlatformConnect: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPlatformConnect'); diff --git a/packages/engine-core/src/tasks/task.rnv.platform.eject.ts b/packages/engine-core/src/tasks/platform/taskPlatformEject.ts similarity index 95% rename from packages/engine-core/src/tasks/task.rnv.platform.eject.ts rename to packages/engine-core/src/tasks/platform/taskPlatformEject.ts index dbe402d476..7679252113 100644 --- a/packages/engine-core/src/tasks/task.rnv.platform.eject.ts +++ b/packages/engine-core/src/tasks/platform/taskPlatformEject.ts @@ -5,8 +5,6 @@ import { logError, logInfo, writeFileSync, - TASK_PLATFORM_EJECT, - TASK_PROJECT_CONFIGURE, PARAMS, generatePlatformChoices, ejectPlatform, @@ -16,6 +14,8 @@ import { PlatformKey, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLATFORM_EJECT } from './constants'; export const taskRnvPlatformEject: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPlatformEject'); diff --git a/packages/engine-core/src/tasks/task.rnv.platform.list.ts b/packages/engine-core/src/tasks/platform/taskPlatformList.ts similarity index 86% rename from packages/engine-core/src/tasks/task.rnv.platform.list.ts rename to packages/engine-core/src/tasks/platform/taskPlatformList.ts index aa6e7f6667..99d3f2a4b4 100644 --- a/packages/engine-core/src/tasks/task.rnv.platform.list.ts +++ b/packages/engine-core/src/tasks/platform/taskPlatformList.ts @@ -4,12 +4,12 @@ import { logTask, generatePlatformChoices, executeTask, - TASK_PLATFORM_LIST, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLATFORM_LIST } from './constants'; export const taskRnvPlatformList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPlatformList'); diff --git a/packages/engine-core/src/tasks/task.rnv.platform.setup.ts b/packages/engine-core/src/tasks/platform/taskPlatformSetup.ts similarity index 80% rename from packages/engine-core/src/tasks/task.rnv.platform.setup.ts rename to packages/engine-core/src/tasks/platform/taskPlatformSetup.ts index 732200d2d6..4d98ef8a62 100644 --- a/packages/engine-core/src/tasks/task.rnv.platform.setup.ts +++ b/packages/engine-core/src/tasks/platform/taskPlatformSetup.ts @@ -1,14 +1,6 @@ -import { - TASK_PLATFORM_SETUP, - TASK_PROJECT_CONFIGURE, - PARAMS, - updateProjectPlatforms, - logTask, - executeTask, - RnvTaskFn, - inquirerPrompt, - RnvTask, -} from '@rnv/core'; +import { PARAMS, updateProjectPlatforms, logTask, executeTask, RnvTaskFn, inquirerPrompt, RnvTask } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLATFORM_SETUP } from './constants'; export const taskRnvPlatformSetup: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPlatformSetup'); diff --git a/packages/engine-core/src/tasks/plugin/constants.ts b/packages/engine-core/src/tasks/plugin/constants.ts new file mode 100644 index 0000000000..4985e2be73 --- /dev/null +++ b/packages/engine-core/src/tasks/plugin/constants.ts @@ -0,0 +1,3 @@ +export const TASK_PLUGIN_ADD = 'plugin add'; +export const TASK_PLUGIN_LIST = 'plugin list'; +export const TASK_PLUGIN_UPDATE = 'plugin update'; diff --git a/packages/engine-core/src/tasks/task.rnv.plugin.add.ts b/packages/engine-core/src/tasks/plugin/taskPluginAdd.ts similarity index 94% rename from packages/engine-core/src/tasks/task.rnv.plugin.add.ts rename to packages/engine-core/src/tasks/plugin/taskPluginAdd.ts index 92cafe9aad..0d6d643c08 100644 --- a/packages/engine-core/src/tasks/task.rnv.plugin.add.ts +++ b/packages/engine-core/src/tasks/plugin/taskPluginAdd.ts @@ -1,8 +1,5 @@ import { writeRenativeConfigFile, - TASK_INSTALL, - TASK_PLUGIN_ADD, - TASK_PROJECT_CONFIGURE, PARAMS, chalk, logSuccess, @@ -16,7 +13,10 @@ import { RenativeConfigPlugin, RnvTask, } from '@rnv/core'; -import { getPluginList } from '../plugins'; +import { getPluginList } from '../../plugins'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLUGIN_ADD } from './constants'; +import { TASK_INSTALL } from '../global/constants'; /* eslint-disable no-await-in-loop */ export const taskRnvPluginAdd: RnvTaskFn = async (c, _parentTask, originTask) => { diff --git a/packages/engine-core/src/tasks/task.rnv.plugin.list.ts b/packages/engine-core/src/tasks/plugin/taskPluginList.ts similarity index 93% rename from packages/engine-core/src/tasks/task.rnv.plugin.list.ts rename to packages/engine-core/src/tasks/plugin/taskPluginList.ts index 3845ec2acb..b3099937d8 100644 --- a/packages/engine-core/src/tasks/task.rnv.plugin.list.ts +++ b/packages/engine-core/src/tasks/plugin/taskPluginList.ts @@ -8,7 +8,7 @@ import { RnvTaskFn, RnvTask, } from '@rnv/core'; -import { getPluginList } from '../plugins'; +import { getPluginList } from '../../plugins'; export const taskRnvPluginList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPluginList'); diff --git a/packages/engine-core/src/tasks/task.rnv.plugin.update.ts b/packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.plugin.update.ts rename to packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts diff --git a/packages/engine-core/src/tasks/project/constants.ts b/packages/engine-core/src/tasks/project/constants.ts new file mode 100644 index 0000000000..f64ad004f5 --- /dev/null +++ b/packages/engine-core/src/tasks/project/constants.ts @@ -0,0 +1,2 @@ +export const TASK_PROJECT_CONFIGURE = 'project configure'; +export const TASK_PROJECT_UPGRADE = 'project upgrade'; diff --git a/packages/engine-core/src/tasks/task.rnv.project.configure.ts b/packages/engine-core/src/tasks/project/taskProjectConfigure.ts similarity index 92% rename from packages/engine-core/src/tasks/task.rnv.project.configure.ts rename to packages/engine-core/src/tasks/project/taskProjectConfigure.ts index 8c7940326d..91515ad4d9 100644 --- a/packages/engine-core/src/tasks/task.rnv.project.configure.ts +++ b/packages/engine-core/src/tasks/project/taskProjectConfigure.ts @@ -15,11 +15,6 @@ import { fsExistsSync, fsMkdirSync, checkAndMigrateProject, - TASK_INSTALL, - TASK_PROJECT_CONFIGURE, - TASK_TEMPLATE_APPLY, - TASK_APP_CONFIGURE, - TASK_WORKSPACE_CONFIGURE, PARAMS, copyRuntimeAssets, cleanPlaformAssets, @@ -33,11 +28,16 @@ import { RnvTaskFn, RnvContext, generatePlatformAssetsRuntimeConfig, - TASK_CRYPTO_DECRYPT, RnvTask, generateLocalJsonSchemas, } from '@rnv/core'; -import { checkCrypto } from './crypto/common'; +import { checkCrypto } from '../crypto/common'; +import { TASK_WORKSPACE_CONFIGURE } from '../workspace/constants'; +import { TASK_APP_CONFIGURE } from '../app/constants'; +import { TASK_PROJECT_CONFIGURE } from './constants'; +import { TASK_INSTALL } from '../global/constants'; +import { TASK_CRYPTO_DECRYPT } from '../crypto/constants'; +import { TASK_TEMPLATE_APPLY } from '../template/constants'; const checkIsRenativeProject = async (c: RnvContext) => { if (!c.paths.project.configExists) { diff --git a/packages/engine-core/src/tasks/task.rnv.project.upgrade.ts b/packages/engine-core/src/tasks/project/taskProjectUpgrade.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.project.upgrade.ts rename to packages/engine-core/src/tasks/project/taskProjectUpgrade.ts diff --git a/packages/engine-core/src/tasks/target/constants.ts b/packages/engine-core/src/tasks/target/constants.ts new file mode 100644 index 0000000000..6b3a97f9e7 --- /dev/null +++ b/packages/engine-core/src/tasks/target/constants.ts @@ -0,0 +1,3 @@ +export const TASK_TARGET_LAUNCH = 'target launch'; +export const TASK_TARGET_LIST = 'target list'; +export const TASK_TARGET = 'target'; diff --git a/packages/engine-core/src/tasks/task.rnv.target.launch.ts b/packages/engine-core/src/tasks/target/taskTargetLaunch.ts similarity index 93% rename from packages/engine-core/src/tasks/task.rnv.target.launch.ts rename to packages/engine-core/src/tasks/target/taskTargetLaunch.ts index cc60cb267d..a0d5159c23 100644 --- a/packages/engine-core/src/tasks/task.rnv.target.launch.ts +++ b/packages/engine-core/src/tasks/target/taskTargetLaunch.ts @@ -2,21 +2,21 @@ import { isPlatformSupported, chalk, logTask, - TASK_WORKSPACE_CONFIGURE, - TASK_TARGET_LAUNCH, PARAMS, executeTask, RnvTaskFn, inquirerPrompt, RnvTask, } from '@rnv/core'; -import { checkAndConfigureSdks, checkSdk } from '../common'; +import { checkAndConfigureSdks, checkSdk } from '../../common'; import { launchAndroidSimulator } from '@rnv/sdk-android'; import { launchAppleSimulator } from '@rnv/sdk-apple'; import { launchTizenSimulator } from '@rnv/sdk-tizen'; import { launchWebOSimulator } from '@rnv/sdk-webos'; import { launchKaiOSSimulator } from '@rnv/sdk-kaios'; +import { TASK_TARGET_LAUNCH } from './constants'; +import { TASK_WORKSPACE_CONFIGURE } from '../workspace/constants'; export const taskRnvTargetLaunch: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvTargetLaunch'); diff --git a/packages/engine-core/src/tasks/task.rnv.target.list.ts b/packages/engine-core/src/tasks/target/taskTargetList.ts similarity index 81% rename from packages/engine-core/src/tasks/task.rnv.target.list.ts rename to packages/engine-core/src/tasks/target/taskTargetList.ts index 183335882f..e9fb4b2e7c 100644 --- a/packages/engine-core/src/tasks/task.rnv.target.list.ts +++ b/packages/engine-core/src/tasks/target/taskTargetList.ts @@ -1,28 +1,19 @@ -import { - isPlatformSupported, - chalk, - logTask, - TASK_WORKSPACE_CONFIGURE, - TASK_TARGET_LAUNCH, - PARAMS, - executeTask, - RnvTaskFn, - RnvTask, - TASK_TARGET_LIST, -} from '@rnv/core'; +import { isPlatformSupported, chalk, logTask, PARAMS, executeTask, RnvTaskFn, RnvTask } from '@rnv/core'; import { listAndroidTargets } from '@rnv/sdk-android'; import { listAppleDevices } from '@rnv/sdk-apple'; import { listTizenTargets } from '@rnv/sdk-tizen'; import { listWebOSTargets } from '@rnv/sdk-webos'; -import { checkAndConfigureSdks, checkSdk } from '../common'; +import { checkAndConfigureSdks, checkSdk } from '../../common'; +import { TASK_TARGET_LIST } from './constants'; +import { TASK_WORKSPACE_CONFIGURE } from '../workspace/constants'; export const taskRnvTargetList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvTargetList'); await isPlatformSupported(c, true); await checkAndConfigureSdks(c); - await executeTask(c, TASK_WORKSPACE_CONFIGURE, TASK_TARGET_LAUNCH, originTask); + await executeTask(c, TASK_WORKSPACE_CONFIGURE, TASK_TARGET_LIST, originTask); const { platform } = c; diff --git a/packages/engine-core/src/tasks/telemetry/constants.ts b/packages/engine-core/src/tasks/telemetry/constants.ts new file mode 100644 index 0000000000..c9f4beb6a7 --- /dev/null +++ b/packages/engine-core/src/tasks/telemetry/constants.ts @@ -0,0 +1,3 @@ +export const TASK_TELEMETRY_DISABLE = 'telemetry disable'; +export const TASK_TELEMETRY_ENABLE = 'telemetry enable'; +export const TASK_TELEMETRY_STATUS = 'telemetry status'; diff --git a/packages/engine-core/src/tasks/task.rnv.telemetry.disable.ts b/packages/engine-core/src/tasks/telemetry/taskTelemetryDisable.ts similarity index 82% rename from packages/engine-core/src/tasks/task.rnv.telemetry.disable.ts rename to packages/engine-core/src/tasks/telemetry/taskTelemetryDisable.ts index a672b93023..ed03ad46b4 100644 --- a/packages/engine-core/src/tasks/task.rnv.telemetry.disable.ts +++ b/packages/engine-core/src/tasks/telemetry/taskTelemetryDisable.ts @@ -1,13 +1,5 @@ -import { - chalk, - logTask, - logToSummary, - PARAMS, - RnvTask, - RnvTaskFn, - TASK_TELEMETRY_DISABLE, - writeFileSync, -} from '@rnv/core'; +import { chalk, logTask, logToSummary, PARAMS, RnvTask, RnvTaskFn, writeFileSync } from '@rnv/core'; +import { TASK_TELEMETRY_DISABLE } from './constants'; export const taskRnvTelemetryDisable: RnvTaskFn = async (c) => { logTask('taskRnvTelemetryDisable'); diff --git a/packages/engine-core/src/tasks/task.rnv.telemetry.enable.ts b/packages/engine-core/src/tasks/telemetry/taskTelemetryEnable.ts similarity index 83% rename from packages/engine-core/src/tasks/task.rnv.telemetry.enable.ts rename to packages/engine-core/src/tasks/telemetry/taskTelemetryEnable.ts index 32e9b49599..8de142395f 100644 --- a/packages/engine-core/src/tasks/task.rnv.telemetry.enable.ts +++ b/packages/engine-core/src/tasks/telemetry/taskTelemetryEnable.ts @@ -1,13 +1,5 @@ -import { - chalk, - logTask, - logToSummary, - PARAMS, - RnvTask, - RnvTaskFn, - TASK_TELEMETRY_ENABLE, - writeFileSync, -} from '@rnv/core'; +import { chalk, logTask, logToSummary, PARAMS, RnvTask, RnvTaskFn, writeFileSync } from '@rnv/core'; +import { TASK_TELEMETRY_ENABLE } from './constants'; export const taskRnvTelemetryEnable: RnvTaskFn = async (c) => { logTask('taskRnvTelemetryEnable'); diff --git a/packages/engine-core/src/tasks/task.rnv.telemetry.status.ts b/packages/engine-core/src/tasks/telemetry/taskTelemetryStatus.ts similarity index 93% rename from packages/engine-core/src/tasks/task.rnv.telemetry.status.ts rename to packages/engine-core/src/tasks/telemetry/taskTelemetryStatus.ts index 77690eec04..7a4a516221 100644 --- a/packages/engine-core/src/tasks/task.rnv.telemetry.status.ts +++ b/packages/engine-core/src/tasks/telemetry/taskTelemetryStatus.ts @@ -1,4 +1,5 @@ -import { chalk, logTask, logToSummary, PARAMS, RnvTask, RnvTaskFn, TASK_TELEMETRY_STATUS } from '@rnv/core'; +import { chalk, logTask, logToSummary, PARAMS, RnvTask, RnvTaskFn } from '@rnv/core'; +import { TASK_TELEMETRY_STATUS } from './constants'; export const taskRnvTelemetryStatus: RnvTaskFn = async (c) => { logTask('taskRnvTelemetryStatus'); diff --git a/packages/engine-core/src/tasks/template/constants.ts b/packages/engine-core/src/tasks/template/constants.ts new file mode 100644 index 0000000000..e326602825 --- /dev/null +++ b/packages/engine-core/src/tasks/template/constants.ts @@ -0,0 +1,3 @@ +export const TASK_TEMPLATE_ADD = 'template add'; +export const TASK_TEMPLATE_LIST = 'template list'; +export const TASK_TEMPLATE_APPLY = 'template apply'; diff --git a/packages/engine-core/src/tasks/task.rnv.template.add.ts b/packages/engine-core/src/tasks/template/taskTemplateAdd.ts similarity index 92% rename from packages/engine-core/src/tasks/task.rnv.template.add.ts rename to packages/engine-core/src/tasks/template/taskTemplateAdd.ts index 3e6d72491f..6f28ed7a84 100644 --- a/packages/engine-core/src/tasks/task.rnv.template.add.ts +++ b/packages/engine-core/src/tasks/template/taskTemplateAdd.ts @@ -3,8 +3,6 @@ import { logTask, generateBuildConfig, executeTask, - TASK_PROJECT_CONFIGURE, - TASK_TEMPLATE_ADD, PARAMS, getTemplateOptions, RnvContext, @@ -12,6 +10,8 @@ import { inquirerPrompt, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_TEMPLATE_ADD } from './constants'; const _writeObjectSync = (c: RnvContext, p: string, s: object) => { writeFileSync(p, s); diff --git a/packages/engine-core/src/tasks/task.rnv.template.apply.ts b/packages/engine-core/src/tasks/template/taskTemplateApply.ts similarity index 89% rename from packages/engine-core/src/tasks/task.rnv.template.apply.ts rename to packages/engine-core/src/tasks/template/taskTemplateApply.ts index be6ec4cd6d..dfabdf272b 100644 --- a/packages/engine-core/src/tasks/task.rnv.template.apply.ts +++ b/packages/engine-core/src/tasks/template/taskTemplateApply.ts @@ -3,13 +3,14 @@ import { applyTemplate, getInstalledTemplateOptions, executeTask, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, inquirerPrompt, RnvTask, } from '@rnv/core'; -import { TASK_APP_CONFIGURE, TASK_TEMPLATE_APPLY } from '../constants'; +import { TASK_TEMPLATE_APPLY } from './constants'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_APP_CONFIGURE } from '../app/constants'; export const taskRnvTemplateApply: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvTemplateApply', `template: ${c.program.template}`); diff --git a/packages/engine-core/src/tasks/task.rnv.template.list.ts b/packages/engine-core/src/tasks/template/taskTemplateList.ts similarity index 73% rename from packages/engine-core/src/tasks/task.rnv.template.list.ts rename to packages/engine-core/src/tasks/template/taskTemplateList.ts index bcbcb73a5e..e0bd7d13a7 100644 --- a/packages/engine-core/src/tasks/task.rnv.template.list.ts +++ b/packages/engine-core/src/tasks/template/taskTemplateList.ts @@ -1,14 +1,6 @@ -import { - logToSummary, - logTask, - getTemplateOptions, - executeTask, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; -import { TASK_TEMPLATE_LIST } from '../constants'; +import { logToSummary, logTask, getTemplateOptions, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_TEMPLATE_LIST } from './constants'; export const taskRnvTemplateList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvTemplateList'); diff --git a/packages/engine-core/src/tasks/workspace/constants.ts b/packages/engine-core/src/tasks/workspace/constants.ts new file mode 100644 index 0000000000..081e028c6d --- /dev/null +++ b/packages/engine-core/src/tasks/workspace/constants.ts @@ -0,0 +1,5 @@ +export const TASK_WORKSPACE_ADD = 'workspace add'; +export const TASK_WORKSPACE_CONNECT = 'workspace connect'; +export const TASK_WORKSPACE_LIST = 'workspace list'; +export const TASK_WORKSPACE_UPDATE = 'workspace update'; +export const TASK_WORKSPACE_CONFIGURE = 'workspace configure'; diff --git a/packages/engine-core/src/tasks/task.rnv.workspace.add.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceAdd.ts similarity index 93% rename from packages/engine-core/src/tasks/task.rnv.workspace.add.ts rename to packages/engine-core/src/tasks/workspace/taskWorkspaceAdd.ts index dcff7ea90b..c92c04c449 100644 --- a/packages/engine-core/src/tasks/task.rnv.workspace.add.ts +++ b/packages/engine-core/src/tasks/workspace/taskWorkspaceAdd.ts @@ -5,12 +5,12 @@ import { createWorkspace, fsExistsSync, executeTask, - TASK_WORKSPACE_ADD, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_WORKSPACE_ADD } from './constants'; export const taskRnvWorkspaceAdd: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvWorkspaceAdd'); diff --git a/packages/engine-core/src/tasks/task.rnv.workspace.configure.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts similarity index 100% rename from packages/engine-core/src/tasks/task.rnv.workspace.configure.ts rename to packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts diff --git a/packages/engine-core/src/tasks/task.rnv.workspace.connect.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceConnect.ts similarity index 90% rename from packages/engine-core/src/tasks/task.rnv.workspace.connect.ts rename to packages/engine-core/src/tasks/workspace/taskWorkspaceConnect.ts index 3433d0ab17..7cfb919075 100644 --- a/packages/engine-core/src/tasks/task.rnv.workspace.connect.ts +++ b/packages/engine-core/src/tasks/workspace/taskWorkspaceConnect.ts @@ -4,12 +4,12 @@ import { logRaw, getWorkspaceConnectionString, executeTask, - TASK_WORKSPACE_CONNECT, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_WORKSPACE_CONNECT } from './constants'; export const taskRnvWorkspaceConnect: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvWorkspaceConnect'); diff --git a/packages/engine-core/src/tasks/task.rnv.workspace.list.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceList.ts similarity index 78% rename from packages/engine-core/src/tasks/task.rnv.workspace.list.ts rename to packages/engine-core/src/tasks/workspace/taskWorkspaceList.ts index 9b1608284f..ca48aee184 100644 --- a/packages/engine-core/src/tasks/task.rnv.workspace.list.ts +++ b/packages/engine-core/src/tasks/workspace/taskWorkspaceList.ts @@ -1,15 +1,6 @@ -import { - generateOptions, - chalk, - logTask, - logToSummary, - executeTask, - TASK_WORKSPACE_LIST, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; +import { generateOptions, chalk, logTask, logToSummary, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_WORKSPACE_LIST } from './constants'; export const taskRnvWorkspaceList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvWorkspaceList'); diff --git a/packages/engine-core/src/tasks/task.rnv.workspace.update.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceUpdate.ts similarity index 72% rename from packages/engine-core/src/tasks/task.rnv.workspace.update.ts rename to packages/engine-core/src/tasks/workspace/taskWorkspaceUpdate.ts index 485fac873d..9f9b4b6b00 100644 --- a/packages/engine-core/src/tasks/task.rnv.workspace.update.ts +++ b/packages/engine-core/src/tasks/workspace/taskWorkspaceUpdate.ts @@ -1,12 +1,6 @@ -import { - logTask, - executeTask, - TASK_WORKSPACE_UPDATE, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; +import { logTask, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_WORKSPACE_UPDATE } from './constants'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; export const taskRnvWorkspaceUpdate: RnvTaskFn = async (c, _parentTask, originTask) => { // TODO: taskRnvWorkspaceUpdate From 4160fb7401716ce74d94f8e07f877858c3d28340 Mon Sep 17 00:00:00 2001 From: Pavel Jacko Date: Tue, 27 Feb 2024 03:08:59 +0100 Subject: [PATCH 04/46] core engine tasks migration --- packages/core/src/tasks/index.ts | 28 ++++++++++++- packages/engine-core/src/index.ts | 40 +++++++++---------- .../engine-core/src/tasks/global/taskClean.ts | 2 +- .../src/tasks/global/taskConfig.ts | 3 +- .../src/tasks/global/taskConfigureSoft.ts | 4 +- .../src/tasks/global/taskDoctor.ts | 4 +- .../engine-core/src/tasks/global/taskHelp.ts | 3 +- .../src/tasks/global/taskInstall.ts | 2 +- .../engine-core/src/tasks/global/taskKill.ts | 4 +- .../engine-core/src/tasks/global/taskNew.ts | 2 +- .../src/tasks/global/taskStatus.ts | 3 +- .../src/tasks/hooks/taskHooksList.ts | 15 ++----- .../src/tasks/plugin/taskPluginList.ts | 13 ++---- .../src/tasks/plugin/taskPluginUpdate.ts | 4 +- .../src/tasks/project/taskProjectUpgrade.ts | 3 +- .../tasks/workspace/taskWorkspaceConfigure.ts | 2 +- 16 files changed, 71 insertions(+), 61 deletions(-) diff --git a/packages/core/src/tasks/index.ts b/packages/core/src/tasks/index.ts index 9bad24c63d..cd261913e0 100644 --- a/packages/core/src/tasks/index.ts +++ b/packages/core/src/tasks/index.ts @@ -15,7 +15,8 @@ import { inquirerPrompt, inquirerSeparator, pressAnyKeyToContinue } from '../api import { getApi } from '../api/provider'; import type { PlatformKey, RenativeConfigTaskKey } from '../schema/types'; import { checkIfProjectAndNodeModulesExists } from '../projects/dependencyManager'; -import { DEFAULT_TASK_DESCRIPTIONS, TASK_CONFIGURE_SOFT } from './constants'; +import { DEFAULT_TASK_DESCRIPTIONS } from './constants'; +import { getContext } from '../context/provider'; let executedTasks: Record = {}; @@ -405,12 +406,35 @@ To avoid that test your task code against parentTask and avoid executing same ta logExitTask(`${prt}<= ${task}`); }; +/** + * @deprecated Use executeDependantTask instead + */ export const executeOrSkipTask = async (c: RnvContext, task: string, parentTask: string, originTask?: string) => { if (!c.program.only) { return executeTask(c, task, parentTask, originTask); } + return executeTask(c, 'configureSoft', parentTask, originTask); +}; - return executeTask(c, TASK_CONFIGURE_SOFT, parentTask, originTask); +export const executeDependantTask = async ({ + task, + parentTask, + originTask, + alternativeTask, +}: { + task: string; + parentTask: string; + originTask?: string; + alternativeTask?: string; +}) => { + const ctx = getContext(); + if (!ctx.program.only) { + return executeTask(ctx, task, parentTask, originTask); + } + if (alternativeTask) { + return executeTask(ctx, alternativeTask, parentTask, originTask); + } + return true; }; const ACCEPTED_CONDITIONS = ['platform', 'target', 'appId', 'scheme'] as const; diff --git a/packages/engine-core/src/index.ts b/packages/engine-core/src/index.ts index 0847efc3a7..b7d8caf8db 100644 --- a/packages/engine-core/src/index.ts +++ b/packages/engine-core/src/index.ts @@ -2,17 +2,17 @@ import { RnvEngine, generateEngineTasks } from '@rnv/core'; import taskRnvCryptoDecrypt from './tasks/crypto/taskCryptoDecrypt'; import taskRnvCryptoEncrypt from './tasks/crypto/taskCryptoEncrypt'; -import taskRnvPlatformEject from './tasks/platform/task.rnv.platform.eject'; -import taskRnvPlatformConnect from './tasks/platform/task.rnv.platform.connect'; -import taskRnvPlatformList from './tasks/platform/task.rnv.platform.list'; -import taskRnvPlatformConfigure from './tasks/platform/task.rnv.platform.configure'; -import taskRnvPlatformSetup from './tasks/platform/task.rnv.platform.setup'; -import taskRnvTemplateAdd from './tasks/template/task.rnv.template.add'; -import taskRnvTemplateApply from './tasks/template/task.rnv.template.apply'; -import taskRnvTemplateList from './tasks/template/task.rnv.template.list'; -import taskRnvPluginAdd from './tasks/plugin/task.rnv.plugin.add'; -import taskRnvPluginList from './tasks/plugin/task.rnv.plugin.list'; -import taskRnvPluginUpdate from './tasks/plugin/task.rnv.plugin.update'; +import taskRnvPlatformEject from './tasks/platform/taskPlatformEject'; +import taskRnvPlatformConnect from './tasks/platform/taskPlatformConnect'; +import taskRnvPlatformList from './tasks/platform/taskPlatformList'; +import taskRnvPlatformConfigure from './tasks/platform/taskPlatformConfigure'; +import taskRnvPlatformSetup from './tasks/platform/taskPlatformSetup'; +import taskRnvTemplateAdd from './tasks/template/taskTemplateAdd'; +import taskRnvTemplateApply from './tasks/template/taskTemplateApply'; +import taskRnvTemplateList from './tasks/template/taskTemplateList'; +import taskRnvPluginAdd from './tasks/plugin/taskPluginAdd'; +import taskRnvPluginList from './tasks/plugin/taskPluginList'; +import taskRnvPluginUpdate from './tasks/plugin/taskPluginUpdate'; import taskRnvWorkspaceList from './tasks/workspace/taskWorkspaceList'; import taskRnvWorkspaceAdd from './tasks/workspace/taskWorkspaceAdd'; import taskRnvWorkspaceConnect from './tasks/workspace/taskWorkspaceConnect'; @@ -20,20 +20,20 @@ import taskRnvWorkspaceUpdate from './tasks/workspace/taskWorkspaceUpdate'; import taskRnvHooksList from './tasks/hooks/taskHooksList'; import taskRnvHooksRun from './tasks/hooks/taskHooksRun'; import taskRnvHooksPipes from './tasks/hooks/taskHooksPipes'; -import taskRnvClean from './tasks/global/task.rnv.clean'; -import taskRnvStatus from './tasks/global/task.rnv.status'; -import taskRnvConfig from './tasks/global/task.rnv.config'; -import taskRnvHelp from './tasks/global/task.rnv.help'; -import taskRnvNew from './tasks/global/task.rnv.new'; -import taskRnvInstall from './tasks/global/task.rnv.install'; +import taskRnvClean from './tasks/global/taskClean'; +import taskRnvStatus from './tasks/global/taskStatus'; +import taskRnvConfig from './tasks/global/taskConfig'; +import taskRnvHelp from './tasks/global/taskHelp'; +import taskRnvNew from './tasks/global/taskNew'; +import taskRnvInstall from './tasks/global/taskInstall'; import taskRnvProjectConfigure from './tasks/project/taskProjectConfigure'; import taskRnvProjectUpgrade from './tasks/project/taskProjectUpgrade'; import taskRnvAppConfigure from './tasks/app/taskAppConfigure'; import taskRnvAppCreate from './tasks/app/taskAppCreate'; import taskRnvWorkspaceConfigure from './tasks/workspace/taskWorkspaceConfigure'; -import taskRnvConfigureSoft from './tasks/global/task.rnv.configureSoft'; -import taskRvnKill from './tasks/global/task.rnv.kill'; -import taskRvnDoctor from './tasks/global/task.rnv.doctor'; +import taskRnvConfigureSoft from './tasks/global/taskConfigureSoft'; +import taskRvnKill from './tasks/global/taskKill'; +import taskRvnDoctor from './tasks/global/taskDoctor'; import taskRnvTargetList from './tasks/target/taskTargetList'; import taskRnvTargetLaunch from './tasks/target/taskTargetLaunch'; import taskRnvLink from './tasks/linking/taskLink'; diff --git a/packages/engine-core/src/tasks/global/taskClean.ts b/packages/engine-core/src/tasks/global/taskClean.ts index 255dff46cd..3c6e92e5b0 100644 --- a/packages/engine-core/src/tasks/global/taskClean.ts +++ b/packages/engine-core/src/tasks/global/taskClean.ts @@ -14,8 +14,8 @@ import { RnvTaskFn, inquirerPrompt, RnvTask, - TASK_CLEAN, } from '@rnv/core'; +import { TASK_CLEAN } from './constants'; function clearWindowsCacheFiles() { const opts = { diff --git a/packages/engine-core/src/tasks/global/taskConfig.ts b/packages/engine-core/src/tasks/global/taskConfig.ts index ac976ffdb8..d2966e85a9 100644 --- a/packages/engine-core/src/tasks/global/taskConfig.ts +++ b/packages/engine-core/src/tasks/global/taskConfig.ts @@ -1,4 +1,5 @@ -import { logTask, PARAMS, RnvTaskFn, executeTask, TASK_CONFIGURE_SOFT, SUPPORTED_PLATFORMS, RnvTask } from '@rnv/core'; +import { logTask, PARAMS, RnvTaskFn, executeTask, SUPPORTED_PLATFORMS, RnvTask } from '@rnv/core'; +import { TASK_CONFIGURE_SOFT } from './constants'; const TASK_CONFIG = 'config'; diff --git a/packages/engine-core/src/tasks/global/taskConfigureSoft.ts b/packages/engine-core/src/tasks/global/taskConfigureSoft.ts index 4a1e1e6754..075d04f447 100644 --- a/packages/engine-core/src/tasks/global/taskConfigureSoft.ts +++ b/packages/engine-core/src/tasks/global/taskConfigureSoft.ts @@ -1,7 +1,5 @@ import { RnvTaskFn, - TASK_APP_CONFIGURE, - TASK_CONFIGURE_SOFT, PARAMS, executeTask, configureRuntimeDefaults, @@ -11,6 +9,8 @@ import { } from '@rnv/core'; import { checkAndConfigureSdks, checkSdk } from '../../common'; import { isBuildSchemeSupported } from '../../buildSchemes'; +import { TASK_APP_CONFIGURE } from '../app/constants'; +import { TASK_CONFIGURE_SOFT } from './constants'; export const taskRnvConfigureSoft: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvConfigureSoft'); diff --git a/packages/engine-core/src/tasks/global/taskDoctor.ts b/packages/engine-core/src/tasks/global/taskDoctor.ts index 2a6a64dcda..633877bfd4 100644 --- a/packages/engine-core/src/tasks/global/taskDoctor.ts +++ b/packages/engine-core/src/tasks/global/taskDoctor.ts @@ -4,8 +4,6 @@ import { logTask, logToSummary, PARAMS, - TASK_DOCTOR, - TASK_APP_CONFIGURE, executeTask, configureRuntimeDefaults, readObjectSync, @@ -14,6 +12,8 @@ import { validateRenativeProjectSchema, RnvTask, } from '@rnv/core'; +import { TASK_APP_CONFIGURE } from '../app/constants'; +import { TASK_DOCTOR } from './constants'; const configTargets = [ 'workspace.config', diff --git a/packages/engine-core/src/tasks/global/taskHelp.ts b/packages/engine-core/src/tasks/global/taskHelp.ts index 0a01cbe20f..fabc5fb926 100644 --- a/packages/engine-core/src/tasks/global/taskHelp.ts +++ b/packages/engine-core/src/tasks/global/taskHelp.ts @@ -1,4 +1,5 @@ -import { chalk, logToSummary, logTask, PARAMS, getRegisteredEngines, RnvTaskFn, RnvTask, TASK_HELP } from '@rnv/core'; +import { chalk, logToSummary, logTask, PARAMS, getRegisteredEngines, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_HELP } from './constants'; export const taskRnvHelp: RnvTaskFn = async (c) => { logTask('taskRnvHelp'); diff --git a/packages/engine-core/src/tasks/global/taskInstall.ts b/packages/engine-core/src/tasks/global/taskInstall.ts index b370d64e05..e925faf35f 100644 --- a/packages/engine-core/src/tasks/global/taskInstall.ts +++ b/packages/engine-core/src/tasks/global/taskInstall.ts @@ -6,8 +6,8 @@ import { logInfo, RnvTaskFn, RnvTask, - TASK_INSTALL, } from '@rnv/core'; +import { TASK_INSTALL } from './constants'; export const taskRnvInstall: RnvTaskFn = async (c, parentTask, _) => { logTask('taskRnvInstall', `requiresInstall:${!!c._requiresNpmInstall}:${!c.runtime.skipPackageUpdate}`); diff --git a/packages/engine-core/src/tasks/global/taskKill.ts b/packages/engine-core/src/tasks/global/taskKill.ts index a010f98347..40c0637b30 100644 --- a/packages/engine-core/src/tasks/global/taskKill.ts +++ b/packages/engine-core/src/tasks/global/taskKill.ts @@ -4,8 +4,6 @@ import { RnvContext, RnvTask, RnvTaskFn, - TASK_APP_CONFIGURE, - TASK_KILL, chalk, configureRuntimeDefaults, executeTask, @@ -15,6 +13,8 @@ import { } from '@rnv/core'; import { checkPortInUse } from '@rnv/sdk-utils'; import killPort from 'kill-port'; +import { TASK_APP_CONFIGURE } from '../app/constants'; +import { TASK_KILL } from './constants'; export const taskRnvKill: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvKill'); diff --git a/packages/engine-core/src/tasks/global/taskNew.ts b/packages/engine-core/src/tasks/global/taskNew.ts index 5404e99464..a6fbde74f7 100644 --- a/packages/engine-core/src/tasks/global/taskNew.ts +++ b/packages/engine-core/src/tasks/global/taskNew.ts @@ -36,10 +36,10 @@ import { commandExistsSync, PromptParams, RnvTask, - TASK_NEW, ConfigFileProject, ConfigFileTemplate, } from '@rnv/core'; +import { TASK_NEW } from './constants'; type NewProjectData = { appTitle?: string; diff --git a/packages/engine-core/src/tasks/global/taskStatus.ts b/packages/engine-core/src/tasks/global/taskStatus.ts index 88c2bf4799..5b2ff8adf3 100644 --- a/packages/engine-core/src/tasks/global/taskStatus.ts +++ b/packages/engine-core/src/tasks/global/taskStatus.ts @@ -1,4 +1,5 @@ -import { PARAMS, RnvTask, TASK_STATUS } from '@rnv/core'; +import { PARAMS, RnvTask } from '@rnv/core'; +import { TASK_STATUS } from './constants'; export const taskRnvStatus = async () => Promise.resolve(); diff --git a/packages/engine-core/src/tasks/hooks/taskHooksList.ts b/packages/engine-core/src/tasks/hooks/taskHooksList.ts index 663ccb59fd..33fcfbc653 100644 --- a/packages/engine-core/src/tasks/hooks/taskHooksList.ts +++ b/packages/engine-core/src/tasks/hooks/taskHooksList.ts @@ -1,15 +1,6 @@ -import { - logToSummary, - logTask, - generateOptions, - buildHooks, - executeTask, - TASK_HOOKS_LIST, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; +import { logToSummary, logTask, generateOptions, buildHooks, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_HOOKS_LIST } from './constants'; export const taskRnvHooksList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvHooksList'); diff --git a/packages/engine-core/src/tasks/plugin/taskPluginList.ts b/packages/engine-core/src/tasks/plugin/taskPluginList.ts index b3099937d8..dae98d8946 100644 --- a/packages/engine-core/src/tasks/plugin/taskPluginList.ts +++ b/packages/engine-core/src/tasks/plugin/taskPluginList.ts @@ -1,14 +1,7 @@ -import { - logTask, - logToSummary, - executeTask, - TASK_PLUGIN_LIST, - TASK_PROJECT_CONFIGURE, - PARAMS, - RnvTaskFn, - RnvTask, -} from '@rnv/core'; +import { logTask, logToSummary, executeTask, PARAMS, RnvTaskFn, RnvTask } from '@rnv/core'; import { getPluginList } from '../../plugins'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLUGIN_LIST } from './constants'; export const taskRnvPluginList: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPluginList'); diff --git a/packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts b/packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts index bdec8b88b4..f823337c9f 100644 --- a/packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts +++ b/packages/engine-core/src/tasks/plugin/taskPluginUpdate.ts @@ -4,13 +4,13 @@ import { logTask, logWarning, executeTask, - TASK_PLUGIN_UPDATE, - TASK_PROJECT_CONFIGURE, PARAMS, RnvTaskFn, inquirerPrompt, RnvTask, } from '@rnv/core'; +import { TASK_PROJECT_CONFIGURE } from '../project/constants'; +import { TASK_PLUGIN_UPDATE } from './constants'; export const taskRnvPluginUpdate: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvPluginUpdate'); diff --git a/packages/engine-core/src/tasks/project/taskProjectUpgrade.ts b/packages/engine-core/src/tasks/project/taskProjectUpgrade.ts index a6b506be87..5a922759f0 100644 --- a/packages/engine-core/src/tasks/project/taskProjectUpgrade.ts +++ b/packages/engine-core/src/tasks/project/taskProjectUpgrade.ts @@ -1,8 +1,6 @@ import path from 'path'; import fs from 'fs'; import { - TASK_PROJECT_UPGRADE, - TASK_PROJECT_CONFIGURE, PARAMS, logTask, logInfo, @@ -19,6 +17,7 @@ import { } from '@rnv/core'; import { NpmPackageFile } from '@rnv/core/lib/configs/types'; import { ConfigFileProject } from '@rnv/core/lib/schema/configFiles/types'; +import { TASK_PROJECT_CONFIGURE, TASK_PROJECT_UPGRADE } from './constants'; export const taskRnvProjectUpgrade: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvProjectUpgrade'); diff --git a/packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts b/packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts index 68fdf884f1..3974e984b9 100644 --- a/packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts +++ b/packages/engine-core/src/tasks/workspace/taskWorkspaceConfigure.ts @@ -14,8 +14,8 @@ import { logInfo, RnvTaskFn, RnvTask, - TASK_WORKSPACE_CONFIGURE, } from '@rnv/core'; +import { TASK_WORKSPACE_CONFIGURE } from './constants'; export const taskRnvWorkspaceConfigure: RnvTaskFn = async (c) => { logTask('taskRnvWorkspaceConfigure'); From e67df6b2b7c681dcfd639b1a99dda4100dd32bce Mon Sep 17 00:00:00 2001 From: Pavel Jacko Date: Tue, 27 Feb 2024 11:10:20 +0100 Subject: [PATCH 05/46] update imports --- packages/engine-core/src/tasks/global/constants.ts | 9 --------- packages/engine-rn/src/tasks/constants.ts | 10 ++++++++++ packages/engine-rn/src/tasks/task.rnv.configure.ts | 2 +- .../src/tasks/task.rnv.crypto.installCerts.ts | 3 +-- .../src/tasks/task.rnv.crypto.installProfiles.ts | 3 +-- .../src/tasks/task.rnv.crypto.updateProfile.ts | 12 ++---------- .../src/tasks/task.rnv.crypto.updateProfiles.ts | 3 +-- packages/engine-rn/src/tasks/task.rnv.eject.ts | 2 +- packages/engine-rn/src/tasks/task.rnv.log.ts | 13 ++----------- packages/engine-rn/src/tasks/task.rnv.package.ts | 2 +- packages/engine-rn/src/tasks/task.rnv.start.ts | 2 +- 11 files changed, 21 insertions(+), 40 deletions(-) create mode 100644 packages/engine-rn/src/tasks/constants.ts diff --git a/packages/engine-core/src/tasks/global/constants.ts b/packages/engine-core/src/tasks/global/constants.ts index ffa291e28d..3167d4ddd4 100644 --- a/packages/engine-core/src/tasks/global/constants.ts +++ b/packages/engine-core/src/tasks/global/constants.ts @@ -3,18 +3,9 @@ export const TASK_NEW = 'new'; export const TASK_HELP = 'help'; export const TASK_INFO = 'info'; export const TASK_CLEAN = 'clean'; - export const TASK_STATUS = 'status'; - export const TASK_KILL = 'kill'; -export const TASK_EJECT = 'eject'; export const TASK_PKG = 'pkg'; - export const TASK_INSTALL = 'install'; export const TASK_PUBLISH = 'publish'; -export const TASK_CRYPTO_INSTALL_CERTS = 'crypto installCerts'; -export const TASK_CRYPTO_INSTALL_PROFILES = 'crypto installProfiles'; -export const TASK_CRYPTO_INSTALL_PROFILE = 'crypto installProfile'; -export const TASK_CRYPTO_UPDATE_PROFILE = 'crypto updateProfile'; -export const TASK_CRYPTO_UPDATE_PROFILES = 'crypto updateProfiles'; export const TASK_CONFIGURE_SOFT = 'configureSoft'; diff --git a/packages/engine-rn/src/tasks/constants.ts b/packages/engine-rn/src/tasks/constants.ts new file mode 100644 index 0000000000..4c1caf45d6 --- /dev/null +++ b/packages/engine-rn/src/tasks/constants.ts @@ -0,0 +1,10 @@ +export const TASK_CRYPTO_INSTALL_CERTS = 'crypto installCerts'; +export const TASK_CRYPTO_INSTALL_PROFILES = 'crypto installProfiles'; +export const TASK_CRYPTO_INSTALL_PROFILE = 'crypto installProfile'; +export const TASK_CRYPTO_UPDATE_PROFILE = 'crypto updateProfile'; +export const TASK_CRYPTO_UPDATE_PROFILES = 'crypto updateProfiles'; +export const TASK_PROJECT_CONFIGURE = 'project configure'; +export const TASK_PLATFORM_CONFIGURE = 'platform configure'; +export const TASK_EJECT = 'eject'; +export const TASK_WORKSPACE_CONFIGURE = 'workspace configure'; +export const TASK_CONFIGURE_SOFT = 'configureSoft'; diff --git a/packages/engine-rn/src/tasks/task.rnv.configure.ts b/packages/engine-rn/src/tasks/task.rnv.configure.ts index f700a2d402..ad7db5bf01 100644 --- a/packages/engine-rn/src/tasks/task.rnv.configure.ts +++ b/packages/engine-rn/src/tasks/task.rnv.configure.ts @@ -1,7 +1,6 @@ import { logErrorPlatform, logTask, - TASK_PLATFORM_CONFIGURE, TASK_CONFIGURE, PARAMS, RnvTaskFn, @@ -14,6 +13,7 @@ import { import { configureGradleProject } from '@rnv/sdk-android'; import { configureXcodeProject } from '@rnv/sdk-apple'; import { configureFonts } from '@rnv/sdk-react-native'; +import { TASK_PLATFORM_CONFIGURE } from './constants'; export const taskRnvConfigure: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvConfigure'); diff --git a/packages/engine-rn/src/tasks/task.rnv.crypto.installCerts.ts b/packages/engine-rn/src/tasks/task.rnv.crypto.installCerts.ts index 2c6fb44d4f..03408dacb0 100644 --- a/packages/engine-rn/src/tasks/task.rnv.crypto.installCerts.ts +++ b/packages/engine-rn/src/tasks/task.rnv.crypto.installCerts.ts @@ -6,12 +6,11 @@ import { shouldSkipTask, executeAsync, logError, - TASK_PROJECT_CONFIGURE, - TASK_CRYPTO_INSTALL_CERTS, getFileListSync, logWarning, RnvTask, } from '@rnv/core'; +import { TASK_CRYPTO_INSTALL_CERTS, TASK_PROJECT_CONFIGURE } from './constants'; export const taskRnvCryptoInstallCerts: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvCryptoInstallCerts'); diff --git a/packages/engine-rn/src/tasks/task.rnv.crypto.installProfiles.ts b/packages/engine-rn/src/tasks/task.rnv.crypto.installProfiles.ts index 2a7c451b02..558faa6a76 100644 --- a/packages/engine-rn/src/tasks/task.rnv.crypto.installProfiles.ts +++ b/packages/engine-rn/src/tasks/task.rnv.crypto.installProfiles.ts @@ -7,14 +7,13 @@ import { executeTask, shouldSkipTask, logError, - TASK_PROJECT_CONFIGURE, - TASK_CRYPTO_INSTALL_PROFILES, fsExistsSync, logWarning, getFileListSync, logDebug, RnvTask, } from '@rnv/core'; +import { TASK_CRYPTO_INSTALL_PROFILES, TASK_PROJECT_CONFIGURE } from './constants'; export const taskRnvCryptoInstallProfiles: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvCryptoInstallProfiles'); diff --git a/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfile.ts b/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfile.ts index d4a8fc8e24..c3a90d07ea 100644 --- a/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfile.ts +++ b/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfile.ts @@ -1,14 +1,6 @@ -import { - logTask, - PARAMS, - RnvTaskFn, - executeTask, - shouldSkipTask, - TASK_PROJECT_CONFIGURE, - TASK_CRYPTO_UPDATE_PROFILE, - RnvTask, -} from '@rnv/core'; +import { logTask, PARAMS, RnvTaskFn, executeTask, shouldSkipTask, RnvTask } from '@rnv/core'; import { updateProfile } from '@rnv/sdk-apple'; +import { TASK_CRYPTO_UPDATE_PROFILE, TASK_PROJECT_CONFIGURE } from './constants'; export const taskRnvCryptoUpdateProfile: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvCryptoUpdateProfile'); diff --git a/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfiles.ts b/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfiles.ts index 2dfeabd0c7..ee4efc14ee 100644 --- a/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfiles.ts +++ b/packages/engine-rn/src/tasks/task.rnv.crypto.updateProfiles.ts @@ -7,11 +7,10 @@ import { chalk, RnvContext, listAppConfigsFoldersSync, - TASK_PROJECT_CONFIGURE, - TASK_CRYPTO_UPDATE_PROFILES, RnvTask, } from '@rnv/core'; import { updateProfile } from '@rnv/sdk-apple'; +import { TASK_CRYPTO_UPDATE_PROFILES, TASK_PROJECT_CONFIGURE } from './constants'; const _updateProfile = (c: RnvContext, v: string) => new Promise((resolve, reject) => { diff --git a/packages/engine-rn/src/tasks/task.rnv.eject.ts b/packages/engine-rn/src/tasks/task.rnv.eject.ts index 8aabd1e4aa..0a7ae2d3a5 100644 --- a/packages/engine-rn/src/tasks/task.rnv.eject.ts +++ b/packages/engine-rn/src/tasks/task.rnv.eject.ts @@ -6,11 +6,11 @@ import { executeOrSkipTask, shouldSkipTask, TASK_PACKAGE, - TASK_EJECT, RnvTask, } from '@rnv/core'; import { ejectGradleProject } from '@rnv/sdk-android'; import { ejectXcodeProject } from '@rnv/sdk-apple'; +import { TASK_EJECT } from './constants'; export const taskRnvEject: RnvTaskFn = async (c, _parentTask, originTask) => { logTask('taskRnvEject'); diff --git a/packages/engine-rn/src/tasks/task.rnv.log.ts b/packages/engine-rn/src/tasks/task.rnv.log.ts index 5d63b893a9..8f2c50ba0a 100644 --- a/packages/engine-rn/src/tasks/task.rnv.log.ts +++ b/packages/engine-rn/src/tasks/task.rnv.log.ts @@ -1,18 +1,9 @@ -import { - logErrorPlatform, - logTask, - PARAMS, - RnvTaskFn, - executeTask, - TASK_WORKSPACE_CONFIGURE, - TASK_PROJECT_CONFIGURE, - RnvTask, - TASK_LOG, -} from '@rnv/core'; +import { logErrorPlatform, logTask, PARAMS, RnvTaskFn, executeTask, RnvTask, TASK_LOG } from '@rnv/core'; import { runAndroidLog, checkAndConfigureAndroidSdks } from '@rnv/sdk-android'; import { runAppleLog } from '@rnv/sdk-apple'; import {} from '@rnv/sdk-android'; +import { TASK_PROJECT_CONFIGURE, TASK_WORKSPACE_CONFIGURE } from './constants'; export const taskRnvLog: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvLog', `parent:${parentTask}`); diff --git a/packages/engine-rn/src/tasks/task.rnv.package.ts b/packages/engine-rn/src/tasks/task.rnv.package.ts index 64c618466b..b547aa6ca0 100644 --- a/packages/engine-rn/src/tasks/task.rnv.package.ts +++ b/packages/engine-rn/src/tasks/task.rnv.package.ts @@ -8,11 +8,11 @@ import { shouldSkipTask, TASK_PACKAGE, getConfigProp, - TASK_EJECT, RnvTask, } from '@rnv/core'; import { packageAndroid } from '@rnv/sdk-android'; import { packageBundleForXcode } from '@rnv/sdk-apple'; +import { TASK_EJECT } from './constants'; export const taskRnvPackage: RnvTaskFn = async (c, parentTask, originTask) => { logTask('taskRnvPackage', `parent:${parentTask}`); diff --git a/packages/engine-rn/src/tasks/task.rnv.start.ts b/packages/engine-rn/src/tasks/task.rnv.start.ts index 52755a3c26..f765ae39ba 100644 --- a/packages/engine-rn/src/tasks/task.rnv.start.ts +++ b/packages/engine-rn/src/tasks/task.rnv.start.ts @@ -6,11 +6,11 @@ import { executeTask, shouldSkipTask, TASK_START, - TASK_CONFIGURE_SOFT, logError, RnvTask, } from '@rnv/core'; import { startReactNative } from '@rnv/sdk-react-native'; +import { TASK_CONFIGURE_SOFT } from './constants'; export const taskRnvStart: RnvTaskFn = async (c, parentTask, originTask) => { const { platform } = c; From 4edf039765a7ee0d97cfb516a60fd8af4efe9581 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Thu, 29 Feb 2024 16:22:23 +0200 Subject: [PATCH 06/46] fixed styles => made app container scrollable --- packages/sdk-apple/src/deviceManager.ts | 2 - packages/template-starter/src/app/index.tsx | 64 +++++++++++---------- packages/template-starter/src/config.tsx | 31 +++++++--- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/packages/sdk-apple/src/deviceManager.ts b/packages/sdk-apple/src/deviceManager.ts index b0aac2381b..2e66d6fcc2 100644 --- a/packages/sdk-apple/src/deviceManager.ts +++ b/packages/sdk-apple/src/deviceManager.ts @@ -30,8 +30,6 @@ export const getAppleDevices = async (c: RnvContext, ignoreDevices?: boolean, ig } = c; const connectedDevicesIds = await utilities.getConnectedDevices(); - console.log('SSSSSSS', connectedDevicesIds); - const connectedDevicesArray = await Promise.all( connectedDevicesIds.map(async (id: string) => { const info = await utilities.getDeviceInfo(id); diff --git a/packages/template-starter/src/app/index.tsx b/packages/template-starter/src/app/index.tsx index ece5b10e3e..eb8cebf05f 100644 --- a/packages/template-starter/src/app/index.tsx +++ b/packages/template-starter/src/app/index.tsx @@ -1,5 +1,5 @@ import React, { useContext, useEffect, useState } from 'react'; -import { Text, Image, View, PixelRatio, TouchableOpacity, StatusBar } from 'react-native'; +import { Text, Image, View, PixelRatio, TouchableOpacity, StatusBar, ScrollView } from 'react-native'; import { Api } from '@rnv/renative'; import { ICON_LOGO, CONFIG, ThemeProvider, ThemeContext, testProps } from '../config'; import packageJson from '../../package.json'; @@ -22,36 +22,38 @@ const AppThemed = () => { }, []); return ( - - - - - {CONFIG.welcomeMessage} - - - v {packageJson.version} - - - {`platform: ${Api.platform}, factor: ${Api.formFactor}, engine: ${Api.engine}`} - - {`hermes: ${ - typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no' - }`} - {`pixelRatio: ${pixelRatio}, ${fontScale}`} - - Try me! - + + + + + + {CONFIG.welcomeMessage} + + + v {packageJson.version} + + + {`platform: ${Api.platform}, factor: ${Api.formFactor}, engine: ${Api.engine}`} + + {`hermes: ${ + typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no' + }`} + {`pixelRatio: ${pixelRatio}, ${fontScale}`} + + Try me! + + ); }; diff --git a/packages/template-starter/src/config.tsx b/packages/template-starter/src/config.tsx index fe49011f76..042e10fb31 100644 --- a/packages/template-starter/src/config.tsx +++ b/packages/template-starter/src/config.tsx @@ -1,7 +1,14 @@ import React, { createContext, useState } from 'react'; import { ImageStyle, StyleSheet, TextStyle, ViewStyle } from 'react-native'; -import { getScaledValue, isPlatformMacos, isPlatformIos, isPlatformTvos, isPlatformWeb } from '@rnv/renative'; +import { + getScaledValue, + isPlatformMacos, + isPlatformIos, + isPlatformTvos, + isPlatformWeb, + isPlatformAndroidwear, +} from '@rnv/renative'; import CONFIG from '../platformAssets/renative.runtime.json'; import '../platformAssets/runtime/fontManager'; import ICON_LOGO from '../platformAssets/runtime/logo.png'; @@ -16,7 +23,9 @@ export function testProps(testId: string | undefined) { } return { accessibilityLabel: testId, accessible: true }; } - +const getFlexPropertyValue = () => { + return isPlatformAndroidwear ? 0 : 1; +}; if (!global.performance) { // @ts-expect-error Performance needs to be typed global.performance = {}; @@ -54,12 +63,7 @@ const staticThemes = { const createStyleSheet = (currentTheme) => StyleSheet.create({ - container: { - justifyContent: 'center', - alignItems: 'center', - paddingVertical: getScaledValue(50), - minHeight: getScaledValue(300), - alignSelf: 'stretch', + wrapper: { position: 'absolute', top: 0, left: 0, @@ -67,6 +71,16 @@ const createStyleSheet = (currentTheme) => right: 0, backgroundColor: currentTheme.colorBgPrimary, }, + + container: { + justifyContent: 'center', + alignItems: 'center', + paddingVertical: getScaledValue(10), + minHeight: getScaledValue(300), + alignSelf: 'stretch', + flex: getFlexPropertyValue(), + backgroundColor: currentTheme.colorBgPrimary, + }, textH2: { fontFamily: currentTheme.primaryFontFamily, fontSize: getScaledValue(20), @@ -128,6 +142,7 @@ export type ThemeInterface = { colorTextSecondary: string; }; styles: { + wrapper: ViewStyle; container: ViewStyle; textH2: TextStyle; textH3: TextStyle; From eefd8d0e11373d80e7f4561979bcfe7174fd48cc Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Thu, 29 Feb 2024 22:14:44 +0200 Subject: [PATCH 07/46] fix/add_warning_for_special_characters --- packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts index dcb3ee122b..ab74bb64f3 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts +++ b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts @@ -162,7 +162,9 @@ ${getEnvExportCmd(envVar, 'REPLACE_WITH_ENV_VARIABLE')} key )}. Make sure you keep it safe! Pass it with --key on decryption or set it as following env variable: -${getEnvExportCmd(envVar, key)} +${getEnvExportCmd(envVar, key)} + +Make sure you take into account special characters that might need to be escaped `); c.process.env[envVar] = key; From e4eb0092f867aa6c7b66bed8ae2cc6ff13355da6 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Fri, 1 Mar 2024 09:54:07 +0200 Subject: [PATCH 08/46] fix --- packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts | 2 ++ packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts | 3 +++ packages/template-starter/renative.json | 4 +--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts b/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts index aff6a680b4..4d7db3f259 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts +++ b/packages/engine-core/src/tasks/task.rnv.crypto.decrypt.ts @@ -109,6 +109,7 @@ export const taskRnvCryptoDecrypt: RnvTaskFn = async (c, parentTask, originTask) ${getEnvExportCmd(envVar, 'REPLACE_WITH_ENV_VARIABLE')} +Make sure you take into account special characters that might need to be escaped. `); } if (!fsExistsSync(source)) { @@ -153,6 +154,7 @@ ${chalk().green('SUGGESTION:')} ${chalk().yellow('STEP 1:')} check if your ENV VAR is correct: ${getEnvExportCmd(envVar, '***********')} +Make sure you take into account special characters that might need to be escaped or if someone did not encrypt ${chalk().white(source)} with a different key ${chalk().yellow('STEP 2:')} diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts index ab74bb64f3..08ae091acd 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts +++ b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts @@ -139,6 +139,7 @@ RNV will create it for you, make sure you add whatever you want encrypted in it } let key = c.program.key || c.process.env[envVar]; + console.log(key, 'key'); let keyGenerated = false; if (!key) { const { confirm } = await inquirerPrompt({ @@ -155,6 +156,8 @@ RNV will create it for you, make sure you add whatever you want encrypted in it ${getEnvExportCmd(envVar, 'REPLACE_WITH_ENV_VARIABLE')} +Make sure you take into account special characters that might need to be escaped + `); } if (keyGenerated) { diff --git a/packages/template-starter/renative.json b/packages/template-starter/renative.json index 95673599f8..5a9ddca580 100644 --- a/packages/template-starter/renative.json +++ b/packages/template-starter/renative.json @@ -111,9 +111,7 @@ "minSdkVersion": 21, "extendPlatform": "android", "engine": "engine-rn-tvos", - "includedPermissions": [ - "INTERNET" - ] + "includedPermissions": ["INTERNET"] }, "web": { "engine": "engine-rn-next" From 4bcdbe8af95502752e8df2ab4a50b61971ed2d99 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Fri, 1 Mar 2024 09:56:48 +0200 Subject: [PATCH 09/46] remove log --- packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts index 08ae091acd..4e920f3f08 100644 --- a/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts +++ b/packages/engine-core/src/tasks/task.rnv.crypto.encrypt.ts @@ -139,7 +139,6 @@ RNV will create it for you, make sure you add whatever you want encrypted in it } let key = c.program.key || c.process.env[envVar]; - console.log(key, 'key'); let keyGenerated = false; if (!key) { const { confirm } = await inquirerPrompt({ From 7e73721d6ee44ee1d76bae47653c497020ccb96a Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Fri, 1 Mar 2024 11:07:50 +0200 Subject: [PATCH 10/46] fix/firetv_manifest --- packages/sdk-android/src/manifestParser.ts | 1 + packages/sdk-android/supportFiles/AndroidManifest_firetv.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sdk-android/src/manifestParser.ts b/packages/sdk-android/src/manifestParser.ts index 5a929374fc..44a66ce243 100644 --- a/packages/sdk-android/src/manifestParser.ts +++ b/packages/sdk-android/src/manifestParser.ts @@ -240,6 +240,7 @@ export const parseAndroidManifestSync = (c: Context) => { _mergeNodeChildren(baseManifestFile, manifestObj.children); } }); + //TODO: Should be mark as deprecated // appConfigs/base/plugins.json PLUGIN CONFIG OVERRIDES parsePlugins(c, platform, (_plugin, pluginPlat) => { diff --git a/packages/sdk-android/supportFiles/AndroidManifest_firetv.json b/packages/sdk-android/supportFiles/AndroidManifest_firetv.json index f3a1fd83f4..330c2fd5d4 100644 --- a/packages/sdk-android/supportFiles/AndroidManifest_firetv.json +++ b/packages/sdk-android/supportFiles/AndroidManifest_firetv.json @@ -19,7 +19,7 @@ "android:icon": "@mipmap/ic_launcher", "android:roundIcon": "@mipmap/ic_launcher", "android:banner": "@drawable/banner", - "android:allowBackup": false, + "android:allowBackup": true, "android:theme": "@style/AppTheme", "children": [ { From e86d1547ea19b3465f2a1c30921b6fa974be629c Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Fri, 1 Mar 2024 12:33:58 +0200 Subject: [PATCH 11/46] disable @react-native-community/push-notification-ios for tvos --- packages/app-harness/renative.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/app-harness/renative.json b/packages/app-harness/renative.json index 325f17f96e..f3a80bd476 100644 --- a/packages/app-harness/renative.json +++ b/packages/app-harness/renative.json @@ -183,6 +183,9 @@ } } }, + "tvos": { + "disabled": true + }, "version": "1.11.0" }, "react-native": { From f190c4ba184b5ec4690acd373ddb62bda788b0bd Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Fri, 1 Mar 2024 13:21:56 +0200 Subject: [PATCH 12/46] created a separate file index.ios.tsx --- packages/app-harness/src/app/index.ios.tsx | 62 ++++++++++++++++++++++ packages/app-harness/src/app/index.tsx | 47 +--------------- 2 files changed, 64 insertions(+), 45 deletions(-) create mode 100644 packages/app-harness/src/app/index.ios.tsx diff --git a/packages/app-harness/src/app/index.ios.tsx b/packages/app-harness/src/app/index.ios.tsx new file mode 100644 index 0000000000..4e74209fac --- /dev/null +++ b/packages/app-harness/src/app/index.ios.tsx @@ -0,0 +1,62 @@ +import React, { useEffect} from 'react'; +import { Button, Text, View } from 'react-native'; +import SplashScreen from 'react-native-splash-screen'; +import PushNotificationIOS from '@react-native-community/push-notification-ios'; +import { request, PERMISSIONS } from 'react-native-permissions'; + +const App = () => { + useEffect(() => { + SplashScreen.hide(); + }, []); + + useEffect(() => { + + PushNotificationIOS.requestPermissions(); + PushNotificationIOS.addEventListener('notification', onRemoteNotification); + PushNotificationIOS.addEventListener('register', onRegistered); + PushNotificationIOS.addEventListener('registrationError', onError); + + return () => { + PushNotificationIOS.removeEventListener('notification'); + PushNotificationIOS.removeEventListener('register'); + PushNotificationIOS.removeEventListener('registrationError'); + }; + }); + + const requestPermission = () => { + request(PERMISSIONS.IOS.CONTACTS).then((result) => { + console.log(result); + }); + }; + + const onRegistered = (deviceToken) => { + console.log(`Device Token: ${deviceToken}`); + }; + + const onError = (error) => { + console.log(`Error on notification register: ${error}`); + }; + + const onRemoteNotification = (notification) => { + const isClicked = notification.getData().userInteraction === 1; + + if (isClicked) { + // Navigate user to another screen + } else { + // Do something else with push notification + } + // Use the appropriate result based on what you needed to do for this notification + const result = PushNotificationIOS.FetchResult.NoData; + notification.finish(result); + }; + + return ( + + ReNative Harness !! + {`hermes: ${typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no'}`} +