@hubspot/project-parsing-lib 0.8.1-beta.0 → 0.8.2-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/project-parsing-lib",
-    "version": "0.8.1-beta.0",
+    "version": "0.8.2-beta.0",
     "description": "Parsing library for converting projects directory structures to their intermediate representation",
     "license": "Apache-2.0",
     "main": "src/index.js",

package/src/lang/copy.d.ts

@@ -33,6 +33,9 @@ export declare const errorMessages: {
         invalidJson: string;
         wrongDirectoryForComponent: (directory: string, componentType: string, componentMetadata: ComponentMetadata, correctDir: string) => string;
     };
+    migrateThemes: {
+        rootReactThemeNotSupported: string;
+    };
 };
 export declare function getInvalidJsonError(): string;
 export declare function getMissingTypeError(): string;

package/src/lang/copy.js

@@ -44,6 +44,9 @@ exports.errorMessages = {
         invalidJson: 'Invalid JSON',
         wrongDirectoryForComponent: (directory, componentType, componentMetadata, correctDir) => `The directory '${directory}' is incorrect for type '${componentType}'. ${componentMetadata.userFriendlyName} ${componentMetadata.userFriendlyTypePlural} should only be placed in the '${correctDir}' directory`,
     },
+    migrateThemes: {
+        rootReactThemeNotSupported: 'Migrating themes that live at the root of the project src directory is not supported. Please move the theme to a subdirectory.',
+    },
 };
 function getInvalidJsonError() {
     return exports.errorMessages.validation.invalidJson;

package/src/lib/files.d.ts

@@ -1,5 +1,5 @@
 import { FileParseResult, TranslationContext, HsProfileFile } from './types';
-type MetaFileLocation = {
+export type MetaFileLocation = {
     file: string;
     parentDirectory?: string;
 };
@@ -10,4 +10,3 @@ export declare function locateHsMetaFiles(projectSourceDir: string, options?: {
     silent: boolean;
 }): Promise<MetaFileLocation[]>;
 export declare function projectContainsHsMetaFiles(projectSourceDir: string): Promise<boolean>;
-export {};

package/src/lib/migrateThemes.d.ts

@@ -21,5 +21,6 @@ export declare function migrateThemes(projectDir: string, projectSourceDir: stri
     legacyThemeDetails: ThemeDetails[];
     legacyReactThemeDetails: ReactThemeDetails[];
     migrated: boolean;
+    failureReason?: string;
 }>;
 export {};

package/src/lib/migrateThemes.js

@@ -12,6 +12,7 @@ const util_1 = require("util");
 const fs_2 = require("@hubspot/local-dev-lib/fs");
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
+const copy_1 = require("../lang/copy");
 const mkdtempAsync = (0, util_1.promisify)(fs_1.default.mkdtemp);
 const LEGACY_THEME_CONFIG = 'theme.json';
 const LEGACY_REACT_THEME_CONFIG = 'cms-assets.json';
@@ -83,12 +84,25 @@ async function migrateThemes(projectDir, projectSourceDir) {
     const { legacyThemeDetails, legacyReactThemeDetails, } = await getProjectThemeDetails(projectSourceDir);
     // Migrate the project to a temporary directory to avoid file conflicts in the original project
     const migratedProjectTempDir = await mkdtempAsync(path_1.default.join(os_1.default.tmpdir(), 'hubspot-migrated-project-'));
+    let isRootReactThemeProject = false;
+    legacyReactThemeDetails.forEach(themeDetails => {
+        isRootReactThemeProject = themeDetails.themePath === projectSourceDir;
+        if (!isRootReactThemeProject) {
+            buildNewTheme(constants_1.ReactThemeKey, migratedProjectTempDir, themeDetails);
+        }
+    });
+    // Do not support migrating themes that live at the root of the project src directory
+    if (isRootReactThemeProject) {
+        return {
+            legacyThemeDetails,
+            legacyReactThemeDetails,
+            migrated: false,
+            failureReason: copy_1.errorMessages.migrateThemes.rootReactThemeNotSupported,
+        };
+    }
     legacyThemeDetails.forEach(themeDetails => {
         buildNewTheme(constants_1.ThemeKey, migratedProjectTempDir, themeDetails);
     });
-    legacyReactThemeDetails.forEach(themeDetails => {
-        buildNewTheme(constants_1.ReactThemeKey, migratedProjectTempDir, themeDetails);
-    });
     // Copy the rest of the project files to the temp directory
     fs_1.default.cpSync(projectSourceDir, migratedProjectTempDir, {
         recursive: true,

package/src/lib/project.js

@@ -7,10 +7,14 @@ exports.getProjectMetadata = getProjectMetadata;
 const constants_1 = require("./constants");
 const files_1 = require("./files");
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 async function getProjectMetadata(projectSrcDir) {
     const hsMetaFiles = [];
     const components = {};
-    const metafiles = await (0, files_1.locateHsMetaFiles)(projectSrcDir, { silent: true });
+    let metafiles = [];
+    if (fs_1.default.existsSync(projectSrcDir)) {
+        metafiles = await (0, files_1.locateHsMetaFiles)(projectSrcDir, { silent: true });
+    }
     Object.keys(constants_1.Components).forEach(componentType => {
         const { parentComponent, singularComponent, dir } = constants_1.Components[componentType];
         const componentPath = path_1.default.join(projectSrcDir, parentComponent ? path_1.default.join(parentComponent, dir) : dir);