Merge pull request #264 from HubSpot/js/migrate-LDL

Migrate VSCE to use local-dev-lib instead of cli-lib

.husky/pre-commit

@@ -1,5 +1,2 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
-
-node ./scripts/sanityCheckEnLyaml.js
-git add src/lang/en.lyaml

package.json

@@ -52,8 +52,8 @@
                 "path": "./snippets/auto_gen/hubl_expTests.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_required_page_template_variables.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_required_page_template_variables.json"
             },
             {
                 "language": "html-hubl",
@@ -84,24 +84,24 @@
                 "path": "./snippets/man_gen/hubl_required_email_template_variables.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_private_content_email_variables.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_private_content_email_variables.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_crm_object_dynamic_pages.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_crm_object_dynamic_pages.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_hubdb_variables.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_hubdb_variables.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_menu_node_variables.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_menu_node_variables.json"
             },
             {
-              "language": "html-hubl",
-              "path": "./snippets/man_gen/hubl_in_app_editor_and_preview_variables.json"
+                "language": "html-hubl",
+                "path": "./snippets/man_gen/hubl_in_app_editor_and_preview_variables.json"
             },
             {
                 "language": "html-hubl",
@@ -587,7 +587,7 @@
         ]
     },
     "dependencies": {
-        "@hubspot/cli-lib": "^4.1.8-beta.2",
+        "@hubspot/local-dev-lib": "^1.3.0",
         "dayjs": "^1.11.7",
         "findup-sync": "^5.0.0",
         "fs-extra": "^9.0.1",

src/extension.ts

@@ -7,7 +7,6 @@ import { registerCommands } from './lib/commands';
 import { registerEvents } from './lib/events';
 import { registerURIHandler } from './lib/uri';
 
-import { initializeCliLibLang } from './lib/lang';
 import { initializeCliLibLogger } from './lib/logger';
 import { initializeStatusBar } from './lib/statusBar';
 import { initializeProviders } from './lib/providers';
@@ -19,7 +18,6 @@ import { initializeGlobalState } from './lib/globalState';
 import { initializeHubLAutoDetect } from './lib/autoDetect';
 
 export const activate = async (context: ExtensionContext) => {
-  initializeCliLibLang();
   initializeCliLibLogger();
   await initializeTracking(context);
   await trackEvent(TRACKED_EVENTS.ACTIVATE);

src/lib/auth.ts

@@ -1,8 +1,13 @@
 import { commands } from 'vscode';
 import { COMMANDS, EVENTS } from './constants';
 
-const { findConfig, loadConfig, validateConfig } = require('@hubspot/cli-lib');
-const { setConfig, setConfigPath } = require('@hubspot/cli-lib/lib/config');
+const {
+  findConfig,
+  loadConfig,
+  validateConfig,
+  setConfig,
+  setConfigPath,
+} = require('@hubspot/local-dev-lib/config');
 
 const onLoadPath = (configPath: string) => {
   commands.executeCommand('setContext', 'hubspot.configPath', configPath);

src/lib/commands/config.ts

@@ -7,13 +7,13 @@ import { portalNameInvalid } from '../validation';
 import { trackEvent } from '../tracking';
 import { showAutoDismissedStatusBarMessage } from '../messaging';
 
-const { getConfig } = require('@hubspot/cli-lib');
+const { getConfig } = require('@hubspot/local-dev-lib/config');
 const {
   deleteAccount,
   deleteConfigFile,
   renameAccount,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 
 const showRenameAccountPrompt = (accountToRename: Portal) => {
   window

src/lib/commands/modules.ts

@@ -3,7 +3,7 @@ import { COMMANDS, TRACKED_EVENTS } from '../constants';
 import { onClickCreateFolder } from '../fileHelpers';
 import { trackEvent } from '../tracking';
 
-const { createModule } = require('@hubspot/cli-lib/modules');
+const { createModule } = require('@hubspot/local-dev-lib/cms/modules');
 
 export const registerCommands = (context: ExtensionContext) => {
   context.subscriptions.push(

src/lib/commands/remoteFs.ts

@@ -6,16 +6,20 @@ import { buildStatusBarItem, getRootPath } from '../helpers';
 import { invalidateParentDirectoryCache } from '../helpers';
 import { trackEvent } from '../tracking';
 
-const { deleteFile } = require('@hubspot/cli-lib/api/fileMapper');
-const { downloadFileOrFolder } = require('@hubspot/cli-lib/fileMapper');
-const { getPortalId } = require('@hubspot/cli-lib');
-const { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
-const { isAllowedExtension } = require('@hubspot/cli-lib/path');
-const { upload } = require('@hubspot/cli-lib/api/fileMapper');
-const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
-const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
-const { walk } = require('@hubspot/cli-lib/lib/walk');
+const { deleteFile, upload } = require('@hubspot/local-dev-lib/api/fileMapper');
+const { downloadFileOrFolder } = require('@hubspot/local-dev-lib/fileMapper');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
+const {
+  validateSrcAndDestPaths,
+} = require('@hubspot/local-dev-lib/cms/modules');
+const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
+const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
+const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
+const {
+  uploadFolder,
+  hasUploadErrors,
+} = require('@hubspot/local-dev-lib/cms/uploadFolder');
+const { walk } = require('@hubspot/local-dev-lib/fs');
 
 export const registerCommands = (context: ExtensionContext) => {
   context.subscriptions.push(
@@ -62,7 +66,7 @@ export const registerCommands = (context: ExtensionContext) => {
         downloadingStatus.show();
         trackEvent(TRACKED_EVENTS.REMOTE_FS.FETCH);
         await downloadFileOrFolder({
-          accountId: getPortalId(),
+          accountId: getAccountId(),
           src: remoteFilePath,
           dest: localFilePath,
           options: {
@@ -92,7 +96,7 @@ export const registerCommands = (context: ExtensionContext) => {
         trackEvent(TRACKED_EVENTS.REMOTE_FS.DELETE);
         const deletingStatus = buildStatusBarItem(`Deleting...`);
         deletingStatus.show();
-        deleteFile(getPortalId(), filePath)
+        deleteFile(getAccountId(), filePath)
           .then(() => {
             window.showInformationMessage(`Successfully deleted "${filePath}"`);
             invalidateParentDirectoryCache(filePath);
@@ -235,7 +239,7 @@ const handleFileUpload = async (srcPath: string, destPath: string) => {
     return;
   }
   trackEvent(TRACKED_EVENTS.REMOTE_FS.UPLOAD_FILE);
-  upload(getPortalId(), srcPath, destPath)
+  upload(getAccountId(), srcPath, destPath)
     .then(() => {
       window.showInformationMessage(
         `Uploading files to "${destPath}" was successful`
@@ -258,7 +262,7 @@ const handleFolderUpload = async (srcPath: string, destPath: string) => {
   );
   trackEvent(TRACKED_EVENTS.REMOTE_FS.UPLOAD_FOLDER);
   uploadFolder(
-    getPortalId(),
+    getAccountId(),
     srcPath,
     destPath,
     {

src/lib/commands/serverless.ts

@@ -5,7 +5,7 @@ import { basename, dirname, join, parse } from 'path';
 import { trackEvent } from '../tracking';
 
 const findup = require('findup-sync');
-const { createFunction } = require('@hubspot/cli-lib/functions');
+const { createFunction } = require('@hubspot/local-dev-lib/cms/functions');
 
 export const registerCommands = (context: ExtensionContext) => {
   context.subscriptions.push(

src/lib/commands/templates.ts

@@ -4,7 +4,7 @@ import { onClickCreateFile } from '../fileHelpers';
 import { basename, dirname } from 'path';
 import { trackEvent } from '../tracking';
 
-const { createTemplate } = require('@hubspot/cli-lib/templates');
+const { createTemplate } = require('@hubspot/local-dev-lib/cms/templates');
 
 export const registerCommands = (context: ExtensionContext) => {
   context.subscriptions.push(

src/lib/logger.ts

@@ -1,6 +1,6 @@
 import { window } from 'vscode';
 
-const { setLogger } = require('@hubspot/cli-lib/logger');
+const { setLogger } = require('@hubspot/local-dev-lib/logger');
 
 class Logger {
   error(...args: any[]) {

src/lib/providers/remoteFileProvider.ts

@@ -1,6 +1,6 @@
 import { TextDocumentContentProvider, EventEmitter, Uri } from 'vscode';
-const { download } = require('@hubspot/cli-lib/api/fileMapper');
-const { getPortalId } = require('@hubspot/cli-lib');
+const { download } = require('@hubspot/local-dev-lib/api/fileMapper');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 
 export const RemoteFileProvider = new (class
   implements TextDocumentContentProvider
@@ -13,7 +13,7 @@ export const RemoteFileProvider = new (class
     // filepath must be de-encoded since it gets reencoded by download in cli-lib
     const decodedFilePath = decodeURIComponent(filepath);
     try {
-      const file = await download(getPortalId(), decodedFilePath);
+      const file = await download(getAccountId(), decodedFilePath);
       return `[[ READONLY: @remote/${decodedFilePath} ]]\n` + file.source;
     } catch (e) {
       console.log(e);

src/lib/providers/remoteFsProvider.ts

@@ -15,10 +15,12 @@ import { trackEvent } from '../tracking';
 import { TRACKED_EVENTS } from '../constants';
 const {
   getDirectoryContentsByPath,
-} = require('@hubspot/cli-lib/api/fileMapper');
-const { getPortalId } = require('@hubspot/cli-lib');
-const { FOLDER_DOT_EXTENSIONS } = require('@hubspot/cli-lib/lib/constants');
-const { watch } = require('@hubspot/cli-lib/lib/watch');
+} = require('@hubspot/local-dev-lib/api/fileMapper');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
+const {
+  FOLDER_DOT_EXTENSIONS,
+} = require('@hubspot/local-dev-lib/constants/extensions');
+const { watch } = require('@hubspot/local-dev-lib/cms/watch');
 
 function isPathFolder(path: string) {
   const splitPath = path.split('/');
@@ -104,7 +106,7 @@ export class RemoteFsProvider implements TreeDataProvider<FileLink> {
         `Beginning initial upload of ${srcPath} to ${destPath}...`
       );
       this.currentWatcher = watch(
-        getPortalId(),
+        getAccountId(),
         srcPath,
         destPath,
         {
@@ -115,6 +117,7 @@ export class RemoteFsProvider implements TreeDataProvider<FileLink> {
           commandOptions: {},
           filePaths: filesToUpload,
         },
+        // postInitialUploadCallback
         (results: any) => {
           uploadingStatus.dispose();
           if (results.length > 0) {
@@ -129,6 +132,18 @@ export class RemoteFsProvider implements TreeDataProvider<FileLink> {
             `Finished initial upload of ${srcPath} to ${destPath}! Now watching for changes.`
           );
           invalidateParentDirectoryCache(destPath);
+        },
+        // onUploadFolderError
+        (error: any) => {
+          uploadingStatus.dispose();
+          window.showErrorMessage(`Upload folder error: ${error}`);
+        },
+        // onQueueAddError
+        null,
+        // onUploadFileError
+        (error: any) => {
+          uploadingStatus.dispose();
+          window.showErrorMessage(`Upload file error: ${error}`);
         }
       );
       this.currentWatcher.on('raw', (event: any, path: any, details: any) => {
@@ -163,7 +178,7 @@ export class RemoteFsProvider implements TreeDataProvider<FileLink> {
     let directoryContents: any = this.remoteFsCache.get(remoteDirectory);
     if (directoryContents === undefined) {
       directoryContents = await getDirectoryContentsByPath(
-        getPortalId(),
+        getAccountId(),
         remoteDirectory
       );
       // Default content wasn't originally in this endpoint and so doesn't show up unless manually queried

src/lib/providers/treedata/accounts.ts

@@ -9,7 +9,7 @@ import {
 import { getDisplayedHubspotPortalInfo } from '../../helpers';
 import { HubspotConfig, Portal } from '../../types';
 
-const { getConfig } = require('@hubspot/cli-lib');
+const { getConfig } = require('@hubspot/local-dev-lib/config');
 
 const isDefaultPortal = (portal: Portal, config: HubspotConfig) => {
   return (

src/lib/statusBar.ts

@@ -7,7 +7,7 @@ import {
 } from 'vscode';
 import { COMMANDS } from './constants';
 
-const { getConfig } = require('@hubspot/cli-lib');
+const { getConfig } = require('@hubspot/local-dev-lib/config');
 
 let hsStatusBar: StatusBarItem;
 

src/lib/tracking.ts

@@ -6,8 +6,8 @@ const {
   getAccountId,
   isTrackingAllowed,
   getAccountConfig,
-} = require('@hubspot/cli-lib');
-const { trackUsage } = require('@hubspot/cli-lib/api/fileMapper');
+} = require('@hubspot/local-dev-lib/config');
+const { trackUsage } = require('@hubspot/local-dev-lib/trackUsage');
 
 const vscodeTelemetryDocsUrl =
   'https://code.visualstudio.com/docs/getstarted/telemetry';

src/lib/types.ts

@@ -42,18 +42,6 @@ export function instanceOfCommand(object: any): object is Command {
   return 'title' in object && 'command' in object;
 }
 
-export interface HubLValidationError {
-  reason: string;
-  message: string;
-  lineno: number;
-  startPosition: number;
-  categoryErrors: {
-    fullName?: string;
-    path?: string;
-  };
-  category: string;
-}
-
 export interface FileLink {
   label: string;
   path: string;