@hubspot/cli 7.7.21-experimental.1 → 7.7.22-experimental.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.
- package/api/__tests__/migrate.test.js +27 -29
- package/api/migrate.js +14 -22
- package/bin/cli.js +92 -97
- package/bin/hs +2 -2
- package/bin/hscms +2 -2
- package/bin/silenceErrors.js +1 -2
- package/commands/__tests__/account.test.js +29 -34
- package/commands/__tests__/auth.test.js +11 -16
- package/commands/__tests__/cms.test.js +15 -20
- package/commands/__tests__/config.test.js +14 -19
- package/commands/__tests__/create.test.js +10 -15
- package/commands/__tests__/customObject.test.js +14 -19
- package/commands/__tests__/doctor.test.js +43 -48
- package/commands/__tests__/feedback.test.js +7 -45
- package/commands/__tests__/fetch.test.js +29 -28
- package/commands/__tests__/filemanager.test.js +14 -19
- package/commands/__tests__/function.test.js +16 -21
- package/commands/__tests__/getStarted.test.js +45 -50
- package/commands/__tests__/hubdb.test.js +17 -22
- package/commands/__tests__/init.test.js +12 -17
- package/commands/__tests__/lint.test.js +13 -18
- package/commands/__tests__/list.test.js +18 -23
- package/commands/__tests__/logs.test.js +28 -27
- package/commands/__tests__/mcp.test.js +14 -19
- package/commands/__tests__/mv.test.js +14 -52
- package/commands/__tests__/open.test.js +13 -51
- package/commands/__tests__/project.test.js +44 -49
- package/commands/__tests__/remove.test.js +13 -51
- package/commands/__tests__/sandbox.test.js +14 -19
- package/commands/__tests__/secret.test.js +16 -21
- package/commands/__tests__/testAccount.test.js +16 -21
- package/commands/__tests__/theme.test.js +15 -20
- package/commands/account/__tests__/auth.test.js +11 -16
- package/commands/account/__tests__/clean.test.js +12 -17
- package/commands/account/__tests__/createOverride.test.js +10 -15
- package/commands/account/__tests__/info.test.js +11 -16
- package/commands/account/__tests__/list.test.js +11 -16
- package/commands/account/__tests__/remove.test.js +13 -18
- package/commands/account/__tests__/removeOverride.js +8 -13
- package/commands/account/__tests__/rename.test.js +15 -20
- package/commands/account/__tests__/use.test.js +10 -15
- package/commands/account/auth.d.ts +1 -1
- package/commands/account/auth.js +65 -67
- package/commands/account/clean.d.ts +1 -1
- package/commands/account/clean.js +55 -60
- package/commands/account/createOverride.d.ts +1 -1
- package/commands/account/createOverride.js +52 -57
- package/commands/account/info.d.ts +1 -1
- package/commands/account/info.js +33 -35
- package/commands/account/list.d.ts +1 -1
- package/commands/account/list.js +43 -45
- package/commands/account/remove.d.ts +1 -1
- package/commands/account/remove.js +37 -42
- package/commands/account/removeOverride.d.ts +1 -1
- package/commands/account/removeOverride.js +38 -43
- package/commands/account/rename.d.ts +1 -1
- package/commands/account/rename.js +18 -20
- package/commands/account/use.d.ts +1 -1
- package/commands/account/use.js +29 -31
- package/commands/account.d.ts +1 -1
- package/commands/account.js +23 -28
- package/commands/app/__tests__/migrate.test.js +29 -34
- package/commands/app/migrate.d.ts +2 -2
- package/commands/app/migrate.js +40 -43
- package/commands/app/secret/__tests__/add.test.js +6 -11
- package/commands/app/secret/__tests__/delete.test.js +6 -11
- package/commands/app/secret/__tests__/list.test.js +6 -11
- package/commands/app/secret/__tests__/update.test.js +6 -11
- package/commands/app/secret/add.d.ts +1 -1
- package/commands/app/secret/add.js +28 -30
- package/commands/app/secret/delete.d.ts +1 -1
- package/commands/app/secret/delete.js +34 -36
- package/commands/app/secret/list.d.ts +1 -1
- package/commands/app/secret/list.js +25 -27
- package/commands/app/secret/update.d.ts +1 -1
- package/commands/app/secret/update.js +32 -34
- package/commands/app/secret.d.ts +1 -1
- package/commands/app/secret.js +12 -17
- package/commands/app.d.ts +1 -1
- package/commands/app.js +6 -16
- package/commands/auth.d.ts +1 -1
- package/commands/auth.js +70 -72
- package/commands/cms/convertFields.d.ts +1 -1
- package/commands/cms/convertFields.js +34 -39
- package/commands/cms/getReactModule.d.ts +1 -1
- package/commands/cms/getReactModule.js +32 -37
- package/commands/cms/lighthouseScore.d.ts +1 -1
- package/commands/cms/lighthouseScore.js +67 -72
- package/commands/cms.d.ts +1 -1
- package/commands/cms.js +11 -16
- package/commands/completion.d.ts +1 -1
- package/commands/completion.js +10 -15
- package/commands/config/migrate.d.ts +1 -1
- package/commands/config/migrate.js +27 -32
- package/commands/config/set.d.ts +1 -1
- package/commands/config/set.js +23 -25
- package/commands/config.d.ts +1 -1
- package/commands/config.js +8 -13
- package/commands/create/api-sample.d.ts +1 -1
- package/commands/create/api-sample.js +28 -33
- package/commands/create/app.d.ts +1 -1
- package/commands/create/app.js +3 -5
- package/commands/create/function.d.ts +1 -1
- package/commands/create/function.js +9 -11
- package/commands/create/index.d.ts +1 -1
- package/commands/create/index.js +19 -24
- package/commands/create/module.d.ts +1 -1
- package/commands/create/module.js +12 -14
- package/commands/create/react-app.d.ts +1 -1
- package/commands/create/react-app.js +3 -5
- package/commands/create/template.d.ts +1 -1
- package/commands/create/template.js +12 -14
- package/commands/create/vue-app.d.ts +1 -1
- package/commands/create/vue-app.js +3 -5
- package/commands/create/webpack-serverless.d.ts +1 -1
- package/commands/create/webpack-serverless.js +3 -5
- package/commands/create/website-theme.d.ts +1 -1
- package/commands/create/website-theme.js +5 -7
- package/commands/create.d.ts +2 -2
- package/commands/create.js +30 -35
- package/commands/customObject/__tests__/create.test.js +13 -18
- package/commands/customObject/__tests__/schema.test.js +18 -23
- package/commands/customObject/create.d.ts +1 -1
- package/commands/customObject/create.js +28 -30
- package/commands/customObject/schema/__tests__/create.test.js +13 -18
- package/commands/customObject/schema/__tests__/delete.test.js +13 -18
- package/commands/customObject/schema/__tests__/fetch-all.test.js +13 -18
- package/commands/customObject/schema/__tests__/fetch.test.js +13 -18
- package/commands/customObject/schema/__tests__/list.test.js +13 -18
- package/commands/customObject/schema/__tests__/update.test.js +13 -18
- package/commands/customObject/schema/create.d.ts +1 -1
- package/commands/customObject/schema/create.js +28 -30
- package/commands/customObject/schema/delete.d.ts +1 -1
- package/commands/customObject/schema/delete.js +24 -26
- package/commands/customObject/schema/fetch-all.d.ts +1 -1
- package/commands/customObject/schema/fetch-all.js +22 -24
- package/commands/customObject/schema/fetch.d.ts +1 -1
- package/commands/customObject/schema/fetch.js +24 -26
- package/commands/customObject/schema/list.d.ts +1 -1
- package/commands/customObject/schema/list.js +13 -15
- package/commands/customObject/schema/update.d.ts +1 -1
- package/commands/customObject/schema/update.js +32 -34
- package/commands/customObject/schema.d.ts +1 -1
- package/commands/customObject/schema.js +17 -22
- package/commands/customObject.d.ts +1 -1
- package/commands/customObject.js +13 -18
- package/commands/doctor.d.ts +1 -1
- package/commands/doctor.js +28 -33
- package/commands/feedback.d.ts +1 -1
- package/commands/feedback.js +19 -24
- package/commands/fetch.d.ts +1 -1
- package/commands/fetch.js +28 -30
- package/commands/filemanager/__tests__/fetch.test.js +17 -22
- package/commands/filemanager/__tests__/upload.test.js +15 -20
- package/commands/filemanager/fetch.d.ts +1 -1
- package/commands/filemanager/fetch.js +23 -25
- package/commands/filemanager/upload.d.ts +1 -1
- package/commands/filemanager/upload.js +39 -44
- package/commands/filemanager.d.ts +1 -1
- package/commands/filemanager.js +8 -13
- package/commands/function/deploy.d.ts +1 -1
- package/commands/function/deploy.js +35 -40
- package/commands/function/list.d.ts +1 -1
- package/commands/function/list.js +24 -29
- package/commands/function/server.d.ts +1 -1
- package/commands/function/server.js +15 -17
- package/commands/function.d.ts +1 -1
- package/commands/function.js +12 -18
- package/commands/getStarted.d.ts +1 -1
- package/commands/getStarted.js +119 -125
- package/commands/hubdb/__tests__/clear.test.js +13 -18
- package/commands/hubdb/__tests__/create.test.js +13 -18
- package/commands/hubdb/__tests__/delete.test.js +13 -18
- package/commands/hubdb/__tests__/fetch.test.js +13 -18
- package/commands/hubdb/__tests__/list.test.js +23 -28
- package/commands/hubdb/clear.d.ts +1 -1
- package/commands/hubdb/clear.js +20 -22
- package/commands/hubdb/create.d.ts +1 -1
- package/commands/hubdb/create.js +30 -35
- package/commands/hubdb/delete.d.ts +1 -1
- package/commands/hubdb/delete.js +24 -26
- package/commands/hubdb/fetch.d.ts +1 -1
- package/commands/hubdb/fetch.js +17 -19
- package/commands/hubdb/list.d.ts +1 -1
- package/commands/hubdb/list.js +33 -35
- package/commands/hubdb.d.ts +1 -1
- package/commands/hubdb.js +18 -24
- package/commands/init.d.ts +1 -1
- package/commands/init.js +83 -88
- package/commands/lint.d.ts +1 -1
- package/commands/lint.js +24 -26
- package/commands/list.d.ts +1 -1
- package/commands/list.js +32 -37
- package/commands/logs.d.ts +1 -1
- package/commands/logs.js +35 -37
- package/commands/mcp/__tests__/setup.test.js +7 -12
- package/commands/mcp/__tests__/start.test.js +7 -12
- package/commands/mcp/setup.d.ts +1 -1
- package/commands/mcp/setup.js +17 -19
- package/commands/mcp/start.d.ts +1 -1
- package/commands/mcp/start.js +29 -34
- package/commands/mcp.d.ts +1 -1
- package/commands/mcp.js +7 -12
- package/commands/module/marketplace-validate.d.ts +1 -1
- package/commands/module/marketplace-validate.js +21 -26
- package/commands/module.d.ts +1 -1
- package/commands/module.js +7 -13
- package/commands/mv.d.ts +1 -1
- package/commands/mv.js +20 -22
- package/commands/open.d.ts +1 -1
- package/commands/open.js +19 -21
- package/commands/project/__tests__/add.test.js +10 -15
- package/commands/project/__tests__/create.test.js +14 -19
- package/commands/project/__tests__/deploy.test.js +96 -134
- package/commands/project/__tests__/devUnifiedFlow.test.js +133 -139
- package/commands/project/__tests__/download.test.js +14 -19
- package/commands/project/__tests__/installDeps.test.js +32 -70
- package/commands/project/__tests__/listBuilds.test.js +14 -19
- package/commands/project/__tests__/logs.test.js +56 -94
- package/commands/project/__tests__/migrate.test.js +25 -30
- package/commands/project/__tests__/migrateApp.test.js +17 -22
- package/commands/project/__tests__/open.test.js +16 -21
- package/commands/project/__tests__/profile.test.js +14 -19
- package/commands/project/__tests__/upload.test.js +18 -23
- package/commands/project/__tests__/watch.test.js +14 -19
- package/commands/project/add.d.ts +1 -1
- package/commands/project/add.js +34 -36
- package/commands/project/cloneApp.d.ts +1 -1
- package/commands/project/cloneApp.js +67 -72
- package/commands/project/create.d.ts +2 -2
- package/commands/project/create.js +63 -68
- package/commands/project/deploy.d.ts +1 -1
- package/commands/project/deploy.js +67 -69
- package/commands/project/dev/deprecatedFlow.d.ts +2 -2
- package/commands/project/dev/deprecatedFlow.js +52 -58
- package/commands/project/dev/index.d.ts +1 -1
- package/commands/project/dev/index.js +44 -47
- package/commands/project/dev/unifiedFlow.d.ts +3 -3
- package/commands/project/dev/unifiedFlow.js +62 -68
- package/commands/project/download.d.ts +1 -1
- package/commands/project/download.js +35 -40
- package/commands/project/installDeps.d.ts +1 -1
- package/commands/project/installDeps.js +29 -34
- package/commands/project/listBuilds.d.ts +1 -1
- package/commands/project/listBuilds.js +40 -45
- package/commands/project/logs.d.ts +1 -1
- package/commands/project/logs.js +52 -54
- package/commands/project/migrate.d.ts +1 -1
- package/commands/project/migrate.js +24 -26
- package/commands/project/migrateApp.d.ts +2 -2
- package/commands/project/migrateApp.js +18 -20
- package/commands/project/open.d.ts +1 -1
- package/commands/project/open.js +25 -30
- package/commands/project/profile/add.d.ts +1 -1
- package/commands/project/profile/add.js +68 -73
- package/commands/project/profile/delete.d.ts +1 -1
- package/commands/project/profile/delete.js +51 -56
- package/commands/project/profile.d.ts +1 -1
- package/commands/project/profile.js +9 -14
- package/commands/project/upload.d.ts +1 -1
- package/commands/project/upload.js +50 -55
- package/commands/project/validate.d.ts +1 -1
- package/commands/project/validate.js +35 -40
- package/commands/project/watch.d.ts +1 -1
- package/commands/project/watch.js +59 -61
- package/commands/project.d.ts +1 -1
- package/commands/project.js +38 -43
- package/commands/remove.d.ts +1 -1
- package/commands/remove.js +15 -17
- package/commands/sandbox/__tests__/create.test.js +15 -20
- package/commands/sandbox/__tests__/delete.test.js +15 -20
- package/commands/sandbox/create.d.ts +1 -1
- package/commands/sandbox/create.js +67 -69
- package/commands/sandbox/delete.d.ts +1 -1
- package/commands/sandbox/delete.js +94 -96
- package/commands/sandbox.d.ts +1 -1
- package/commands/sandbox.js +9 -14
- package/commands/secret/__tests__/addSecret.test.js +13 -18
- package/commands/secret/__tests__/deleteSecret.test.js +13 -18
- package/commands/secret/__tests__/listSecret.test.js +13 -18
- package/commands/secret/__tests__/updateSecret.test.js +13 -18
- package/commands/secret/addSecret.d.ts +1 -1
- package/commands/secret/addSecret.js +26 -28
- package/commands/secret/deleteSecret.d.ts +1 -1
- package/commands/secret/deleteSecret.js +27 -29
- package/commands/secret/listSecret.d.ts +1 -1
- package/commands/secret/listSecret.js +19 -21
- package/commands/secret/updateSecret.d.ts +1 -1
- package/commands/secret/updateSecret.js +25 -27
- package/commands/secret.d.ts +1 -1
- package/commands/secret.js +13 -18
- package/commands/testAccount/__tests__/create.test.js +17 -22
- package/commands/testAccount/__tests__/createConfig.test.js +6 -11
- package/commands/testAccount/__tests__/delete.test.js +15 -20
- package/commands/testAccount/create.d.ts +1 -1
- package/commands/testAccount/create.js +45 -53
- package/commands/testAccount/createConfig.d.ts +1 -1
- package/commands/testAccount/createConfig.js +36 -41
- package/commands/testAccount/delete.d.ts +1 -1
- package/commands/testAccount/delete.js +17 -19
- package/commands/testAccount.d.ts +1 -1
- package/commands/testAccount.js +10 -15
- package/commands/theme/__tests__/generate-selectors.test.js +7 -12
- package/commands/theme/__tests__/marketplace-validate.test.js +14 -19
- package/commands/theme/__tests__/preview.test.js +12 -17
- package/commands/theme/generate-selectors.d.ts +1 -1
- package/commands/theme/generate-selectors.js +23 -28
- package/commands/theme/marketplace-validate.d.ts +1 -1
- package/commands/theme/marketplace-validate.js +19 -24
- package/commands/theme/preview.d.ts +1 -1
- package/commands/theme/preview.js +60 -65
- package/commands/theme.d.ts +1 -1
- package/commands/theme.js +11 -16
- package/commands/upload.d.ts +1 -1
- package/commands/upload.js +77 -82
- package/commands/watch.d.ts +1 -1
- package/commands/watch.js +45 -51
- package/lang/en.d.ts +0 -22
- package/lang/en.js +371 -399
- package/lib/__tests__/accountTypes.test.js +20 -22
- package/lib/__tests__/buildAccount.test.js +28 -63
- package/lib/__tests__/commonOpts.test.js +20 -22
- package/lib/__tests__/dependencyManagement.test.js +46 -51
- package/lib/__tests__/developerTestAccounts.test.js +27 -62
- package/lib/__tests__/hasFeature.test.js +6 -8
- package/lib/__tests__/npm.test.js +15 -20
- package/lib/__tests__/oauth.test.js +23 -28
- package/lib/__tests__/parsing.test.js +18 -20
- package/lib/__tests__/polling.test.js +24 -26
- package/lib/__tests__/process.test.js +14 -19
- package/lib/__tests__/projectProfiles.test.js +34 -39
- package/lib/__tests__/sandboxSync.test.js +30 -35
- package/lib/__tests__/sandboxes.test.js +29 -31
- package/lib/__tests__/serverlessLogs.test.js +8 -13
- package/lib/__tests__/usageTracking.test.js +33 -34
- package/lib/__tests__/validation.test.js +18 -20
- package/lib/__tests__/yargsUtils.test.js +6 -41
- package/lib/accountTypes.js +24 -34
- package/lib/app/__tests__/migrate.test.js +94 -99
- package/lib/app/__tests__/migrate_legacy.test.js +29 -31
- package/lib/app/migrate.d.ts +3 -3
- package/lib/app/migrate.js +127 -145
- package/lib/app/migrate_legacy.d.ts +1 -1
- package/lib/app/migrate_legacy.js +72 -78
- package/lib/app/urls.js +5 -9
- package/lib/buildAccount.d.ts +1 -1
- package/lib/buildAccount.js +71 -80
- package/lib/commonOpts.d.ts +1 -1
- package/lib/commonOpts.js +42 -59
- package/lib/configMigrate.js +34 -38
- package/lib/configOptions.js +34 -40
- package/lib/constants.js +31 -34
- package/lib/customObject.js +2 -6
- package/lib/dependencyManagement.js +37 -45
- package/lib/developerTestAccounts.d.ts +1 -1
- package/lib/developerTestAccounts.js +34 -39
- package/lib/doctor/Diagnosis.d.ts +1 -1
- package/lib/doctor/Diagnosis.js +25 -29
- package/lib/doctor/DiagnosticInfoBuilder.d.ts +1 -1
- package/lib/doctor/DiagnosticInfoBuilder.js +30 -37
- package/lib/doctor/Doctor.d.ts +1 -1
- package/lib/doctor/Doctor.js +94 -101
- package/lib/doctor/__tests__/Diagnosis.test.js +9 -14
- package/lib/doctor/__tests__/DiagnosticInfoBuilder.test.js +29 -34
- package/lib/doctor/__tests__/Doctor.test.js +24 -26
- package/lib/enums/exitCodes.js +1 -4
- package/lib/errorHandlers/index.js +32 -41
- package/lib/errorHandlers/suppressError.d.ts +1 -1
- package/lib/errorHandlers/suppressError.js +28 -31
- package/lib/filesystem.js +8 -15
- package/lib/generateSelectors.js +18 -29
- package/lib/hasFeature.d.ts +1 -1
- package/lib/hasFeature.js +3 -6
- package/lib/interpolation.js +11 -18
- package/lib/lang.d.ts +1 -1
- package/lib/lang.js +22 -27
- package/lib/links.js +16 -24
- package/lib/marketplaceValidate.js +29 -39
- package/lib/mcp/setup.js +70 -82
- package/lib/middleware/__test__/configMiddleware.test.js +20 -55
- package/lib/middleware/__test__/gitMiddleware.test.js +7 -42
- package/lib/middleware/__test__/notificationsMiddleware.test.js +2 -4
- package/lib/middleware/__test__/requestMiddleware.test.js +6 -11
- package/lib/middleware/__test__/utils.test.js +9 -11
- package/lib/middleware/__test__/yargsChecksMiddleware.test.js +9 -44
- package/lib/middleware/autoUpdateMiddleware.js +33 -40
- package/lib/middleware/configMiddleware.js +36 -42
- package/lib/middleware/fireAlarmMiddleware.js +12 -18
- package/lib/middleware/gitMiddleware.js +5 -8
- package/lib/middleware/notificationsMiddleware.js +16 -23
- package/lib/middleware/requestMiddleware.js +4 -10
- package/lib/middleware/utils.js +1 -4
- package/lib/middleware/yargsChecksMiddleware.js +10 -13
- package/lib/npm.js +14 -23
- package/lib/oauth.js +29 -35
- package/lib/parsing.js +3 -6
- package/lib/polling.js +11 -15
- package/lib/process.js +11 -19
- package/lib/projectProfiles.d.ts +2 -2
- package/lib/projectProfiles.js +32 -42
- package/lib/projects/ProjectLogsManager.js +18 -21
- package/lib/projects/__tests__/AppDevModeInterface.test.js +140 -145
- package/lib/projects/__tests__/LocalDevProcess.test.js +68 -73
- package/lib/projects/__tests__/LocalDevWebsocketServer.test.js +32 -37
- package/lib/projects/__tests__/ProjectLogsManager.test.js +56 -58
- package/lib/projects/__tests__/buildAndDeploy.test.js +7 -9
- package/lib/projects/__tests__/components.test.js +9 -14
- package/lib/projects/__tests__/projects.test.js +35 -40
- package/lib/projects/__tests__/structure.test.js +43 -81
- package/lib/projects/add/__tests__/legacyAddComponent.test.js +26 -28
- package/lib/projects/add/__tests__/v3AddComponent.test.js +25 -30
- package/lib/projects/add/legacyAddComponent.d.ts +1 -1
- package/lib/projects/add/legacyAddComponent.js +24 -30
- package/lib/projects/add/v3AddComponent.d.ts +1 -1
- package/lib/projects/add/v3AddComponent.js +36 -42
- package/lib/projects/buildAndDeploy.d.ts +1 -1
- package/lib/projects/buildAndDeploy.js +88 -97
- package/lib/projects/components.js +19 -25
- package/lib/projects/config.d.ts +1 -1
- package/lib/projects/config.js +32 -41
- package/lib/projects/create/__tests__/legacy.test.js +22 -57
- package/lib/projects/create/__tests__/v3.test.js +5 -7
- package/lib/projects/create/index.d.ts +3 -3
- package/lib/projects/create/index.js +19 -22
- package/lib/projects/create/legacy.d.ts +1 -1
- package/lib/projects/create/legacy.js +25 -31
- package/lib/projects/create/v3.d.ts +3 -3
- package/lib/projects/create/v3.js +49 -59
- package/lib/projects/ensureProjectExists.js +31 -37
- package/lib/projects/localDev/AppDevModeInterface.d.ts +3 -3
- package/lib/projects/localDev/AppDevModeInterface.js +58 -60
- package/lib/projects/localDev/DevServerManager.d.ts +1 -1
- package/lib/projects/localDev/DevServerManager.js +22 -24
- package/lib/projects/localDev/DevServerManagerV2.d.ts +2 -2
- package/lib/projects/localDev/DevServerManagerV2.js +15 -20
- package/lib/projects/localDev/LocalDevLogger.d.ts +1 -1
- package/lib/projects/localDev/LocalDevLogger.js +59 -64
- package/lib/projects/localDev/LocalDevManager.d.ts +1 -1
- package/lib/projects/localDev/LocalDevManager.js +106 -111
- package/lib/projects/localDev/LocalDevProcess.d.ts +4 -4
- package/lib/projects/localDev/LocalDevProcess.js +25 -30
- package/lib/projects/localDev/LocalDevState.d.ts +3 -3
- package/lib/projects/localDev/LocalDevState.js +3 -5
- package/lib/projects/localDev/LocalDevWatcher.d.ts +1 -1
- package/lib/projects/localDev/LocalDevWatcher.js +6 -11
- package/lib/projects/localDev/LocalDevWebsocketServer.d.ts +1 -1
- package/lib/projects/localDev/LocalDevWebsocketServer.js +25 -27
- package/lib/projects/localDev/helpers.d.ts +3 -3
- package/lib/projects/localDev/helpers.js +156 -174
- package/lib/projects/structure.d.ts +4 -4
- package/lib/projects/structure.js +32 -78
- package/lib/projects/ui.js +10 -13
- package/lib/projects/upload.d.ts +2 -3
- package/lib/projects/upload.js +55 -65
- package/lib/projects/urls.js +14 -24
- package/lib/projects/watch.d.ts +1 -1
- package/lib/projects/watch.js +48 -54
- package/lib/prompts/__tests__/downloadProjectPrompt.test.js +9 -11
- package/lib/prompts/__tests__/projectsLogsPrompt.test.js +11 -16
- package/lib/prompts/accountNamePrompt.d.ts +1 -1
- package/lib/prompts/accountNamePrompt.js +26 -31
- package/lib/prompts/accountsPrompt.js +12 -15
- package/lib/prompts/cmsFieldPrompt.js +13 -19
- package/lib/prompts/createApiSamplePrompt.d.ts +1 -1
- package/lib/prompts/createApiSamplePrompt.js +9 -12
- package/lib/prompts/createDeveloperTestAccountConfigPrompt.d.ts +1 -1
- package/lib/prompts/createDeveloperTestAccountConfigPrompt.js +23 -26
- package/lib/prompts/createFunctionPrompt.js +17 -20
- package/lib/prompts/createModulePrompt.js +12 -15
- package/lib/prompts/createTemplatePrompt.js +5 -8
- package/lib/prompts/downloadProjectPrompt.js +17 -20
- package/lib/prompts/installAppPrompt.js +19 -26
- package/lib/prompts/personalAccessKeyPrompt.d.ts +2 -2
- package/lib/prompts/personalAccessKeyPrompt.js +40 -47
- package/lib/prompts/previewPrompt.js +15 -22
- package/lib/prompts/projectAddPrompt.d.ts +1 -1
- package/lib/prompts/projectAddPrompt.js +14 -18
- package/lib/prompts/projectDevTargetAccountPrompt.d.ts +1 -1
- package/lib/prompts/projectDevTargetAccountPrompt.js +48 -54
- package/lib/prompts/projectNameAndDestPrompt.d.ts +1 -1
- package/lib/prompts/projectNameAndDestPrompt.js +22 -29
- package/lib/prompts/projectNamePrompt.js +11 -14
- package/lib/prompts/projectsLogsPrompt.js +5 -8
- package/lib/prompts/promptUtils.d.ts +1 -1
- package/lib/prompts/promptUtils.js +17 -24
- package/lib/prompts/sandboxesPrompt.d.ts +1 -1
- package/lib/prompts/sandboxesPrompt.js +26 -30
- package/lib/prompts/secretPrompt.js +10 -15
- package/lib/prompts/selectAppPrompt.js +11 -14
- package/lib/prompts/selectHubDBTablePrompt.js +24 -30
- package/lib/prompts/selectProjectTemplatePrompt.d.ts +1 -1
- package/lib/prompts/selectProjectTemplatePrompt.js +10 -13
- package/lib/prompts/selectPublicAppForMigrationPrompt.js +22 -25
- package/lib/prompts/setAsDefaultAccountPrompt.js +13 -16
- package/lib/prompts/uploadPrompt.js +11 -17
- package/lib/sandboxSync.d.ts +1 -1
- package/lib/sandboxSync.js +58 -65
- package/lib/sandboxes.d.ts +1 -1
- package/lib/sandboxes.js +68 -76
- package/lib/schema.js +13 -20
- package/lib/serverlessLogs.js +45 -52
- package/lib/testUtils.js +4 -8
- package/lib/ui/SpinniesManager.d.ts +1 -1
- package/lib/ui/SpinniesManager.js +29 -34
- package/lib/ui/boxen.js +11 -14
- package/lib/ui/git.js +14 -20
- package/lib/ui/index.js +55 -73
- package/lib/ui/logger.js +10 -13
- package/lib/ui/serverlessFunctionLogs.js +14 -20
- package/lib/ui/spinniesUtils.js +24 -39
- package/lib/ui/supportHyperlinks.js +3 -6
- package/lib/ui/supportsColor.js +11 -17
- package/lib/ui/table.js +6 -13
- package/lib/upload.js +15 -21
- package/lib/usageTracking.js +35 -44
- package/lib/utils/hasFlag.js +2 -8
- package/lib/validation.js +48 -87
- package/lib/yargsUtils.d.ts +1 -1
- package/lib/yargsUtils.js +13 -16
- package/mcp-server/server.js +6 -8
- package/mcp-server/tools/index.js +13 -16
- package/mcp-server/tools/project/AddFeatureToProject.d.ts +1 -1
- package/mcp-server/tools/project/AddFeatureToProject.js +35 -39
- package/mcp-server/tools/project/CreateProjectTool.d.ts +1 -1
- package/mcp-server/tools/project/CreateProjectTool.js +46 -50
- package/mcp-server/tools/project/DeployProject.d.ts +1 -1
- package/mcp-server/tools/project/DeployProject.js +18 -22
- package/mcp-server/tools/project/GuidedWalkthroughTool.d.ts +1 -1
- package/mcp-server/tools/project/GuidedWalkthroughTool.js +21 -25
- package/mcp-server/tools/project/UploadProjectTools.d.ts +1 -1
- package/mcp-server/tools/project/UploadProjectTools.js +12 -19
- package/mcp-server/tools/project/ValidateProjectTool.d.ts +1 -1
- package/mcp-server/tools/project/ValidateProjectTool.js +13 -17
- package/mcp-server/tools/project/__tests__/AddFeatureToProject.test.js +12 -14
- package/mcp-server/tools/project/__tests__/CreateProjectTool.test.js +13 -15
- package/mcp-server/tools/project/__tests__/DeployProject.test.js +6 -8
- package/mcp-server/tools/project/__tests__/GuidedWalkthroughTool.test.js +4 -6
- package/mcp-server/tools/project/__tests__/UploadProjectTools.test.js +4 -6
- package/mcp-server/tools/project/__tests__/ValidateProjectTool.test.js +4 -6
- package/mcp-server/tools/project/constants.js +3 -9
- package/mcp-server/types.js +1 -5
- package/mcp-server/utils/__tests__/command.test.js +9 -11
- package/mcp-server/utils/__tests__/project.test.js +12 -17
- package/mcp-server/utils/command.d.ts +1 -1
- package/mcp-server/utils/command.js +4 -11
- package/mcp-server/utils/content.d.ts +1 -1
- package/mcp-server/utils/content.js +2 -6
- package/mcp-server/utils/project.js +8 -14
- package/mcp-server/utils/toolUsageTracking.js +11 -14
- package/package.json +15 -11
- package/types/Cms.d.ts +1 -1
- package/types/Cms.js +1 -2
- package/types/LocalDev.d.ts +4 -4
- package/types/LocalDev.js +1 -2
- package/types/ProjectComponents.d.ts +2 -2
- package/types/ProjectComponents.js +1 -2
- package/types/Projects.d.ts +1 -1
- package/types/Projects.js +2 -5
- package/types/Prompts.js +1 -2
- package/types/Sandboxes.js +1 -2
- package/types/Yargs.js +1 -2
- package/commands/app/__tests__/install.test.d.ts +0 -1
- package/commands/app/__tests__/install.test.js +0 -52
- package/commands/app/install.d.ts +0 -8
- package/commands/app/install.js +0 -127
|
@@ -1,38 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const exitCodes_1 = require("../enums/exitCodes");
|
|
12
|
-
const ui_1 = require("../ui");
|
|
13
|
-
const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
|
|
14
|
-
const index_2 = require("../errorHandlers/index");
|
|
15
|
-
const en_1 = require("../../lang/en");
|
|
16
|
-
const logger_1 = require("../ui/logger");
|
|
1
|
+
import { createProject, fetchProject, } from '@hubspot/local-dev-lib/api/projects';
|
|
2
|
+
import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
|
|
3
|
+
import { DEFAULT_POLLING_DELAY } from '../constants.js';
|
|
4
|
+
import { promptUser } from '../prompts/promptUtils.js';
|
|
5
|
+
import { EXIT_CODES } from '../enums/exitCodes.js';
|
|
6
|
+
import { uiAccountDescription } from '../ui/index.js';
|
|
7
|
+
import SpinniesManager from '../ui/SpinniesManager.js';
|
|
8
|
+
import { logError, ApiErrorContext } from '../errorHandlers/index.js';
|
|
9
|
+
import { lib } from '../../lang/en.js';
|
|
10
|
+
import { uiLogger } from '../ui/logger.js';
|
|
17
11
|
async function pollFetchProject(accountId, projectName) {
|
|
18
12
|
// Temporary solution for gating slowness. Retry on 403 statusCode
|
|
19
13
|
return new Promise((resolve, reject) => {
|
|
20
14
|
let pollCount = 0;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
text:
|
|
15
|
+
SpinniesManager.init();
|
|
16
|
+
SpinniesManager.add('pollFetchProject', {
|
|
17
|
+
text: lib.projects.pollFetchProject.checkingProject(uiAccountDescription(accountId)),
|
|
24
18
|
});
|
|
25
19
|
const pollInterval = setInterval(async () => {
|
|
26
20
|
try {
|
|
27
|
-
const response = await
|
|
21
|
+
const response = await fetchProject(accountId, projectName);
|
|
28
22
|
if (response && response.data) {
|
|
29
|
-
|
|
23
|
+
SpinniesManager.remove('pollFetchProject');
|
|
30
24
|
clearInterval(pollInterval);
|
|
31
25
|
resolve(response);
|
|
32
26
|
}
|
|
33
27
|
}
|
|
34
28
|
catch (err) {
|
|
35
|
-
if (
|
|
29
|
+
if (isSpecifiedError(err, {
|
|
36
30
|
statusCode: 403,
|
|
37
31
|
category: 'GATED',
|
|
38
32
|
subCategory: 'BuildPipelineErrorType.PORTAL_GATED',
|
|
@@ -41,30 +35,30 @@ async function pollFetchProject(accountId, projectName) {
|
|
|
41
35
|
pollCount += 1;
|
|
42
36
|
}
|
|
43
37
|
else {
|
|
44
|
-
|
|
38
|
+
SpinniesManager.remove('pollFetchProject');
|
|
45
39
|
clearInterval(pollInterval);
|
|
46
40
|
reject(err);
|
|
47
41
|
}
|
|
48
42
|
}
|
|
49
|
-
},
|
|
43
|
+
}, DEFAULT_POLLING_DELAY);
|
|
50
44
|
});
|
|
51
45
|
}
|
|
52
|
-
async function ensureProjectExists(accountId, projectName, { forceCreate = false, allowCreate = true, noLogs = false, withPolling = false, uploadCommand = false, } = {}) {
|
|
53
|
-
const accountIdentifier =
|
|
46
|
+
export async function ensureProjectExists(accountId, projectName, { forceCreate = false, allowCreate = true, noLogs = false, withPolling = false, uploadCommand = false, } = {}) {
|
|
47
|
+
const accountIdentifier = uiAccountDescription(accountId);
|
|
54
48
|
try {
|
|
55
49
|
const { data: project } = withPolling
|
|
56
50
|
? await pollFetchProject(accountId, projectName)
|
|
57
|
-
: await
|
|
51
|
+
: await fetchProject(accountId, projectName);
|
|
58
52
|
return { projectExists: !!project, project };
|
|
59
53
|
}
|
|
60
54
|
catch (err) {
|
|
61
|
-
if (
|
|
55
|
+
if (isSpecifiedError(err, { statusCode: 404 })) {
|
|
62
56
|
let shouldCreateProject = forceCreate;
|
|
63
57
|
if (allowCreate && !shouldCreateProject) {
|
|
64
58
|
const promptLangFunction = uploadCommand
|
|
65
|
-
?
|
|
66
|
-
:
|
|
67
|
-
const promptResult = await
|
|
59
|
+
? lib.projects.ensureProjectExists.createPromptUpload
|
|
60
|
+
: lib.projects.ensureProjectExists.createPrompt;
|
|
61
|
+
const promptResult = await promptUser([
|
|
68
62
|
{
|
|
69
63
|
name: 'shouldCreateProject',
|
|
70
64
|
message: promptLangFunction(projectName, accountIdentifier),
|
|
@@ -75,23 +69,23 @@ async function ensureProjectExists(accountId, projectName, { forceCreate = false
|
|
|
75
69
|
}
|
|
76
70
|
if (shouldCreateProject) {
|
|
77
71
|
try {
|
|
78
|
-
const { data: project } = await
|
|
79
|
-
|
|
72
|
+
const { data: project } = await createProject(accountId, projectName);
|
|
73
|
+
uiLogger.success(lib.projects.ensureProjectExists.createSuccess(projectName, accountIdentifier));
|
|
80
74
|
return { projectExists: true, project };
|
|
81
75
|
}
|
|
82
76
|
catch (err) {
|
|
83
|
-
|
|
77
|
+
logError(err, new ApiErrorContext({ accountId }));
|
|
84
78
|
return { projectExists: false };
|
|
85
79
|
}
|
|
86
80
|
}
|
|
87
81
|
else {
|
|
88
82
|
if (!noLogs) {
|
|
89
|
-
|
|
83
|
+
uiLogger.log(lib.projects.ensureProjectExists.notFound(projectName, accountIdentifier));
|
|
90
84
|
}
|
|
91
85
|
return { projectExists: false };
|
|
92
86
|
}
|
|
93
87
|
}
|
|
94
|
-
|
|
95
|
-
process.exit(
|
|
88
|
+
logError(err, new ApiErrorContext({ accountId }));
|
|
89
|
+
process.exit(EXIT_CODES.ERROR);
|
|
96
90
|
}
|
|
97
91
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AppIRNode } from '../../../types/ProjectComponents';
|
|
2
|
-
import LocalDevState from './LocalDevState';
|
|
3
|
-
import LocalDevLogger from './LocalDevLogger';
|
|
1
|
+
import { AppIRNode } from '../../../types/ProjectComponents.js';
|
|
2
|
+
import LocalDevState from './LocalDevState.js';
|
|
3
|
+
import LocalDevLogger from './LocalDevLogger.js';
|
|
4
4
|
type AppDevModeInterfaceConstructorOptions = {
|
|
5
5
|
localDevState: LocalDevState;
|
|
6
6
|
localDevLogger: LocalDevLogger;
|
|
@@ -1,21 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const urls_1 = require("../../app/urls");
|
|
18
|
-
const accountTypes_1 = require("../../accountTypes");
|
|
1
|
+
import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
|
|
2
|
+
import { fetchPublicAppsForPortal, fetchPublicAppProductionInstallCounts, installStaticAuthAppOnTestAccount, } from '@hubspot/local-dev-lib/api/appsDev';
|
|
3
|
+
import { DevModeUnifiedInterface as UIEDevModeInterface } from '@hubspot/ui-extensions-dev-server';
|
|
4
|
+
import { requestPorts } from '@hubspot/local-dev-lib/portManager';
|
|
5
|
+
import { getAccountConfig } from '@hubspot/local-dev-lib/config';
|
|
6
|
+
import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES, } from '../../constants.js';
|
|
7
|
+
import { EXIT_CODES } from '../../enums/exitCodes.js';
|
|
8
|
+
import { isAppIRNode } from '../../projects/structure.js';
|
|
9
|
+
import { uiLine } from '../../ui/index.js';
|
|
10
|
+
import { logError } from '../../errorHandlers/index.js';
|
|
11
|
+
import { installAppAutoPrompt, installAppBrowserPrompt, } from '../../prompts/installAppPrompt.js';
|
|
12
|
+
import { confirmPrompt } from '../../prompts/promptUtils.js';
|
|
13
|
+
import { lib } from '../../../lang/en.js';
|
|
14
|
+
import { uiLogger } from '../../ui/logger.js';
|
|
15
|
+
import { getOauthAppInstallUrl, getStaticAuthAppInstallUrl, } from '../../app/urls.js';
|
|
16
|
+
import { isDeveloperTestAccount, isSandbox } from '../../accountTypes.js';
|
|
19
17
|
class AppDevModeInterface {
|
|
20
18
|
localDevState;
|
|
21
19
|
localDevLogger;
|
|
@@ -27,15 +25,15 @@ class AppDevModeInterface {
|
|
|
27
25
|
if (!this.localDevState.targetProjectAccountId ||
|
|
28
26
|
!this.localDevState.projectConfig ||
|
|
29
27
|
!this.localDevState.projectDir) {
|
|
30
|
-
|
|
31
|
-
process.exit(
|
|
28
|
+
uiLogger.error(lib.LocalDevManager.failedToInitialize);
|
|
29
|
+
process.exit(EXIT_CODES.ERROR);
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
32
|
// Assumes only one app per project
|
|
35
33
|
get appNode() {
|
|
36
34
|
if (this._appNode === undefined) {
|
|
37
35
|
this._appNode =
|
|
38
|
-
Object.values(this.localDevState.projectNodes).find(
|
|
36
|
+
Object.values(this.localDevState.projectNodes).find(isAppIRNode) ||
|
|
39
37
|
null;
|
|
40
38
|
}
|
|
41
39
|
return this._appNode;
|
|
@@ -53,21 +51,21 @@ class AppDevModeInterface {
|
|
|
53
51
|
this.localDevState.setAppDataForUid(this.appNode.uid, appData);
|
|
54
52
|
}
|
|
55
53
|
isAutomaticallyInstallable() {
|
|
56
|
-
const targetTestingAccount =
|
|
54
|
+
const targetTestingAccount = getAccountConfig(this.localDevState.targetTestingAccountId);
|
|
57
55
|
if (!targetTestingAccount) {
|
|
58
56
|
return false;
|
|
59
57
|
}
|
|
60
|
-
const isTestAccount =
|
|
61
|
-
|
|
58
|
+
const isTestAccount = isDeveloperTestAccount(targetTestingAccount) ||
|
|
59
|
+
isSandbox(targetTestingAccount);
|
|
62
60
|
const hasCorrectParent = targetTestingAccount.parentAccountId ===
|
|
63
61
|
this.localDevState.targetProjectAccountId;
|
|
64
62
|
return (isTestAccount &&
|
|
65
63
|
hasCorrectParent &&
|
|
66
|
-
this.appNode?.config.auth.type ===
|
|
64
|
+
this.appNode?.config.auth.type === APP_AUTH_TYPES.STATIC);
|
|
67
65
|
}
|
|
68
66
|
async getAppInstallUrl() {
|
|
69
|
-
if (this.appNode?.config.auth.type ===
|
|
70
|
-
return
|
|
67
|
+
if (this.appNode?.config.auth.type === APP_AUTH_TYPES.OAUTH) {
|
|
68
|
+
return getOauthAppInstallUrl({
|
|
71
69
|
targetAccountId: this.localDevState.targetTestingAccountId,
|
|
72
70
|
env: this.localDevState.env,
|
|
73
71
|
clientId: this.appData.clientId, // This is only called after checking that appData exists
|
|
@@ -75,30 +73,30 @@ class AppDevModeInterface {
|
|
|
75
73
|
redirectUrls: this.appNode.config.auth.redirectUrls,
|
|
76
74
|
});
|
|
77
75
|
}
|
|
78
|
-
const { data: { results }, } = await
|
|
76
|
+
const { data: { results }, } = await fetchPublicAppsForPortal(this.localDevState.targetProjectAccountId);
|
|
79
77
|
const app = results.find(app => app.sourceId === this.appNode?.uid);
|
|
80
78
|
if (!app) {
|
|
81
|
-
|
|
82
|
-
process.exit(
|
|
79
|
+
uiLogger.error(lib.LocalDevManager.appNotFound(this.localDevState.targetProjectAccountId, this.appNode?.uid));
|
|
80
|
+
process.exit(EXIT_CODES.ERROR);
|
|
83
81
|
}
|
|
84
|
-
return
|
|
82
|
+
return getStaticAuthAppInstallUrl({
|
|
85
83
|
targetAccountId: this.localDevState.targetTestingAccountId,
|
|
86
84
|
env: this.localDevState.env,
|
|
87
85
|
appId: app.id,
|
|
88
86
|
});
|
|
89
87
|
}
|
|
90
88
|
async fetchAppData() {
|
|
91
|
-
const { data: { results: portalApps }, } = await
|
|
89
|
+
const { data: { results: portalApps }, } = await fetchPublicAppsForPortal(this.localDevState.targetProjectAccountId);
|
|
92
90
|
const appData = portalApps.find(({ sourceId }) => sourceId === this.appNode?.uid);
|
|
93
91
|
if (!appData) {
|
|
94
92
|
return;
|
|
95
93
|
}
|
|
96
|
-
const { data: { uniquePortalInstallCount }, } = await
|
|
94
|
+
const { data: { uniquePortalInstallCount }, } = await fetchPublicAppProductionInstallCounts(appData.id, this.localDevState.targetProjectAccountId);
|
|
97
95
|
this.appData = {
|
|
98
96
|
id: appData.id,
|
|
99
97
|
clientId: appData.clientId,
|
|
100
98
|
name: appData.name,
|
|
101
|
-
installationState:
|
|
99
|
+
installationState: APP_INSTALLATION_STATES.NOT_INSTALLED,
|
|
102
100
|
scopeGroupIds: appData.scopeGroupIds,
|
|
103
101
|
};
|
|
104
102
|
this.marketplaceAppInstalls = uniquePortalInstallCount;
|
|
@@ -107,61 +105,61 @@ class AppDevModeInterface {
|
|
|
107
105
|
if (!this.appData || !this.marketplaceAppInstalls) {
|
|
108
106
|
return;
|
|
109
107
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
const proceed = await
|
|
108
|
+
uiLine();
|
|
109
|
+
uiLogger.warn(lib.LocalDevManager.activeInstallWarning.installCount(this.appData.name, this.marketplaceAppInstalls));
|
|
110
|
+
uiLogger.log(lib.LocalDevManager.activeInstallWarning.explanation);
|
|
111
|
+
uiLine();
|
|
112
|
+
const proceed = await confirmPrompt(lib.LocalDevManager.activeInstallWarning.confirmationPrompt, { defaultAnswer: false });
|
|
115
113
|
if (!proceed) {
|
|
116
|
-
process.exit(
|
|
114
|
+
process.exit(EXIT_CODES.SUCCESS);
|
|
117
115
|
}
|
|
118
|
-
this.localDevLogger.addUploadWarning(
|
|
116
|
+
this.localDevLogger.addUploadWarning(lib.AppDevModeInterface.defaultMarketplaceAppWarning(this.marketplaceAppInstalls));
|
|
119
117
|
}
|
|
120
118
|
async autoInstallStaticAuthApp() {
|
|
121
|
-
const shouldInstall = await
|
|
119
|
+
const shouldInstall = await installAppAutoPrompt();
|
|
122
120
|
if (!shouldInstall) {
|
|
123
|
-
|
|
124
|
-
process.exit(
|
|
121
|
+
uiLogger.log(lib.AppDevModeInterface.autoInstallDeclined);
|
|
122
|
+
process.exit(EXIT_CODES.SUCCESS);
|
|
125
123
|
}
|
|
126
|
-
await
|
|
124
|
+
await installStaticAuthAppOnTestAccount(this.appData.id, this.localDevState.targetTestingAccountId, this.appData.scopeGroupIds);
|
|
127
125
|
}
|
|
128
126
|
async installAppOrOpenInstallUrl(isReinstall) {
|
|
129
127
|
if (this.isAutomaticallyInstallable()) {
|
|
130
128
|
try {
|
|
131
129
|
await this.autoInstallStaticAuthApp();
|
|
132
|
-
|
|
130
|
+
uiLogger.success(lib.AppDevModeInterface.autoInstallSuccess(this.appData.name, this.localDevState.targetTestingAccountId));
|
|
133
131
|
return;
|
|
134
132
|
}
|
|
135
133
|
catch (e) {
|
|
136
|
-
|
|
134
|
+
uiLogger.error(lib.AppDevModeInterface.autoInstallError(this.appData.name, this.localDevState.targetTestingAccountId));
|
|
137
135
|
}
|
|
138
136
|
}
|
|
139
137
|
const installUrl = await this.getAppInstallUrl();
|
|
140
|
-
await
|
|
138
|
+
await installAppBrowserPrompt(installUrl, isReinstall);
|
|
141
139
|
}
|
|
142
140
|
async checkTestAccountAppInstallation() {
|
|
143
141
|
if (!this.appNode || !this.appData) {
|
|
144
142
|
return {};
|
|
145
143
|
}
|
|
146
|
-
const { data: { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups }, } = await
|
|
144
|
+
const { data: { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups }, } = await fetchAppInstallationData(this.localDevState.targetTestingAccountId, this.localDevState.projectId, this.appNode.uid, this.appNode.config.auth.requiredScopes, this.appNode.config.auth.optionalScopes);
|
|
147
145
|
const isReinstall = previouslyAuthorizedScopeGroups.length > 0;
|
|
148
146
|
if (isInstalledWithScopeGroups) {
|
|
149
147
|
this.appData = {
|
|
150
148
|
...this.appData,
|
|
151
|
-
installationState:
|
|
149
|
+
installationState: APP_INSTALLATION_STATES.INSTALLED,
|
|
152
150
|
};
|
|
153
151
|
}
|
|
154
152
|
else if (isReinstall) {
|
|
155
153
|
this.appData = {
|
|
156
154
|
...this.appData,
|
|
157
|
-
installationState:
|
|
155
|
+
installationState: APP_INSTALLATION_STATES.INSTALLED_WITH_OUTDATED_SCOPES,
|
|
158
156
|
};
|
|
159
157
|
}
|
|
160
158
|
return { needsInstall: !isInstalledWithScopeGroups, isReinstall };
|
|
161
159
|
}
|
|
162
160
|
setUpLocalDevServerMessageListeners() {
|
|
163
161
|
this.localDevState.addListener('devServerMessage', message => {
|
|
164
|
-
if (message ===
|
|
162
|
+
if (message === LOCAL_DEV_SERVER_MESSAGE_TYPES.WEBSOCKET_SERVER_CONNECTED) {
|
|
165
163
|
this.checkTestAccountAppInstallation();
|
|
166
164
|
}
|
|
167
165
|
});
|
|
@@ -174,7 +172,7 @@ class AppDevModeInterface {
|
|
|
174
172
|
}
|
|
175
173
|
try {
|
|
176
174
|
await this.fetchAppData();
|
|
177
|
-
if (this.appNode.config.distribution ===
|
|
175
|
+
if (this.appNode.config.distribution === APP_DISTRIBUTION_TYPES.MARKETPLACE) {
|
|
178
176
|
await this.checkMarketplaceAppInstalls();
|
|
179
177
|
}
|
|
180
178
|
const { needsInstall, isReinstall } = await this.checkTestAccountAppInstallation();
|
|
@@ -183,33 +181,33 @@ class AppDevModeInterface {
|
|
|
183
181
|
}
|
|
184
182
|
}
|
|
185
183
|
catch (e) {
|
|
186
|
-
|
|
184
|
+
logError(e);
|
|
187
185
|
}
|
|
188
186
|
this.setUpLocalDevServerMessageListeners();
|
|
189
|
-
return
|
|
187
|
+
return UIEDevModeInterface.setup(args);
|
|
190
188
|
}
|
|
191
189
|
async start() {
|
|
192
190
|
if (!this.appNode) {
|
|
193
191
|
return;
|
|
194
192
|
}
|
|
195
|
-
return
|
|
193
|
+
return UIEDevModeInterface.start({
|
|
196
194
|
accountId: this.localDevState.targetTestingAccountId,
|
|
197
195
|
// @ts-expect-error TODO: reconcile types between CLI and UIE Dev Server
|
|
198
196
|
projectConfig: this.localDevState.projectConfig,
|
|
199
|
-
requestPorts
|
|
197
|
+
requestPorts,
|
|
200
198
|
});
|
|
201
199
|
}
|
|
202
200
|
async fileChange(filePath, event) {
|
|
203
201
|
if (!this.appNode) {
|
|
204
202
|
return;
|
|
205
203
|
}
|
|
206
|
-
return
|
|
204
|
+
return UIEDevModeInterface.fileChange(filePath, event);
|
|
207
205
|
}
|
|
208
206
|
async cleanup() {
|
|
209
207
|
if (!this.appNode) {
|
|
210
208
|
return;
|
|
211
209
|
}
|
|
212
|
-
return
|
|
210
|
+
return UIEDevModeInterface.cleanup();
|
|
213
211
|
}
|
|
214
212
|
}
|
|
215
|
-
|
|
213
|
+
export default AppDevModeInterface;
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const en_1 = require("../../../lang/en");
|
|
10
|
-
const logger_2 = require("../../ui/logger");
|
|
1
|
+
import { logger } from '@hubspot/local-dev-lib/logger';
|
|
2
|
+
import { DevModeInterface as UIEDevModeInterface } from '@hubspot/ui-extensions-dev-server';
|
|
3
|
+
import { startPortManagerServer, stopPortManagerServer, requestPorts, } from '@hubspot/local-dev-lib/portManager';
|
|
4
|
+
import { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } from '@hubspot/local-dev-lib/urls';
|
|
5
|
+
import { getAccountConfig } from '@hubspot/local-dev-lib/config';
|
|
6
|
+
import { ComponentTypes, } from '../../../types/Projects.js';
|
|
7
|
+
import { lib } from '../../../lang/en.js';
|
|
8
|
+
import { uiLogger } from '../../ui/logger.js';
|
|
11
9
|
const SERVER_KEYS = {
|
|
12
10
|
privateApp: 'privateApp',
|
|
13
11
|
publicApp: 'publicApp',
|
|
@@ -23,12 +21,12 @@ class DevServerManager {
|
|
|
23
21
|
this.componentsByType = {};
|
|
24
22
|
this.devServers = {
|
|
25
23
|
[SERVER_KEYS.privateApp]: {
|
|
26
|
-
componentType:
|
|
27
|
-
serverInterface:
|
|
24
|
+
componentType: ComponentTypes.PrivateApp,
|
|
25
|
+
serverInterface: UIEDevModeInterface,
|
|
28
26
|
},
|
|
29
27
|
[SERVER_KEYS.publicApp]: {
|
|
30
|
-
componentType:
|
|
31
|
-
serverInterface:
|
|
28
|
+
componentType: ComponentTypes.PublicApp,
|
|
29
|
+
serverInterface: UIEDevModeInterface,
|
|
32
30
|
},
|
|
33
31
|
};
|
|
34
32
|
}
|
|
@@ -42,7 +40,7 @@ class DevServerManager {
|
|
|
42
40
|
await callback(devServer.serverInterface, compatibleComponents);
|
|
43
41
|
}
|
|
44
42
|
else {
|
|
45
|
-
|
|
43
|
+
uiLogger.debug(lib.DevServerManager.noCompatibleComponents(serverKey));
|
|
46
44
|
}
|
|
47
45
|
}
|
|
48
46
|
}
|
|
@@ -60,20 +58,20 @@ class DevServerManager {
|
|
|
60
58
|
async setup({ components, onUploadRequired, accountId, setActiveApp, }) {
|
|
61
59
|
this.componentsByType = this.arrangeComponentsByType(components);
|
|
62
60
|
let env;
|
|
63
|
-
const accountConfig =
|
|
61
|
+
const accountConfig = getAccountConfig(accountId);
|
|
64
62
|
if (accountConfig) {
|
|
65
63
|
env = accountConfig.env;
|
|
66
64
|
}
|
|
67
|
-
await
|
|
65
|
+
await startPortManagerServer();
|
|
68
66
|
await this.iterateDevServers(async (serverInterface, compatibleComponents) => {
|
|
69
67
|
if (serverInterface.setup) {
|
|
70
68
|
await serverInterface.setup({
|
|
71
69
|
components: compatibleComponents,
|
|
72
70
|
onUploadRequired,
|
|
73
|
-
logger
|
|
71
|
+
logger,
|
|
74
72
|
urls: {
|
|
75
|
-
api:
|
|
76
|
-
web:
|
|
73
|
+
api: getHubSpotApiOrigin(env),
|
|
74
|
+
web: getHubSpotWebsiteOrigin(env),
|
|
77
75
|
},
|
|
78
76
|
setActiveApp,
|
|
79
77
|
});
|
|
@@ -88,13 +86,13 @@ class DevServerManager {
|
|
|
88
86
|
await serverInterface.start({
|
|
89
87
|
accountId,
|
|
90
88
|
projectConfig,
|
|
91
|
-
requestPorts
|
|
89
|
+
requestPorts,
|
|
92
90
|
});
|
|
93
91
|
}
|
|
94
92
|
});
|
|
95
93
|
}
|
|
96
94
|
else {
|
|
97
|
-
throw new Error(
|
|
95
|
+
throw new Error(lib.DevServerManager.notInitialized);
|
|
98
96
|
}
|
|
99
97
|
this.started = true;
|
|
100
98
|
}
|
|
@@ -114,9 +112,9 @@ class DevServerManager {
|
|
|
114
112
|
await serverInterface.cleanup();
|
|
115
113
|
}
|
|
116
114
|
});
|
|
117
|
-
await
|
|
115
|
+
await stopPortManagerServer();
|
|
118
116
|
}
|
|
119
117
|
}
|
|
120
118
|
}
|
|
121
119
|
const Manager = new DevServerManager();
|
|
122
|
-
|
|
120
|
+
export default Manager;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import LocalDevState from './LocalDevState';
|
|
2
|
-
import LocalDevLogger from './LocalDevLogger';
|
|
1
|
+
import LocalDevState from './LocalDevState.js';
|
|
2
|
+
import LocalDevLogger from './LocalDevLogger.js';
|
|
3
3
|
type DevServerManagerV2ConstructorOptions = {
|
|
4
4
|
localDevState: LocalDevState;
|
|
5
5
|
logger: LocalDevLogger;
|
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const portManager_1 = require("@hubspot/local-dev-lib/portManager");
|
|
8
|
-
const urls_1 = require("@hubspot/local-dev-lib/urls");
|
|
9
|
-
const config_1 = require("@hubspot/local-dev-lib/config");
|
|
10
|
-
const AppDevModeInterface_1 = __importDefault(require("./AppDevModeInterface"));
|
|
11
|
-
const en_1 = require("../../../lang/en");
|
|
1
|
+
import { logger } from '@hubspot/local-dev-lib/logger';
|
|
2
|
+
import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
|
|
3
|
+
import { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } from '@hubspot/local-dev-lib/urls';
|
|
4
|
+
import { getAccountConfig } from '@hubspot/local-dev-lib/config';
|
|
5
|
+
import AppDevModeInterface from './AppDevModeInterface.js';
|
|
6
|
+
import { lib } from '../../../lang/en.js';
|
|
12
7
|
class DevServerManagerV2 {
|
|
13
8
|
initialized;
|
|
14
9
|
started;
|
|
@@ -18,7 +13,7 @@ class DevServerManagerV2 {
|
|
|
18
13
|
this.initialized = false;
|
|
19
14
|
this.started = false;
|
|
20
15
|
this.localDevState = options.localDevState;
|
|
21
|
-
const AppsDevServer = new
|
|
16
|
+
const AppsDevServer = new AppDevModeInterface({
|
|
22
17
|
localDevState: options.localDevState,
|
|
23
18
|
localDevLogger: options.logger,
|
|
24
19
|
});
|
|
@@ -29,20 +24,20 @@ class DevServerManagerV2 {
|
|
|
29
24
|
}
|
|
30
25
|
async setup() {
|
|
31
26
|
let env;
|
|
32
|
-
const accountConfig =
|
|
27
|
+
const accountConfig = getAccountConfig(this.localDevState.targetTestingAccountId);
|
|
33
28
|
if (accountConfig) {
|
|
34
29
|
env = accountConfig.env;
|
|
35
30
|
}
|
|
36
|
-
await
|
|
31
|
+
await startPortManagerServer();
|
|
37
32
|
await this.iterateDevServers(async (serverInterface) => {
|
|
38
33
|
if (serverInterface.setup) {
|
|
39
34
|
// @TODO: In the future, update UIE Dev Server to use LocalDevState
|
|
40
35
|
await serverInterface.setup({
|
|
41
36
|
components: this.localDevState.projectNodes,
|
|
42
|
-
logger
|
|
37
|
+
logger,
|
|
43
38
|
urls: {
|
|
44
|
-
api:
|
|
45
|
-
web:
|
|
39
|
+
api: getHubSpotApiOrigin(env),
|
|
40
|
+
web: getHubSpotWebsiteOrigin(env),
|
|
46
41
|
},
|
|
47
42
|
});
|
|
48
43
|
}
|
|
@@ -58,7 +53,7 @@ class DevServerManagerV2 {
|
|
|
58
53
|
});
|
|
59
54
|
}
|
|
60
55
|
else {
|
|
61
|
-
throw new Error(
|
|
56
|
+
throw new Error(lib.DevServerManager.notInitialized);
|
|
62
57
|
}
|
|
63
58
|
this.started = true;
|
|
64
59
|
}
|
|
@@ -78,8 +73,8 @@ class DevServerManagerV2 {
|
|
|
78
73
|
await serverInterface.cleanup();
|
|
79
74
|
}
|
|
80
75
|
});
|
|
81
|
-
await
|
|
76
|
+
await stopPortManagerServer();
|
|
82
77
|
}
|
|
83
78
|
}
|
|
84
79
|
}
|
|
85
|
-
|
|
80
|
+
export default DevServerManagerV2;
|