@hubspot/local-dev-lib 3.1.2 → 3.1.3-beta.0

package/lib/cms/functions.js

@@ -137,7 +137,8 @@ async function createFunction(functionInfo, dest, options = {}) {
             functionFilePath,
         }));
     }
-    await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', 'functions/sample-function.js', functionFilePath);
+    const result = await (0, github_1.fetchFileFromRepository)('HubSpot/cms-sample-assets', 'functions/sample-function.js', 'main');
+    fs_extra_1.default.writeFileSync(functionFilePath, result);
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createFunction.createdFunctionFile`, {
         path: functionFilePath,
     }));

package/lib/cms/modules.js

@@ -139,25 +139,16 @@ async function createModule(moduleDefinition, name, dest, getInternalVersion, op
         path: destPath,
     }));
     // Filter out certain fetched files from the response
-    const moduleFileFilter = (src, dest) => {
+    const moduleFileFilter = (src) => {
         const emailEnabled = moduleDefinition.contentTypes.includes('EMAIL');
         switch (path_1.default.basename(src)) {
             case 'meta.json':
-                fs_extra_1.default.writeJSONSync(dest, moduleMetaData, { spaces: 2 }); // writing a meta.json file to standard HubL modules
                 return false;
             case 'module.js':
             case 'module.css':
-                if (emailEnabled) {
-                    return false;
-                }
-                return true;
+                return !emailEnabled;
             case 'global-sample-react-module.css':
-            case 'stories':
-            case 'tests':
-                if (getInternalVersion) {
-                    return true;
-                }
-                return false;
+                return getInternalVersion;
             default:
                 return true;
         }
@@ -166,7 +157,27 @@ async function createModule(moduleDefinition, name, dest, getInternalVersion, op
     const sampleAssetPath = !isReactModule
         ? 'Sample.module'
         : 'SampleReactModule';
-    await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', `modules/${sampleAssetPath}`, destPath, '', moduleFileFilter);
+    const sourceDir = `modules/${sampleAssetPath}`;
+    await (0, github_1.cloneGithubRepo)('HubSpot/cms-sample-assets', destPath, {
+        sourceDir,
+    });
+    const files = await (0, fs_1.walk)(destPath);
+    files
+        .filter(filePath => !moduleFileFilter(filePath))
+        .forEach(filePath => {
+        fs_extra_1.default.unlinkSync(filePath);
+    });
+    if (!getInternalVersion) {
+        fs_extra_1.default.removeSync(path_1.default.join(destPath, 'stories'));
+        fs_extra_1.default.removeSync(path_1.default.join(destPath, 'tests'));
+    }
+    // Get and write the metafiles
+    const metaFiles = files.filter(filePath => path_1.default.basename(filePath) === 'meta.json');
+    metaFiles.forEach(metaFile => {
+        fs_extra_1.default.writeJSONSync(metaFile, moduleMetaData, {
+            spaces: 2,
+        });
+    });
     // Updating React module files after fetch
     if (isReactModule) {
         await updateFileContents(`${destPath}/index.tsx`, moduleMetaData, getInternalVersion);
@@ -178,7 +189,9 @@ async function retrieveDefaultModule(name, dest) {
         const defaultReactModules = await (0, github_1.listGithubRepoContents)('HubSpot/cms-react', 'default-react-modules/src/components/modules/', 'dir');
         return defaultReactModules;
     }
-    await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-react', `default-react-modules/src/components/modules/${name}`, dest);
+    await (0, github_1.cloneGithubRepo)('HubSpot/cms-react', dest, {
+        sourceDir: `default-react-modules/src/components/modules/${name}`,
+    });
 }
 exports.retrieveDefaultModule = retrieveDefaultModule;
 const MODULE_HTML_EXTENSION_REGEX = new RegExp(/\.module(?:\/|\\)module\.html$/);

package/lib/cms/templates.js

@@ -60,7 +60,9 @@ async function createTemplate(name, dest, type = 'page-template', options = { al
     logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.createTemplate.creatingFile`, {
         path: filePath,
     }));
-    await (0, github_1.downloadGithubRepoContents)('HubSpot/cms-sample-assets', assetPath, filePath);
+    await (0, github_1.cloneGithubRepo)('HubSpot/cms-sample-assets', filePath, {
+        sourceDir: assetPath,
+    });
 }
 exports.createTemplate = createTemplate;
 exports.TEMPLATE_TYPES = {

package/lib/github.d.ts

@@ -4,5 +4,9 @@ export declare function fetchFileFromRepository<T = Buffer>(repoPath: RepoPath,
 export declare function fetchReleaseData(repoPath: RepoPath, tag?: string): Promise<GithubReleaseData>;
 export declare function cloneGithubRepo(repoPath: RepoPath, dest: string, options?: CloneGithubRepoOptions): Promise<boolean>;
 export declare function fetchGitHubRepoContentFromDownloadUrl(dest: string, downloadUrl: string): Promise<void>;
+/**
+ * Writes files from a public repository to the destination folder
+  @deprecated - This method fetches all the files individually, which can hit rate limits for unauthorized requests. Use `cloneGithubRepo` instead.
+ */
 export declare function downloadGithubRepoContents(repoPath: RepoPath, contentPath: string, dest: string, ref?: string, filter?: (contentPiecePath: string, downloadPath: string) => boolean): Promise<void>;
 export declare function listGithubRepoContents(repoPath: RepoPath, contentPath: string, fileFilter?: 'file' | 'dir'): Promise<GithubRepoFile[]>;

package/lib/github.js

@@ -104,7 +104,10 @@ async function fetchGitHubRepoContentFromDownloadUrl(dest, downloadUrl) {
     fs_extra_1.default.outputFileSync(dest, fileContents);
 }
 exports.fetchGitHubRepoContentFromDownloadUrl = fetchGitHubRepoContentFromDownloadUrl;
-// Writes files from a public repository to the destination folder
+/**
+ * Writes files from a public repository to the destination folder
+  @deprecated - This method fetches all the files individually, which can hit rate limits for unauthorized requests. Use `cloneGithubRepo` instead.
+ */
 async function downloadGithubRepoContents(repoPath, contentPath, dest, ref, filter) {
     fs_extra_1.default.ensureDirSync(path_1.default.dirname(dest));
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "3.1.2",
+    "version": "3.1.3-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {