sb-mig 5.1.4-beta.1 → 5.2.0

package/dist/api/datasources/datasource-entries.js

@@ -1,4 +1,5 @@
 import chalk from "chalk";
+import storyblokConfig from "../../config/config.js";
 import Logger from "../../utils/logger.js";
 import { isObjectEmpty } from "../../utils/main.js";
 import { getDatasource } from "./datasources.js";
@@ -66,6 +67,11 @@ export const createDatasourceEntries = (args, config) => {
 const _createDatasourceEntry = (args, config) => {
     const { currentDatasource, finalDatasource_entry } = args;
     const { spaceId, sbApi } = config;
+    if (storyblokConfig.debug) {
+        console.log("############# Entity to Create: ");
+        console.log(finalDatasource_entry);
+        console.log("################################");
+    }
     return sbApi
         .post(`spaces/${spaceId}/datasource_entries/`, {
         datasource_entry: finalDatasource_entry,
@@ -75,7 +81,11 @@ const _createDatasourceEntry = (args, config) => {
         return data;
     })
         .catch((err) => {
-        Logger.error(err);
+        if (storyblokConfig.debug) {
+            console.log("Full Create error: ");
+            console.log(err);
+        }
+        Logger.error(`Unable to create datasource entry in ${currentDatasource.datasource.name} datasource.`);
     });
 };
 export const createDatasourceEntry = (args, config) => {
@@ -112,7 +122,11 @@ const _updateDatasourceEntry = (args, config) => {
         return true;
     })
         .catch((err) => {
-        Logger.error(err);
+        if (storyblokConfig.debug) {
+            console.log("Full update error: ");
+            console.log(err);
+        }
+        Logger.error(`Unable to update datasource entry in ${currentDatasource.datasource.name} datasource.`);
     });
 };
 export const updateDatasourceEntry = (args, config) => {

package/dist/api/datasources/datasources.js

@@ -1,5 +1,5 @@
 import Logger from "../../utils/logger.js";
-import { getFilesContentWithRequire } from "../../utils/main.js";
+import { getFileContentWithRequire, } from "../../utils/main.js";
 import { getAllItemsWithPagination } from "../utils/request.js";
 import { createDatasourceEntries, getDatasourceEntries, } from "./datasource-entries.js";
 // GET
@@ -108,16 +108,16 @@ export const updateDatasource = (args, config) => {
 export const syncDatasources = async (args, config) => {
     const { providedDatasources } = args;
     Logger.log(`Trying to sync provided datasources: `);
-    const providedDatasourcesContent = getFilesContentWithRequire({
-        files: providedDatasources,
-    });
+    const providedDatasourcesContent = await Promise.all(providedDatasources.map((datasource) => {
+        return getFileContentWithRequire({ file: datasource.p });
+    }));
     const remoteDatasources = await getAllDatasources(config);
     Promise.all(providedDatasourcesContent.map((datasource) => {
         const datasourceToBeUpdated = remoteDatasources.find((remoteDatasource) => datasource.name === remoteDatasource.name);
         if (datasourceToBeUpdated) {
-            return updateDatasource({ datasource, datasourceToBeUpdated }, config);
+            return updateDatasource({ datasource: datasource, datasourceToBeUpdated }, config);
         }
-        return createDatasource({ datasource }, config);
+        return createDatasource({ datasource: datasource }, config);
     }))
         .then((res) => {
         // After create or after update datasource

package/dist/api/datasources/datasources.types.d.ts

@@ -1,3 +1,4 @@
+import type { OneFileElement } from "../../cli/utils/discover.js";
 import type { RequestBaseConfig } from "../utils/request.js";
 export type GetAllDatasources = (config: RequestBaseConfig) => Promise<any>;
 export type GetDatasource = (args: {
@@ -11,7 +12,7 @@ export type UpdateDatasource = (args: {
     datasourceToBeUpdated: any;
 }, config: RequestBaseConfig) => Promise<any>;
 export type SyncDatasources = (args: {
-    providedDatasources: string[];
+    providedDatasources: OneFileElement[];
 }, config: RequestBaseConfig) => Promise<any>;
 export type SyncProvidedDatasources = (args: {
     datasources: string[];

package/dist/api/migrate.types.d.ts

@@ -1,7 +1,7 @@
 import type { RequestBaseConfig } from "./utils/request.js";
 import type { SyncDirection } from "../cli/sync.types.js";
-import type { OneComponent } from "../cli/utils/discover.js";
-export type SyncComponents = (specifiedComponents: OneComponent[], presets: boolean, config: RequestBaseConfig) => Promise<any>;
+import type { OneFileElement } from "../cli/utils/discover.js";
+export type SyncComponents = (specifiedComponents: OneFileElement[], presets: boolean, config: RequestBaseConfig) => Promise<any>;
 export type SyncAllComponents = (presets: boolean, config: RequestBaseConfig) => Promise<any>;
 export type SyncProvidedComponents = (presets: boolean, components: string[], packageName: boolean, config: RequestBaseConfig) => Promise<any>;
 export type SyncStories = ({ transmission, stories, toSpaceId, }: {

package/dist/api/roles/roles.types.d.ts

@@ -1,11 +1,11 @@
-import type { OneComponent } from "../../cli/utils/discover.js";
+import type { OneFileElement } from "../../cli/utils/discover.js";
 import type { RequestBaseConfig } from "../utils/request.js";
 export type GetRole = (roleName: string | undefined, config: RequestBaseConfig) => Promise<void>;
 export type GetAllRoles = (config: RequestBaseConfig) => Promise<any>;
 export type CreateRole = (role: any, config: RequestBaseConfig) => void;
 export type UpdateRole = (role: any, config: RequestBaseConfig) => void;
 export type SyncRoles = ({ specifiedRoles }: {
-    specifiedRoles: OneComponent[];
+    specifiedRoles: OneFileElement[];
 }, config: RequestBaseConfig) => Promise<void>;
 export type SyncAllRoles = (config: RequestBaseConfig) => Promise<void>;
 export type SyncProvidedRoles = ({ roles }: {

package/dist/cli/datasources/sync.js

@@ -1,5 +1,5 @@
 import { managementApi } from "../../api/managementApi.js";
-import { discoverDatasources, discoverManyDatasources, LOOKUP_TYPE, SCOPE, } from "../utils/discover.js";
+import { compare, discoverDatasources, discoverManyDatasources, LOOKUP_TYPE, SCOPE, } from "../utils/discover.js";
 export const syncProvidedDatasources = async (args, config) => {
     const { datasources } = args;
     const allLocalDatasources = await discoverManyDatasources({
@@ -12,26 +12,29 @@ export const syncProvidedDatasources = async (args, config) => {
         type: LOOKUP_TYPE.fileName,
         fileNames: datasources,
     });
+    // #3: compare results, prefer local ones (so we have to create final external paths array and local array of things to sync from where)
+    const { local, external } = compare({
+        local: allLocalDatasources,
+        external: allExternalDatasources,
+    });
     managementApi.datasources.syncDatasources({
-        providedDatasources: [
-            ...allLocalDatasources,
-            ...allExternalDatasources,
-        ],
+        providedDatasources: [...local, ...external],
     }, config);
 };
-export const syncAllDatasources = (config) => {
-    const allLocalDatasources = discoverDatasources({
+export const syncAllDatasources = async (config) => {
+    const allLocalDatasources = await discoverDatasources({
         scope: SCOPE.local,
         type: LOOKUP_TYPE.fileName,
     });
-    const allExternalDatasources = discoverDatasources({
+    const allExternalDatasources = await discoverDatasources({
         scope: SCOPE.external,
         type: LOOKUP_TYPE.fileName,
     });
+    const { local, external } = compare({
+        local: allLocalDatasources,
+        external: allExternalDatasources,
+    });
     managementApi.datasources.syncDatasources({
-        providedDatasources: [
-            ...allLocalDatasources,
-            ...allExternalDatasources,
-        ],
+        providedDatasources: [...local, ...external],
     }, config);
 };

package/dist/cli/roles/sync.js

@@ -2,12 +2,12 @@ import { managementApi } from "../../api/managementApi.js";
 import { compare, discoverManyRoles, discoverRoles, LOOKUP_TYPE, SCOPE, } from "../utils/discover.js";
 export const syncAllRoles = async (config) => {
     // #1: discover all external .roles.sb.js files
-    const allLocalSbComponentsSchemaFiles = discoverRoles({
+    const allLocalSbComponentsSchemaFiles = await discoverRoles({
         scope: SCOPE.local,
         type: LOOKUP_TYPE.fileName,
     });
     // #2: discover all local .roles.sb.js files
-    const allExternalSbComponentsSchemaFiles = discoverRoles({
+    const allExternalSbComponentsSchemaFiles = await discoverRoles({
         scope: SCOPE.external,
         type: LOOKUP_TYPE.fileName,
     });
@@ -37,6 +37,7 @@ export const syncProvidedRoles = async ({ roles }, config) => {
         local: allLocalSbComponentsSchemaFiles,
         external: allExternalSbComponentsSchemaFiles,
     });
+    console.log({ local, external });
     // #4: sync - do all stuff already done (groups resolving, and so on)
     await managementApi.roles.syncRoles({ specifiedRoles: [...local, ...external] }, config);
 };

package/dist/cli/utils/discover.d.ts

@@ -12,11 +12,6 @@ interface DiscoverRequest {
     scope: SCOPE;
     type: LOOKUP_TYPE;
 }
-interface DiscoverOneRequest {
-    fileName: string;
-    scope: SCOPE;
-    type: LOOKUP_TYPE;
-}
 interface DiscoverManyRequest {
     fileNames: string[];
     scope: SCOPE;
@@ -34,22 +29,19 @@ interface CompareRequest {
     local: string[];
     external: string[];
 }
-export interface OneComponent {
+export interface OneFileElement {
     name: string;
     p: string;
 }
 export interface CompareResult {
-    local: OneComponent[];
-    external: OneComponent[];
+    local: OneFileElement[];
+    external: OneFileElement[];
 }
 type DiscoverResult = string[];
 export declare const normalizeDiscover: ({ segments }: {
     segments: string[];
 }) => string | undefined;
-export declare const compare: (request: CompareRequest) => {
-    local: OneComponent[];
-    external: OneComponent[];
-};
+export declare const compare: (request: CompareRequest) => CompareResult;
 export declare const discoverManyByPackageName: (request: DiscoverManyByPackageNameRequest) => DiscoverResult;
 export declare const discoverOneByPackageName: (request: DiscoverOneByPackageNameRequest) => DiscoverResult;
 export declare const discoverMany: (request: DiscoverManyRequest) => Promise<DiscoverResult>;
@@ -57,19 +49,17 @@ export declare const discoverManyDatasources: (request: DiscoverManyRequest) =>
 export declare const discoverStories: (request: DiscoverManyRequest) => DiscoverResult;
 export declare const discoverMigrationConfig: (request: DiscoverManyRequest) => DiscoverResult;
 export declare const discoverVersionMapping: (request: DiscoverManyRequest) => DiscoverResult;
-export declare const discoverDatasources: (request: DiscoverRequest) => DiscoverResult;
-export declare const discoverOne: (request: DiscoverOneRequest) => DiscoverResult;
+export declare const discoverDatasources: (request: DiscoverRequest) => Promise<DiscoverResult>;
 export declare const filesPattern: ({ mainDirectory, componentDirectories, ext, }: {
     mainDirectory: string;
     componentDirectories: string[];
     ext: string;
 }) => string;
 export declare const discover: (request: DiscoverRequest) => Promise<DiscoverResult>;
-export declare const discoverManyStyles: (request: DiscoverManyRequest) => DiscoverResult;
-export declare const discoverRoles: (request: DiscoverRequest) => DiscoverResult;
+export declare const discoverRoles: (request: DiscoverRequest) => Promise<DiscoverResult>;
 export declare const discoverManyRoles: (request: DiscoverManyRequest) => Promise<DiscoverResult>;
 export declare const discoverAllComponents: () => Promise<{
-    local: OneComponent[];
-    external: OneComponent[];
+    local: OneFileElement[];
+    external: OneFileElement[];
 }>;
 export {};

package/dist/cli/utils/discover.js

@@ -30,16 +30,15 @@ export const normalizeDiscover = ({ segments }) => {
     }
     return `{${segments.join(",")}}`;
 };
-// export const compare = (request: CompareRequest): CompareResult => {
 export const compare = (request) => {
-    // TODO: figure out types
-    const splittedLocal = request.local.map((p) => {
+    const { local, external } = request;
+    const splittedLocal = local.map((p) => {
         return {
             name: p.split(path.sep)[p.split(path.sep).length - 1],
             p,
         };
     });
-    const splittedExternal = request.external.map((p) => {
+    const splittedExternal = external.map((p) => {
         return {
             name: p.split(path.sep)[p.split(path.sep).length - 1],
             p,
@@ -293,7 +292,7 @@ export const discoverManyDatasources = async (request) => {
                 await buildOnTheFly({ files: listOfFilesToCompile });
                 pattern = path.join(directory, ".next", "cache", "sb-mig", "**", `${normalizeDiscover({
                     segments: request.fileNames,
-                })}.datasource.${storyblokConfig.schemaFileExt}`);
+                })}.${storyblokConfig.datasourceExt}`);
                 listOFSchemaTSFilesCompiled = glob.sync(pattern.replace(/\\/g, "/"), {
                     follow: true,
                 });
@@ -302,7 +301,7 @@ export const discoverManyDatasources = async (request) => {
                 segments: onlyLocalComponentsDirectories,
             })}`, "**", `${normalizeDiscover({
                 segments: request.fileNames,
-            })}.datasource.${storyblokConfig.datasourceExt}`);
+            })}.${storyblokConfig.datasourceExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
@@ -398,7 +397,7 @@ export const discoverVersionMapping = (request) => {
     }
     return listOfFiles;
 };
-export const discoverDatasources = (request) => {
+export const discoverDatasources = async (request) => {
     const rootDirectory = "./";
     const directory = path.resolve(process.cwd(), rootDirectory);
     let pattern;
@@ -406,22 +405,40 @@ export const discoverDatasources = (request) => {
     switch (request.scope) {
         case SCOPE.local:
             // ### ALL - LOCAL - fileName ###
+            let listOFSchemaTSFilesCompiled = [];
             const onlyLocalComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => !p.includes("node_modules"));
+            if (storyblokConfig.schemaType === SCHEMA.TS) {
+                pattern = path.join(`${directory}`, `${normalizeDiscover({
+                    segments: onlyLocalComponentsDirectories,
+                })}`, "**", `[^_]*.sb.datasource.${storyblokConfig.schemaType}`);
+                const listOfFilesToCompile = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+                if (storyblokConfig.debug) {
+                    console.log("############# listOfFileToCompile #############");
+                    console.log(listOfFilesToCompile);
+                    console.log("###############################################");
+                }
+                await buildOnTheFly({ files: listOfFilesToCompile });
+                pattern = path.join(directory, ".next", "cache", "sb-mig", "**", `[^_]*.${storyblokConfig.datasourceExt}`);
+                listOFSchemaTSFilesCompiled = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+            }
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: onlyLocalComponentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}` // all files with 'ext' extension, without files beggining with _
-            );
+            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
+            listOfFiles = [...listOfFiles, ...listOFSchemaTSFilesCompiled];
             break;
         case SCOPE.external:
             // ### ALL - EXTERNAL - fileName ###
             const onlyNodeModulesPackagesComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => p.includes("node_modules"));
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: onlyNodeModulesPackagesComponentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}` // all files with 'ext' extension, without files beggining with _
-            );
+            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
@@ -430,50 +447,7 @@ export const discoverDatasources = (request) => {
             // ### ALL - LOCAL - fileName ###
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}` // all files with 'ext' extension, without files beggining with _
-            );
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        default:
-            break;
-    }
-    return listOfFiles;
-};
-export const discoverOne = (request) => {
-    const rootDirectory = "./";
-    const directory = path.resolve(process.cwd(), rootDirectory);
-    let pattern;
-    let listOfFiles = [""];
-    switch (request.scope) {
-        case SCOPE.local:
-            // ### ONE - LOCAL - fileName ###
-            const onlyLocalComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => !p.includes("node_modules"));
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: onlyLocalComponentsDirectories,
-            })}`, "**", `${request.fileName}.${storyblokConfig.schemaFileExt}` // all files with 'ext' extension, without files beggining with _
-            );
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        case SCOPE.external:
-            // ### ONE - EXTERNAL - fileName ###
-            const onlyNodeModulesPackagesComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => p.includes("node_modules"));
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: onlyNodeModulesPackagesComponentsDirectories,
-            })}`, "**", `${request.fileName}.${storyblokConfig.schemaFileExt}` // all files with 'ext' extension, without files beggining with _
-            );
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        case SCOPE.all:
-            // ### ONE - ALL - fileName ###
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `${request.fileName}.${storyblokConfig.schemaFileExt}`);
+            })}`, "**", `[^_]*.${storyblokConfig.datasourceExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
@@ -484,13 +458,9 @@ export const discoverOne = (request) => {
     return listOfFiles;
 };
 export const filesPattern = ({ mainDirectory, componentDirectories, ext, }) => {
-    const guyToLookForStuff = path.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}` // all files with 'ext' extension, without files beggining with _
-    );
     return componentDirectories.length === 1
-        ? path.join(`${mainDirectory}`, `${componentDirectories[0]}`, "**", `[^_]*.${ext}` // all files with 'ext' extension, without files beggining with _
-        )
-        : path.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}` // all files with 'ext' extension, without files beggining with _
-        );
+        ? path.join(`${mainDirectory}`, `${componentDirectories[0]}`, "**", `[^_]*.${ext}`)
+        : path.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}`);
 };
 export const discover = async (request) => {
     const rootDirectory = ".";
@@ -555,47 +525,7 @@ export const discover = async (request) => {
     }
     return listOfFiles;
 };
-export const discoverManyStyles = (request) => {
-    const rootDirectory = "./";
-    const directory = path.resolve(process.cwd(), rootDirectory);
-    let pattern;
-    let listOfFiles = [""];
-    switch (request.scope) {
-        case SCOPE.local:
-            // ### MANY - LOCAL - fileName ###
-            const onlyLocalComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => !p.includes("node_modules"));
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: onlyLocalComponentsDirectories,
-            })}`, "**", `${normalizeDiscover({ segments: request.fileNames })}.scss`);
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        case SCOPE.external:
-            // ### MANY - EXTERNAL - fileName ###
-            const onlyNodeModulesPackagesComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => p.includes("node_modules"));
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: onlyNodeModulesPackagesComponentsDirectories,
-            })}`, "**", `${normalizeDiscover({ segments: request.fileNames })}.scss`);
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        case SCOPE.all:
-            // ### MANY - ALL - fileName ###
-            pattern = path.join(`${directory}`, `${normalizeDiscover({
-                segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `${normalizeDiscover({ segments: request.fileNames })}.scss`);
-            listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
-                follow: true,
-            });
-            break;
-        default:
-            break;
-    }
-    return listOfFiles;
-};
-export const discoverRoles = (request) => {
+export const discoverRoles = async (request) => {
     const rootDirectory = ".";
     const directory = path.resolve(process.cwd(), rootDirectory);
     let pattern;
@@ -603,22 +533,35 @@ export const discoverRoles = (request) => {
     switch (request.scope) {
         case SCOPE.local:
             // ### ALL - LOCAL - fileName ###
+            let listOFSchemaTSFilesCompiled = [];
             const onlyLocalComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => !p.includes("node_modules"));
+            if (storyblokConfig.schemaType === SCHEMA.TS) {
+                pattern = path.join(`${directory}`, `${normalizeDiscover({
+                    segments: onlyLocalComponentsDirectories,
+                })}`, "**", `[^_]*.sb.roles.${storyblokConfig.schemaType}`);
+                const listOfFilesToCompile = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+                await buildOnTheFly({ files: listOfFilesToCompile });
+                pattern = path.join(directory, ".next", "cache", "sb-mig", "**", `[^_]*.${storyblokConfig.rolesExt}`);
+                listOFSchemaTSFilesCompiled = glob.sync(pattern.replace(/\\/g, "/"), {
+                    follow: true,
+                });
+            }
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: onlyLocalComponentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}` // all files with 'ext' extension, without files beggining with _
-            );
+            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
+            listOfFiles = [...listOfFiles, ...listOFSchemaTSFilesCompiled];
             break;
         case SCOPE.external:
             // ### ALL - EXTERNAL - fileName ###
             const onlyNodeModulesPackagesComponentsDirectories = storyblokConfig.componentsDirectories.filter((p) => p.includes("node_modules"));
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: onlyNodeModulesPackagesComponentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}` // all files with 'ext' extension, without files beggining with _
-            );
+            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
@@ -627,8 +570,7 @@ export const discoverRoles = (request) => {
             // ### ALL - LOCAL - fileName ###
             pattern = path.join(`${directory}`, `${normalizeDiscover({
                 segments: storyblokConfig.componentsDirectories,
-            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}` // all files with 'ext' extension, without files beggining with _
-            );
+            })}`, "**", `[^_]*.${storyblokConfig.rolesExt}`);
             listOfFiles = glob.sync(pattern.replace(/\\/g, "/"), {
                 follow: true,
             });
@@ -660,7 +602,7 @@ export const discoverManyRoles = async (request) => {
                 await buildOnTheFly({ files: listOfFilesToCompile });
                 pattern = path.join(directory, ".next", "cache", "sb-mig", "**", `${normalizeDiscover({
                     segments: request.fileNames,
-                })}.roles.${storyblokConfig.schemaFileExt}`);
+                })}.${storyblokConfig.rolesExt}`);
                 listOFSchemaTSFilesCompiled = glob.sync(pattern.replace(/\\/g, "/"), {
                     follow: true,
                 });

package/dist/rollup/build-on-the-fly.js

@@ -8,7 +8,7 @@ export const _extractComponentName = (filePath) => {
     const separator = "/"; // this guy is like in unix, becasue what glob is returning is always like that... that's why we are NOT using path.sep here...
     const sP = filePath.split(separator);
     const lastElement = sP[sP.length - 1];
-    return lastElement.replaceAll(".ts", "").replaceAll(".sb", "");
+    return lastElement.replaceAll(".ts", "");
 };
 export const buildOnTheFly = async ({ files }) => {
     if (storyblokConfig.flushCache) {
@@ -28,11 +28,11 @@ export const buildOnTheFly = async ({ files }) => {
         };
         const outputOptionsList = [
             {
-                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.sb.cjs`),
+                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.cjs`),
                 format: "cjs",
             },
             {
-                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.sb.js`),
+                file: path.join(`${cacheDir}`, `${_extractComponentName(filePath)}.js`),
                 format: "es",
             },
         ];

package/dist/utils/main.js

@@ -30,8 +30,7 @@ export const getFileContentWithRequire = (data) => {
     return fileContent;
 };
 export const getFilesContentWithRequire = (data) => {
-    const require = createRequire(import.meta.url);
-    return data.files.map((file) => require(file));
+    return data.files.map((file) => getFileContentWithRequire({ file }));
 };
 export const isObjectEmpty = (obj) => {
     if (obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "5.1.4-beta.1",
+  "version": "5.2.0",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",
@@ -71,6 +71,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
+    "@rollup/plugin-node-resolve": "^15.2.0",
     "@ryansonshine/commitizen": "^4.2.8",
     "@ryansonshine/cz-conventional-changelog": "^3.3.4",
     "@semantic-release/changelog": "^6.0.3",
@@ -84,19 +85,19 @@
     "@types/node": "18.16.18",
     "@types/sinon": "^10.0.16",
     "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
     "chai": "^4.3.7",
     "chokidar-cli": "^3.0.0",
     "eslint": "^8.47.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "esm": "^3.2.25",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.1",
-    "semantic-release": "^21.0.7",
+    "prettier": "^3.0.2",
+    "semantic-release": "^21.0.9",
     "semantic-release-slack-bot": "^4.0.1",
     "sinon": "^15.2.0",
     "tsc-files": "^1.1.4"