@hubspot/cli 7.4.0-experimental.0 → 7.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/api/migrate.d.ts +61 -0
  2. package/api/migrate.js +44 -0
  3. package/bin/cli.js +8 -183
  4. package/commands/account/auth.d.ts +10 -0
  5. package/commands/account/auth.js +168 -0
  6. package/commands/account/clean.js +38 -5
  7. package/commands/account/createOverride.d.ts +10 -0
  8. package/commands/account/createOverride.js +104 -0
  9. package/commands/account/info.js +38 -4
  10. package/commands/account/list.js +23 -5
  11. package/commands/account/remove.js +36 -2
  12. package/commands/account/removeOverride.d.ts +10 -0
  13. package/commands/account/removeOverride.js +76 -0
  14. package/commands/account/use.js +25 -3
  15. package/commands/account.js +7 -2
  16. package/commands/app/migrate.js +5 -4
  17. package/commands/auth.js +6 -2
  18. package/commands/cms/lighthouseScore.js +6 -2
  19. package/commands/config/migrate.d.ts +10 -0
  20. package/commands/config/migrate.js +84 -0
  21. package/commands/config/set.d.ts +10 -0
  22. package/commands/config/set.js +34 -29
  23. package/commands/config.d.ts +4 -1
  24. package/commands/config.js +45 -11
  25. package/commands/create/api-sample.js +3 -1
  26. package/commands/customObject/schema/delete.js +4 -1
  27. package/commands/customObject/schema/fetch-all.js +2 -1
  28. package/commands/customObject/schema/fetch.js +2 -1
  29. package/commands/init.js +9 -10
  30. package/commands/project/create.js +1 -0
  31. package/commands/project/dev/index.js +1 -1
  32. package/commands/project/installDeps.d.ts +9 -1
  33. package/commands/project/installDeps.js +43 -30
  34. package/commands/project/logs.d.ts +13 -1
  35. package/commands/project/logs.js +69 -62
  36. package/commands/project/upload.d.ts +12 -0
  37. package/commands/project/upload.js +62 -49
  38. package/commands/project/watch.js +12 -0
  39. package/lang/en.js +11 -3
  40. package/lang/en.lyaml +95 -12
  41. package/lib/DevServerManagerV2.d.ts +1 -2
  42. package/lib/DevServerManagerV2.js +1 -2
  43. package/lib/LocalDevManagerV2.js +10 -15
  44. package/lib/app/migrate.d.ts +0 -2
  45. package/lib/app/migrate.js +62 -165
  46. package/lib/app/migrate_legacy.d.ts +4 -0
  47. package/lib/app/migrate_legacy.js +129 -0
  48. package/lib/configMigrate.d.ts +2 -0
  49. package/lib/configMigrate.js +104 -0
  50. package/lib/doctor/Diagnosis.d.ts +1 -2
  51. package/lib/doctor/Diagnosis.js +10 -6
  52. package/lib/doctor/DiagnosticInfoBuilder.d.ts +1 -0
  53. package/lib/doctor/DiagnosticInfoBuilder.js +1 -0
  54. package/lib/doctor/Doctor.d.ts +1 -0
  55. package/lib/doctor/Doctor.js +18 -0
  56. package/lib/middleware/__test__/configMiddleware.test.d.ts +1 -0
  57. package/lib/middleware/__test__/configMiddleware.test.js +194 -0
  58. package/lib/middleware/__test__/gitMiddleware.test.d.ts +1 -0
  59. package/lib/middleware/__test__/gitMiddleware.test.js +76 -0
  60. package/lib/middleware/__test__/notificationsMiddleware.test.d.ts +1 -0
  61. package/lib/middleware/__test__/notificationsMiddleware.test.js +10 -0
  62. package/lib/middleware/__test__/requestMiddleware.test.d.ts +1 -0
  63. package/lib/middleware/__test__/requestMiddleware.test.js +20 -0
  64. package/lib/middleware/__test__/utils.test.d.ts +1 -0
  65. package/lib/middleware/__test__/utils.test.js +53 -0
  66. package/lib/middleware/__test__/yargsChecksMiddleware.test.d.ts +1 -0
  67. package/lib/middleware/__test__/yargsChecksMiddleware.test.js +81 -0
  68. package/lib/middleware/configMiddleware.d.ts +13 -0
  69. package/lib/middleware/configMiddleware.js +109 -0
  70. package/lib/middleware/fireAlarmMiddleware.d.ts +4 -0
  71. package/lib/middleware/fireAlarmMiddleware.js +137 -0
  72. package/lib/middleware/gitMiddleware.d.ts +2 -0
  73. package/lib/middleware/gitMiddleware.js +14 -0
  74. package/lib/middleware/notificationsMiddleware.d.ts +1 -0
  75. package/lib/middleware/notificationsMiddleware.js +38 -0
  76. package/lib/middleware/requestMiddleware.d.ts +1 -0
  77. package/lib/middleware/requestMiddleware.js +11 -0
  78. package/lib/middleware/utils.d.ts +8 -0
  79. package/lib/middleware/utils.js +17 -0
  80. package/lib/middleware/yargsChecksMiddleware.d.ts +4 -0
  81. package/lib/middleware/yargsChecksMiddleware.js +24 -0
  82. package/lib/projects/ProjectLogsManager.d.ts +1 -1
  83. package/lib/projects/ProjectLogsManager.js +1 -1
  84. package/lib/projects/index.d.ts +1 -1
  85. package/lib/projects/structure.d.ts +1 -2
  86. package/lib/projects/structure.js +0 -4
  87. package/lib/projects/upload.d.ts +1 -1
  88. package/lib/ui/SpinniesManager.d.ts +1 -1
  89. package/lib/ui/index.d.ts +1 -0
  90. package/lib/ui/index.js +5 -0
  91. package/lib/ui/spinniesUtils.d.ts +5 -5
  92. package/package.json +7 -6
  93. package/types/ProjectComponents.d.ts +0 -15
@@ -6,38 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.downloadProjectFiles = downloadProjectFiles;
7
7
  exports.migrateApp2025_2 = migrateApp2025_2;
8
8
  exports.logInvalidAccountError = logInvalidAccountError;
9
- exports.migrateApp2023_2 = migrateApp2023_2;
10
- const promptUtils_1 = require("../prompts/promptUtils");
11
- const errorHandlers_1 = require("../errorHandlers");
12
- const exitCodes_1 = require("../enums/exitCodes");
13
9
  const logger_1 = require("@hubspot/local-dev-lib/logger");
14
- const ui_1 = require("../ui");
15
- const lang_1 = require("../lang");
16
- const accountTypes_1 = require("../accountTypes");
17
- const selectPublicAppPrompt_1 = require("../prompts/selectPublicAppPrompt");
18
- const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
19
- const createProjectPrompt_1 = require("../prompts/createProjectPrompt");
20
- const projects_1 = require("../projects");
21
- const usageTracking_1 = require("../usageTracking");
22
- const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
23
- const process_1 = require("../process");
24
- const projects_2 = require("@hubspot/local-dev-lib/api/projects");
25
- const polling_1 = require("../polling");
26
10
  const path_1 = __importDefault(require("path"));
27
11
  const path_2 = require("@hubspot/local-dev-lib/path");
28
- const urls_1 = require("@hubspot/local-dev-lib/urls");
29
12
  const archive_1 = require("@hubspot/local-dev-lib/archive");
30
13
  const chalk_1 = __importDefault(require("chalk"));
31
14
  const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
32
- const projects_3 = require("@hubspot/local-dev-lib/constants/projects");
15
+ const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
33
16
  const transform_1 = require("@hubspot/project-parsing-lib/src/lib/transform");
17
+ const Migration_1 = require("@hubspot/local-dev-lib/types/Migration");
18
+ const projects_2 = require("@hubspot/local-dev-lib/api/projects");
19
+ const promptUtils_1 = require("../prompts/promptUtils");
20
+ const ui_1 = require("../ui");
21
+ const lang_1 = require("../lang");
22
+ const projects_3 = require("../projects");
23
+ const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
24
+ const polling_1 = require("../polling");
25
+ const migrate_1 = require("../../api/migrate");
34
26
  function getUnmigratableReason(reasonCode) {
35
27
  switch (reasonCode) {
36
- case projects_3.UNMIGRATABLE_REASONS.UP_TO_DATE:
28
+ case projects_1.UNMIGRATABLE_REASONS.UP_TO_DATE:
37
29
  return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.upToDate');
38
- case projects_3.UNMIGRATABLE_REASONS.IS_A_PRIVATE_APP:
30
+ case projects_1.UNMIGRATABLE_REASONS.IS_A_PRIVATE_APP:
39
31
  return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.isPrivateApp');
40
- case projects_3.UNMIGRATABLE_REASONS.LISTED_IN_MARKETPLACE:
32
+ case projects_1.UNMIGRATABLE_REASONS.LISTED_IN_MARKETPLACE:
41
33
  return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.listedInMarketplace');
42
34
  default:
43
35
  return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.generic', {
@@ -47,29 +39,28 @@ function getUnmigratableReason(reasonCode) {
47
39
  }
48
40
  async function handleMigrationSetup(derivedAccountId, options) {
49
41
  const { name, dest, appId } = options;
50
- const { data } = await (0, projects_2.listAppsForMigration)(derivedAccountId);
51
- const { migratableApps, unmigratableApps } = data;
52
- const allApps = [...migratableApps, ...unmigratableApps].filter(app => !app.projectName);
53
- if (allApps.length === 0) {
54
- throw new Error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noApps`, {
55
- accountId: derivedAccountId,
56
- }));
57
- }
58
- if (migratableApps.length === 0) {
59
- const reasons = unmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
42
+ const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
43
+ const migratableAppsWithoutProject = migratableApps.filter((app) => !app.projectName);
44
+ const unmigratableAppsWithoutProject = unmigratableApps.filter((app) => !app.projectName);
45
+ const allAppsWithoutProject = [
46
+ ...migratableAppsWithoutProject,
47
+ ...unmigratableAppsWithoutProject,
48
+ ];
49
+ if (allAppsWithoutProject.length === 0) {
50
+ const reasons = unmigratableAppsWithoutProject.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
60
51
  throw new Error(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noAppsEligible`, {
61
- accountId: derivedAccountId,
62
- })} \n - ${reasons.join('\n - ')}`);
52
+ accountId: (0, ui_1.uiAccountDescription)(derivedAccountId),
53
+ })}${reasons.length ? `\n - ${reasons.join('\n - ')}` : ''}`);
63
54
  }
64
55
  if (appId &&
65
- !allApps.some(app => {
56
+ !allAppsWithoutProject.some(app => {
66
57
  return app.appId === appId;
67
58
  })) {
68
59
  throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp', {
69
60
  appId,
70
61
  }));
71
62
  }
72
- const appChoices = allApps.map(app => ({
63
+ const appChoices = allAppsWithoutProject.map(app => ({
73
64
  name: app.isMigratable
74
65
  ? app.appName
75
66
  : `[${chalk_1.default.yellow('DISABLED')}] ${app.appName} `,
@@ -85,7 +76,7 @@ async function handleMigrationSetup(derivedAccountId, options) {
85
76
  });
86
77
  appIdToMigrate = selectedAppId;
87
78
  }
88
- const selectedApp = allApps.find(app => app.appId === appIdToMigrate);
79
+ const selectedApp = allAppsWithoutProject.find(app => app.appId === appIdToMigrate);
89
80
  const migratableComponents = [];
90
81
  const unmigratableComponents = [];
91
82
  selectedApp?.migrationComponents.forEach(component => {
@@ -113,7 +104,7 @@ async function handleMigrationSetup(derivedAccountId, options) {
113
104
  }
114
105
  const projectName = name ||
115
106
  (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputName')));
116
- const { projectExists } = await (0, projects_1.ensureProjectExists)(derivedAccountId, projectName, { forceCreate: false, allowCreate: false, noLogs: true });
107
+ const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
117
108
  if (projectExists) {
118
109
  throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.projectAlreadyExists', {
119
110
  projectName,
@@ -130,59 +121,53 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
130
121
  text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.beginningMigration'),
131
122
  });
132
123
  const uidMap = {};
133
- const { data } = await (0, projects_2.initializeMigration)(derivedAccountId, appId, platformVersion);
124
+ const { data } = await (0, migrate_1.initializeMigration)(derivedAccountId, appId, platformVersion);
134
125
  const { migrationId } = data;
135
- const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, ['INPUT_REQUIRED']);
136
- if (pollResponse.status !== 'INPUT_REQUIRED') {
126
+ const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [Migration_1.MIGRATION_STATUS.INPUT_REQUIRED]);
127
+ if (pollResponse.status !== Migration_1.MIGRATION_STATUS.INPUT_REQUIRED) {
137
128
  SpinniesManager_1.default.fail('beginningMigration', {
138
129
  text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.unableToStartMigration'),
139
130
  });
140
131
  return;
141
132
  }
142
133
  const { componentsRequiringUids } = pollResponse;
143
- SpinniesManager_1.default.succeed('beginningMigration', {
144
- text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.migrationStarted'),
145
- });
134
+ SpinniesManager_1.default.remove('beginningMigration');
146
135
  if (Object.values(componentsRequiringUids).length !== 0) {
147
136
  for (const [componentId, component] of Object.entries(componentsRequiringUids)) {
137
+ const { componentHint, componentType } = component;
148
138
  uidMap[componentId] = await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.uidForComponent', {
149
- componentName: component.componentHint || component.componentType,
139
+ componentName: componentHint
140
+ ? `${componentHint} [${(0, transform_1.mapToUserFacingType)(componentType)}]`
141
+ : (0, transform_1.mapToUserFacingType)(componentType),
150
142
  }), {
151
143
  validate: (uid) => {
152
144
  const result = (0, project_parsing_lib_1.validateUid)(uid);
153
145
  return result === undefined ? true : result;
154
146
  },
147
+ defaultAnswer: (componentHint || '')
148
+ .toLowerCase()
149
+ .replace(/[^a-z0-9_]/g, ''),
155
150
  });
156
151
  }
157
152
  }
158
153
  return { migrationId, uidMap };
159
154
  }
160
155
  async function pollMigrationStatus(derivedAccountId, migrationId, successStates = []) {
161
- return (0, polling_1.poll)(() => (0, projects_2.checkMigrationStatusV2)(derivedAccountId, migrationId), {
156
+ return (0, polling_1.poll)(() => (0, migrate_1.checkMigrationStatusV2)(derivedAccountId, migrationId), {
162
157
  successStates: [...successStates],
163
158
  errorStates: [...polling_1.DEFAULT_POLLING_STATUS_LOOKUP.errorStates],
164
159
  });
165
160
  }
166
161
  async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectName) {
167
- let buildId;
162
+ let pollResponse;
168
163
  try {
169
164
  SpinniesManager_1.default.add('finishingMigration', {
170
165
  text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.finishingMigration`),
171
166
  });
172
- await (0, projects_2.continueMigration)(derivedAccountId, migrationId, uidMap, projectName);
173
- const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, ['SUCCESS']);
174
- if (pollResponse.status === 'SUCCESS') {
175
- buildId = pollResponse.buildId;
176
- SpinniesManager_1.default.succeed('finishingMigration', {
177
- text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationComplete`),
178
- });
179
- }
180
- else {
181
- SpinniesManager_1.default.fail('finishingMigration', {
182
- text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
183
- });
184
- }
185
- return buildId;
167
+ await (0, migrate_1.continueMigration)(derivedAccountId, migrationId, uidMap, projectName);
168
+ pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [
169
+ Migration_1.MIGRATION_STATUS.SUCCESS,
170
+ ]);
186
171
  }
187
172
  catch (error) {
188
173
  SpinniesManager_1.default.fail('finishingMigration', {
@@ -190,6 +175,22 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
190
175
  });
191
176
  throw error;
192
177
  }
178
+ if (pollResponse.status === Migration_1.MIGRATION_STATUS.SUCCESS) {
179
+ SpinniesManager_1.default.succeed('finishingMigration', {
180
+ text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationComplete`),
181
+ });
182
+ return pollResponse.buildId;
183
+ }
184
+ else {
185
+ SpinniesManager_1.default.fail('finishingMigration', {
186
+ text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
187
+ });
188
+ if (pollResponse.status === Migration_1.MIGRATION_STATUS.FAILURE) {
189
+ logger_1.logger.error(pollResponse.componentErrorDetails);
190
+ throw new Error(pollResponse.projectErrorsDetail);
191
+ }
192
+ throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'));
193
+ }
193
194
  }
194
195
  async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest) {
195
196
  try {
@@ -202,7 +203,7 @@ async function downloadProjectFiles(derivedAccountId, projectName, buildId, proj
202
203
  : (0, path_2.getCwd)();
203
204
  await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
204
205
  includesRootDir: true,
205
- hideLogs: false,
206
+ hideLogs: true,
206
207
  });
207
208
  SpinniesManager_1.default.succeed('fetchingMigratedProject', {
208
209
  text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsComplete`),
@@ -228,9 +229,6 @@ async function migrateApp2025_2(derivedAccountId, options) {
228
229
  }
229
230
  const { migrationId, uidMap } = migrationInProgress;
230
231
  const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectName);
231
- if (!buildId) {
232
- throw new Error('Migration Failed');
233
- }
234
232
  await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest);
235
233
  }
236
234
  function logInvalidAccountError(i18nKey) {
@@ -242,104 +240,3 @@ function logInvalidAccountError(i18nKey) {
242
240
  }));
243
241
  (0, ui_1.uiLine)();
244
242
  }
245
- async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
246
- const i18nKey = 'commands.project.subcommands.migrateApp';
247
- const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
248
- if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
249
- logInvalidAccountError(i18nKey);
250
- process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
251
- }
252
- const { appId } = 'appId' in options
253
- ? options
254
- : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
255
- accountId: derivedAccountId,
256
- accountName,
257
- isMigratingApp: true,
258
- });
259
- try {
260
- const { data: selectedApp } = await (0, appsDev_1.fetchPublicAppMetadata)(appId, derivedAccountId);
261
- // preventProjectMigrations returns true if we have not added app to allowlist config.
262
- // listingInfo will only exist for marketplace apps
263
- const preventProjectMigrations = selectedApp.preventProjectMigrations;
264
- const listingInfo = selectedApp.listingInfo;
265
- if (preventProjectMigrations && listingInfo) {
266
- logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidApp`, { appId }));
267
- process.exit(exitCodes_1.EXIT_CODES.ERROR);
268
- }
269
- }
270
- catch (error) {
271
- (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
272
- process.exit(exitCodes_1.EXIT_CODES.ERROR);
273
- }
274
- const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
275
- const { name: projectName, dest: projectDest } = createProjectPromptResponse;
276
- const { projectExists } = await (0, projects_1.ensureProjectExists)(derivedAccountId, projectName, {
277
- allowCreate: false,
278
- noLogs: true,
279
- });
280
- if (projectExists) {
281
- throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.projectAlreadyExists`, {
282
- projectName,
283
- }));
284
- }
285
- await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { step: 'STARTED' }, derivedAccountId);
286
- logger_1.logger.log('');
287
- (0, ui_1.uiLine)();
288
- logger_1.logger.warn(`${(0, lang_1.i18n)(`${i18nKey}.warning.title`)}\n`);
289
- logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.warning.projectConversion`));
290
- logger_1.logger.log(`${(0, lang_1.i18n)(`${i18nKey}.warning.appConfig`)}\n`);
291
- logger_1.logger.log(`${(0, lang_1.i18n)(`${i18nKey}.warning.buildAndDeploy`)}\n`);
292
- logger_1.logger.log(`${(0, lang_1.i18n)(`${i18nKey}.warning.existingApps`)}\n`);
293
- logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.warning.copyApp`));
294
- (0, ui_1.uiLine)();
295
- const { shouldCreateApp } = await (0, promptUtils_1.promptUser)({
296
- name: 'shouldCreateApp',
297
- type: 'confirm',
298
- message: (0, lang_1.i18n)(`${i18nKey}.createAppPrompt`),
299
- });
300
- process.stdin.resume();
301
- if (!shouldCreateApp) {
302
- process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
303
- }
304
- try {
305
- SpinniesManager_1.default.init();
306
- SpinniesManager_1.default.add('migrateApp', {
307
- text: (0, lang_1.i18n)(`${i18nKey}.migrationStatus.inProgress`),
308
- });
309
- (0, process_1.handleKeypress)(async (key) => {
310
- if ((key.ctrl && key.name === 'c') || key.name === 'q') {
311
- SpinniesManager_1.default.remove('migrateApp');
312
- logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.migrationInterrupted`));
313
- process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
314
- }
315
- });
316
- const { data: migrateResponse } = await (0, projects_2.migrateApp)(derivedAccountId, appId, projectName);
317
- const { id } = migrateResponse;
318
- const pollResponse = await (0, polling_1.poll)(() => (0, projects_2.checkMigrationStatus)(derivedAccountId, id));
319
- const { status, project } = pollResponse;
320
- if (status === 'SUCCESS') {
321
- const absoluteDestPath = path_1.default.resolve((0, path_2.getCwd)(), projectDest);
322
- const { env } = accountConfig;
323
- const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
324
- const { data: zippedProject } = await (0, projects_2.downloadProject)(derivedAccountId, projectName, 1);
325
- await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), path_1.default.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
326
- SpinniesManager_1.default.succeed('migrateApp', {
327
- text: (0, lang_1.i18n)(`${i18nKey}.migrationStatus.done`),
328
- succeedColor: 'white',
329
- });
330
- logger_1.logger.log('');
331
- (0, ui_1.uiLine)();
332
- logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.migrationStatus.success`));
333
- logger_1.logger.log('');
334
- logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
335
- process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
336
- }
337
- }
338
- catch (error) {
339
- SpinniesManager_1.default.fail('migrateApp', {
340
- text: (0, lang_1.i18n)(`${i18nKey}.migrationStatus.failure`),
341
- failColor: 'white',
342
- });
343
- throw error;
344
- }
345
- }
@@ -0,0 +1,4 @@
1
+ import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
2
+ import { ArgumentsCamelCase } from 'yargs';
3
+ import { MigrateAppOptions } from '../../types/Yargs';
4
+ export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, accountConfig: CLIAccount): Promise<void>;
@@ -0,0 +1,129 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.migrateApp2023_2 = migrateApp2023_2;
7
+ const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
8
+ const logger_1 = require("@hubspot/local-dev-lib/logger");
9
+ const projects_1 = require("@hubspot/local-dev-lib/api/projects");
10
+ const path_1 = __importDefault(require("path"));
11
+ const path_2 = require("@hubspot/local-dev-lib/path");
12
+ const urls_1 = require("@hubspot/local-dev-lib/urls");
13
+ const archive_1 = require("@hubspot/local-dev-lib/archive");
14
+ const promptUtils_1 = require("../prompts/promptUtils");
15
+ const errorHandlers_1 = require("../errorHandlers");
16
+ const exitCodes_1 = require("../enums/exitCodes");
17
+ const ui_1 = require("../ui");
18
+ const lang_1 = require("../lang");
19
+ const accountTypes_1 = require("../accountTypes");
20
+ const selectPublicAppPrompt_1 = require("../prompts/selectPublicAppPrompt");
21
+ const createProjectPrompt_1 = require("../prompts/createProjectPrompt");
22
+ const projects_2 = require("../projects");
23
+ const usageTracking_1 = require("../usageTracking");
24
+ const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
25
+ const process_1 = require("../process");
26
+ const polling_1 = require("../polling");
27
+ const migrate_1 = require("./migrate");
28
+ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
29
+ const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
30
+ if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
31
+ (0, migrate_1.logInvalidAccountError)('commands.project.subcommands.migrateApp');
32
+ process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
33
+ }
34
+ const { appId } = 'appId' in options
35
+ ? options
36
+ : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
37
+ accountId: derivedAccountId,
38
+ accountName,
39
+ isMigratingApp: true,
40
+ });
41
+ try {
42
+ const { data: selectedApp } = await (0, appsDev_1.fetchPublicAppMetadata)(appId, derivedAccountId);
43
+ // preventProjectMigrations returns true if we have not added app to allowlist config.
44
+ // listingInfo will only exist for marketplace apps
45
+ const preventProjectMigrations = selectedApp.preventProjectMigrations;
46
+ const listingInfo = selectedApp.listingInfo;
47
+ if (preventProjectMigrations && listingInfo) {
48
+ logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.invalidApp`, {
49
+ appId,
50
+ }));
51
+ process.exit(exitCodes_1.EXIT_CODES.ERROR);
52
+ }
53
+ }
54
+ catch (error) {
55
+ (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
56
+ process.exit(exitCodes_1.EXIT_CODES.ERROR);
57
+ }
58
+ const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
59
+ const { name: projectName, dest: projectDest } = createProjectPromptResponse;
60
+ const { projectExists } = await (0, projects_2.ensureProjectExists)(derivedAccountId, projectName, {
61
+ allowCreate: false,
62
+ noLogs: true,
63
+ });
64
+ if (projectExists) {
65
+ throw new Error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.projectAlreadyExists`, {
66
+ projectName,
67
+ }));
68
+ }
69
+ await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { step: 'STARTED' }, derivedAccountId);
70
+ logger_1.logger.log('');
71
+ (0, ui_1.uiLine)();
72
+ logger_1.logger.warn(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.title`)}\n`);
73
+ logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.projectConversion`));
74
+ logger_1.logger.log(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.appConfig`)}\n`);
75
+ logger_1.logger.log(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.buildAndDeploy`)}\n`);
76
+ logger_1.logger.log(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.existingApps`)}\n`);
77
+ logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.warning.copyApp`));
78
+ (0, ui_1.uiLine)();
79
+ const { shouldCreateApp } = await (0, promptUtils_1.promptUser)({
80
+ name: 'shouldCreateApp',
81
+ type: 'confirm',
82
+ message: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.createAppPrompt`),
83
+ });
84
+ process.stdin.resume();
85
+ if (!shouldCreateApp) {
86
+ process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
87
+ }
88
+ try {
89
+ SpinniesManager_1.default.init();
90
+ SpinniesManager_1.default.add('migrateApp', {
91
+ text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.migrationStatus.inProgress`),
92
+ });
93
+ (0, process_1.handleKeypress)(async (key) => {
94
+ if ((key.ctrl && key.name === 'c') || key.name === 'q') {
95
+ SpinniesManager_1.default.remove('migrateApp');
96
+ logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.migrationInterrupted`));
97
+ process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
98
+ }
99
+ });
100
+ const { data: migrateResponse } = await (0, projects_1.migrateApp)(derivedAccountId, appId, projectName);
101
+ const { id } = migrateResponse;
102
+ const pollResponse = await (0, polling_1.poll)(() => (0, projects_1.checkMigrationStatus)(derivedAccountId, id));
103
+ const { status, project } = pollResponse;
104
+ if (status === 'SUCCESS') {
105
+ const absoluteDestPath = path_1.default.resolve((0, path_2.getCwd)(), projectDest);
106
+ const { env } = accountConfig;
107
+ const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)(env);
108
+ const { data: zippedProject } = await (0, projects_1.downloadProject)(derivedAccountId, projectName, 1);
109
+ await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), path_1.default.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
110
+ SpinniesManager_1.default.succeed('migrateApp', {
111
+ text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.migrationStatus.done`),
112
+ succeedColor: 'white',
113
+ });
114
+ logger_1.logger.log('');
115
+ (0, ui_1.uiLine)();
116
+ logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.migrationStatus.success`));
117
+ logger_1.logger.log('');
118
+ logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
119
+ process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
120
+ }
121
+ }
122
+ catch (error) {
123
+ SpinniesManager_1.default.fail('migrateApp', {
124
+ text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.migrationStatus.failure`),
125
+ failColor: 'white',
126
+ });
127
+ throw error;
128
+ }
129
+ }
@@ -0,0 +1,2 @@
1
+ export declare function handleMigration(accountId: number | undefined, configPath?: string): Promise<void>;
2
+ export declare function handleMerge(accountId: number | undefined, configPath?: string, force?: boolean): Promise<void>;
@@ -0,0 +1,104 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.handleMigration = handleMigration;
4
+ exports.handleMerge = handleMerge;
5
+ const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
6
+ const config_1 = require("@hubspot/local-dev-lib/constants/config");
7
+ const logger_1 = require("@hubspot/local-dev-lib/logger");
8
+ const promptUtils_1 = require("./prompts/promptUtils");
9
+ const lang_1 = require("./lang");
10
+ const usageTracking_1 = require("./usageTracking");
11
+ async function handleMigration(accountId, configPath) {
12
+ const { shouldMigrateConfig } = await (0, promptUtils_1.promptUser)({
13
+ name: 'shouldMigrateConfig',
14
+ type: 'confirm',
15
+ message: (0, lang_1.i18n)('lib.configMigrate.migrateConfigPrompt', {
16
+ deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
17
+ config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
18
+ globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
19
+ }),
20
+ });
21
+ if (!shouldMigrateConfig) {
22
+ (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
23
+ command: 'hs config migrate',
24
+ type: 'migration',
25
+ step: 'Reject migration via prompt',
26
+ }, accountId);
27
+ return;
28
+ }
29
+ const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
30
+ (0, migrate_1.migrateConfig)(deprecatedConfig);
31
+ (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
32
+ command: 'hs config migrate',
33
+ type: 'migration',
34
+ step: 'Confirm migration via prompt',
35
+ successful: true,
36
+ }, accountId);
37
+ logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.migrationSuccess', {
38
+ globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
39
+ }));
40
+ return;
41
+ }
42
+ async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
43
+ const { initialConfig, conflicts, } = (0, migrate_1.mergeConfigProperties)(globalConfig, deprecatedConfig, force);
44
+ if (conflicts.length > 0) {
45
+ for (const conflict of conflicts) {
46
+ const { property, newValue, oldValue } = conflict;
47
+ const { shouldOverwrite } = await (0, promptUtils_1.promptUser)({
48
+ name: 'shouldOverwrite',
49
+ type: 'confirm',
50
+ message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigConflictPrompt', {
51
+ property,
52
+ oldValue: `${oldValue}`,
53
+ newValue: `${newValue}`,
54
+ }),
55
+ });
56
+ if (shouldOverwrite) {
57
+ // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED
58
+ initialConfig[property] = oldValue;
59
+ }
60
+ }
61
+ }
62
+ return initialConfig;
63
+ }
64
+ async function handleMerge(accountId, configPath, force) {
65
+ const { shouldMergeConfigs } = await (0, promptUtils_1.promptUser)({
66
+ name: 'shouldMergeConfigs',
67
+ type: 'confirm',
68
+ message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigsPrompt', {
69
+ deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
70
+ config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
71
+ globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
72
+ }),
73
+ });
74
+ if (!shouldMergeConfigs) {
75
+ (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
76
+ command: 'hs config migrate',
77
+ type: 'merge',
78
+ step: 'Reject merge via prompt',
79
+ }, accountId);
80
+ return;
81
+ }
82
+ const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
83
+ const globalConfig = (0, migrate_1.getGlobalConfig)();
84
+ if (!deprecatedConfig || !globalConfig) {
85
+ return;
86
+ }
87
+ const mergedConfig = await mergeConfigProperties(globalConfig, deprecatedConfig, force);
88
+ const { skippedAccountIds } = (0, migrate_1.mergeExistingConfigs)(mergedConfig, deprecatedConfig);
89
+ if (skippedAccountIds.length > 0) {
90
+ logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.skippedExistingAccounts', {
91
+ skippedAccountIds: skippedAccountIds.join(', '),
92
+ }));
93
+ }
94
+ logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.mergeSuccess', {
95
+ globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
96
+ }));
97
+ (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
98
+ command: 'hs config migrate',
99
+ type: 'merge',
100
+ step: 'Confirm merge via prompt',
101
+ successful: true,
102
+ }, accountId);
103
+ return;
104
+ }
@@ -11,16 +11,15 @@ interface Section {
11
11
  export declare class Diagnosis {
12
12
  private readonly prefixes;
13
13
  private readonly diagnosis;
14
- private readonly indentation;
15
14
  private errorCount;
16
15
  private warningCount;
17
16
  constructor({ diagnosticInfo, accountId }: DiagnosisOptions);
18
- private indent;
19
17
  getErrorCount(): number;
20
18
  getWarningCount(): number;
21
19
  addCliSection(section: Section): void;
22
20
  addProjectSection(section: Section): void;
23
21
  addCLIConfigSection(section: Section): void;
22
+ addDefaultAccountOverrideFileSection(section: Section): void;
24
23
  toString(): string;
25
24
  private generateSections;
26
25
  }
@@ -5,12 +5,12 @@ const spinniesUtils_1 = require("../ui/spinniesUtils");
5
5
  const chalk_1 = require("chalk");
6
6
  const interpolation_1 = require("../interpolation");
7
7
  const ui_1 = require("../ui");
8
+ const index_1 = require("../ui/index");
8
9
  const { i18n } = require('../lang');
9
10
  const i18nKey = `lib.doctor.diagnosis`;
10
11
  class Diagnosis {
11
12
  prefixes;
12
13
  diagnosis;
13
- indentation = ' ';
14
14
  errorCount = 0;
15
15
  warningCount = 0;
16
16
  constructor({ diagnosticInfo, accountId }) {
@@ -29,6 +29,10 @@ class Diagnosis {
29
29
  header: i18n(`${i18nKey}.cliConfig.header`),
30
30
  sections: [],
31
31
  },
32
+ defaultAccountOverrideFile: {
33
+ header: i18n(`${i18nKey}.defaultAccountOverrideFile.header`),
34
+ sections: [],
35
+ },
32
36
  project: {
33
37
  header: i18n(`${i18nKey}.projectConfig.header`),
34
38
  subheaders: [
@@ -53,9 +57,6 @@ class Diagnosis {
53
57
  ];
54
58
  }
55
59
  }
56
- indent(level) {
57
- return this.indentation.repeat(level);
58
- }
59
60
  getErrorCount() {
60
61
  return this.errorCount;
61
62
  }
@@ -71,6 +72,9 @@ class Diagnosis {
71
72
  addCLIConfigSection(section) {
72
73
  this.diagnosis.cliConfig.sections.push(section);
73
74
  }
75
+ addDefaultAccountOverrideFileSection(section) {
76
+ this.diagnosis.defaultAccountOverrideFile.sections.push(section);
77
+ }
74
78
  toString() {
75
79
  const output = [];
76
80
  for (const value of Object.values(this.diagnosis)) {
@@ -108,9 +112,9 @@ class Diagnosis {
108
112
  else if (section.type === 'warning') {
109
113
  this.warningCount++;
110
114
  }
111
- output.push(`${this.indent(1)}${this.prefixes[section.type]} ${section.message}`);
115
+ output.push(`${(0, index_1.indent)(1)}${this.prefixes[section.type]} ${section.message}`);
112
116
  if (section.secondaryMessaging) {
113
- output.push(`${this.indent(2)}- ${section.secondaryMessaging}`);
117
+ output.push(`${(0, index_1.indent)(2)}- ${section.secondaryMessaging}`);
114
118
  }
115
119
  });
116
120
  return output.join('\n');
@@ -21,6 +21,7 @@ export interface DiagnosticInfo extends FilesInfo {
21
21
  npm: string | null;
22
22
  };
23
23
  config: string | null;
24
+ defaultAccountOverrideFile: string | null | undefined;
24
25
  configSettings: {
25
26
  [key: string]: unknown;
26
27
  };