Merge pull request #491 from evershopcommerce/dev

Dev
evershopcommerce · Apr 7, 2024 · 399af3d · 399af3d
2 parents 262fe5c + 98d9c17
commit 399af3d
Show file tree

Hide file tree

Showing 70 changed files with 559 additions and 235 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...es/azure_file_storage/subscribers/product_image_added/azureGenerateProductImageVariant.js b/...es/azure_file_storage/subscribers/product_image_added/azureGenerateProductImageVariant.js
@@ -5,7 +5,7 @@ const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
 const sharp = require('sharp');
 const { update } = require('@evershop/postgres-query-builder');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 async function resizeAndUploadImage(
   containerName,
@@ -96,8 +96,8 @@ module.exports = async function azureGenerateProductImageVariant(data) {
         .where('product_image_product_id', '=', data.product_image_product_id)
         .and('origin_image', '=', data.origin_image)
         .execute(pool);
-    } catch (error) {
-      debug('critical', error);
+    } catch (e) {
+      error(e);
     }
   }
 };
diff --git a/packages/evershop/bin/build/client/index.js b/packages/evershop/bin/build/client/index.js
@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const {
   createConfigClient
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigClient');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.buildClient = async function buildClient(routes) {
   const config = createConfigClient(routes);

diff --git a/packages/evershop/bin/build/complie.js b/packages/evershop/bin/build/complie.js
@@ -5,7 +5,7 @@ const {
 const {
   createConfigServer
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigServer');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.compile = async function compile(routes) {
   const config = [createConfigClient(routes), createConfigServer(routes)];

diff --git a/packages/evershop/bin/build/index.js b/packages/evershop/bin/build/index.js
@@ -10,7 +10,7 @@ const {
 } = require('@evershop/evershop/src/lib/webpack/isBuildRequired');
 const { buildEntry } = require('@evershop/evershop/bin/lib/buildEntry');
 const { getCoreModules } = require('@evershop/evershop/bin/lib/loadModules');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { compile } = require('./complie');
 const { getEnabledExtensions } = require('../extension');
 require('dotenv').config();

diff --git a/packages/evershop/bin/build/server/index.js b/packages/evershop/bin/build/server/index.js
@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const {
   createConfigServer
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigServer');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.buildServer = async function buildServer(routes) {
   const config = createConfigServer(routes);

diff --git a/packages/evershop/bin/build/server/useDDL.js b/packages/evershop/bin/build/server/useDDL.js
@@ -11,7 +11,7 @@ const {
   getComponentsByRoute
 } = require('@evershop/evershop/src/lib/componee/getComponentByRoute');
 const webpack = require('webpack');
-const { info } = require('@evershop/evershop/src/lib/log/debuger');
+const { info } = require('@evershop/evershop/src/lib/log/logger');
 
 const modules = loadModules(path.resolve(__dirname, '../../../src', 'modules'));
 

diff --git a/packages/evershop/bin/evershop b/packages/evershop/bin/evershop
@@ -2,16 +2,9 @@
 /* eslint-disable global-require */
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
-const { error } = require('../src/lib/log/debuger');
 
 const { argv } = yargs(hideBin(process.argv));
 const command = argv._[0];
-process.on('uncaughtException', function (exception) {
-  error(exception);
-});
-process.on('unhandledRejection', (reason, p) => {
-  error(`Unhandled Rejection: ${reason} at: ${p}`);
-});
 
 try {
   if (command === 'build') {
@@ -33,5 +26,13 @@ try {
     throw new Error('Invalid command');
   }
 } catch (e) {
+  const { error } = require('../src/lib/log/logger');
   error(e);
 }
+const { error } = require('../src/lib/log/logger');
+process.on('uncaughtException', function (exception) {
+  error(exception);
+});
+process.on('unhandledRejection', (reason, p) => {
+  error(`Unhandled Rejection: ${reason} at: ${p}`);
+});
diff --git a/packages/evershop/bin/extension/index.js b/packages/evershop/bin/extension/index.js
@@ -3,7 +3,7 @@ const { resolve } = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
 const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 const { getCoreModules } = require('@evershop/evershop/bin/lib/loadModules');
-const { warning } = require('@evershop/evershop/src/lib/log/debuger');
+const { warning } = require('@evershop/evershop/src/lib/log/logger');
 
 let extensions = [];
 

diff --git a/packages/evershop/bin/install/index.js b/packages/evershop/bin/install/index.js
@@ -14,7 +14,7 @@ const {
 } = require('@evershop/postgres-query-builder');
 const { prompt } = require('enquirer');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
-const { error, success } = require('@evershop/evershop/src/lib/log/debuger');
+const { error, success } = require('@evershop/evershop/src/lib/log/logger');
 const {
   hashPassword
 } = require('@evershop/evershop/src/lib/util/passwordHelper');

diff --git a/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js b/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js
@@ -4,7 +4,7 @@ const session = require('express-session');
 const sessionStorage = require('connect-pg-simple');
 const pathToRegexp = require('path-to-regexp');
 const webpack = require('webpack');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { debug } = require('@evershop/evershop/src/lib/log/logger');
 const middleware = require('webpack-dev-middleware');
 const {
   createConfigClient
@@ -59,7 +59,7 @@ exports.addDefaultMiddlewareFuncs = function addDefaultMiddlewareFuncs(
       ) {
         return;
       }
-      debug('info', message);
+      debug(message);
     });
   });
   // Add public static middleware

diff --git a/packages/evershop/bin/lib/app.js b/packages/evershop/bin/lib/app.js
@@ -10,7 +10,7 @@ const {
   loadModuleRoutes
 } = require('@evershop/evershop/src/lib/router/loadModuleRoutes');
 const { Handler } = require('@evershop/evershop/src/lib/middleware/Handler');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { getCoreModules } = require('./loadModules');
 const { addDefaultMiddlewareFuncs } = require('./addDefaultMiddlewareFuncs');
 const { getEnabledExtensions } = require('../extension');

diff --git a/packages/evershop/bin/lib/bootstrap/migrate.js b/packages/evershop/bin/lib/bootstrap/migrate.js
@@ -12,7 +12,7 @@ const {
   pool
 } = require('@evershop/evershop/src/lib/postgres/connection');
 const { existsSync, readdirSync } = require('fs');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { createMigrationTable } = require('../../install/createMigrationTable');
 
 async function getCurrentInstalledVersion(module) {

diff --git a/packages/evershop/bin/lib/buildEntry.js b/packages/evershop/bin/lib/buildEntry.js
@@ -13,7 +13,7 @@ const {
   parseGraphql
 } = require('@evershop/evershop/src/lib/webpack/util/parseGraphql');
 const JSON5 = require('json5');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 /**
  * Only pass the page routes, not api routes
  */

diff --git a/packages/evershop/bin/lib/onError.js b/packages/evershop/bin/lib/onError.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const normalizePort = require('./normalizePort');
 
 const port = normalizePort();

diff --git a/packages/evershop/bin/lib/onListening.js b/packages/evershop/bin/lib/onListening.js
@@ -1,5 +1,5 @@
 const boxen = require('boxen');
-const { success } = require('@evershop/evershop/src/lib/log/debuger');
+const { success } = require('@evershop/evershop/src/lib/log/logger');
 const normalizePort = require('./normalizePort');
 
 const port = normalizePort();