react-responsive-tools 2.0.5 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-responsive-tools",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "",
   "main": "index.js",
   "module": "index.js",

package/reinit.sh

@@ -6,7 +6,7 @@ PACKAGE_DIR=$(cd "$SCRIPT_DIR" && pwd)
 
 # Запуск createConfig.mjs из пакета
 echo "Running createConfig.mjs from package..."
-node "$PACKAGE_DIR/../src/scripts/createConfig.mjs"
+node "$PACKAGE_DIR/src/scripts/createConfig.mjs"
 
 if [ $? -ne 0 ]; then
 echo "Error occurred while running createConfig.mjs"
@@ -15,7 +15,7 @@ fi
 
 # Запуск generateCustomBreakpointsSCSS.mjs из пакета
 echo "Running generateCustomBreakpointsSCSS.mjs from package..."
-node "$PACKAGE_DIR/../src/scripts/generateCustomBreakpointsSCSS.mjs"
+node "$PACKAGE_DIR/src/scripts/generateCustomBreakpointsSCSS.mjs"
 
 if [ $? -ne 0 ]; then
 echo "Error occurred while running generateCustomBreakpointsSCSS.mjs"
@@ -24,7 +24,7 @@ fi
 
 # Запуск generateSCSS.mjs из пакета
 echo "Running generateSCSS.mjs from package..."
-node "$PACKAGE_DIR/../src/scripts/generateSCSS.mjs"
+node "$PACKAGE_DIR/src/scripts/generateSCSS.mjs"
 
 if [ $? -ne 0 ]; then
 echo "Error occurred while running generateSCSS.mjs"
@@ -33,7 +33,7 @@ fi
 
 # Запуск generateTBreakpoint.mjs из пакета
 echo "Running generateTBreakpoint.mjs from package..."
-node "$PACKAGE_DIR/../src/scripts/generateTBreakpoint.mjs"
+node "$PACKAGE_DIR/src/scripts/generateTBreakpoint.mjs"
 
 if [ $? -ne 0 ]; then
 echo "Error occurred while running generateTBreakpoint.mjs"

package/src/scripts/createConfig.mjs

@@ -1,15 +1,15 @@
-// mergeBreakpointConfigs.js
+// mergeBreakpointConfigs.mjs
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { HORIZONTAL_BREAKPOINTS as defaultHorizontalBreakpoints, VERTICAL_BREAKPOINTS as defaultVerticalBreakpoints } from '../default.config.js';
+import { HORIZONTAL_BREAKPOINTS as defaultHorizontalBreakpoints, VERTICAL_BREAKPOINTS as defaultVerticalBreakpoints } from '../default.config.mjs';
 
 // Определение __filename и __dirname
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // Путь к пользовательскому конфигурационному файлу
-const userConfigPath = path.resolve(__dirname, '../breakpoints.config.js');
+const userConfigPath = path.resolve(__dirname, '../../breakpoints.config.js');
 
 // Функция объединения значений по умолчанию с пользовательскими значениями
 const mergeConfigs = (defaultConfig, userConfig) => ({
@@ -23,9 +23,16 @@ const mergeBreakpointConfigs = async () => {
 
   // Проверяем, существует ли пользовательский конфигурационный файл
   if (fs.existsSync(userConfigPath)) {
-    const userConfig = await import(userConfigPath);
-    horizontalBreakpoints = mergeConfigs(defaultHorizontalBreakpoints, userConfig.HORIZONTAL_BREAKPOINTS || {});
-    verticalBreakpoints = mergeConfigs(defaultVerticalBreakpoints, userConfig.VERTICAL_BREAKPOINTS || {});
+    try {
+      const userConfig = await import(userConfigPath);
+      horizontalBreakpoints = mergeConfigs(defaultHorizontalBreakpoints, userConfig.HORIZONTAL_BREAKPOINTS || {});
+      verticalBreakpoints = mergeConfigs(defaultVerticalBreakpoints, userConfig.VERTICAL_BREAKPOINTS || {});
+      console.log('User config loaded and merged successfully.');
+    } catch (error) {
+      console.error('Error loading user config:', error);
+    }
+  } else {
+    console.log('User config file not found, using default breakpoints.');
   }
 
   const mergedConfigContent = `
@@ -37,13 +44,14 @@ const VERTICAL_BREAKPOINTS = ${JSON.stringify(verticalBreakpoints, null, 2)};
 export { HORIZONTAL_BREAKPOINTS, VERTICAL_BREAKPOINTS };
 `;
 
-  // Создаем новый файл с именем breakpoints.config.js
-  fs.writeFileSync(
-      path.resolve(__dirname, '../breakpoints.config.js'),
-      mergedConfigContent
-  );
-
-  console.log('Config file have been generated successfully.');
+  try {
+    // Создаем новый файл с именем breakpoints.config.js
+    fs.writeFileSync(userConfigPath, mergedConfigContent);
+    console.log('Config file have been generated successfully.');
+  } catch (error) {
+    console.error('Error writing merged config file:', error);
+  }
 };
 
+// Запуск функции
 mergeBreakpointConfigs();