@evershop/evershop 2.0.1 → 2.1.1

package/dist/bin/build/index.js

@@ -54,7 +54,7 @@ export default async function build() {
     }
     catch (e) {
         error(e);
-        process.exit(0);
+        process.exit(1);
     }
     process.env.ALLOW_CONFIG_MUTATIONS = false;
     const routes = getRoutes();

package/dist/bin/evershop.js

@@ -22,6 +22,18 @@ try {
     else if (command === 'user:changePassword') {
         await import('./user/changePassword.js');
     }
+    else if (command === 'theme:active') {
+        await import('./theme/active.js');
+    }
+    else if (command === 'theme:twizz') {
+        await import('./theme/twizz.js');
+    }
+    else if (command === 'theme:create') {
+        await import('./theme/create.js');
+    }
+    else if (command === 'seed') {
+        await import('./seed/index.js');
+    }
     else {
         throw new Error('Invalid command');
     }

package/dist/bin/evershop.js.map

@@ -1 +1 @@
-{"version":3,"file":"evershop.js","sourceRoot":"","sources":["../../src/bin/evershop.js"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,IAAI,CAAC;IACH,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QAC/B,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QACrC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,qBAAqB,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AACD,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAU,SAAS;IACjD,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;IAC7C,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"evershop.js","sourceRoot":"","sources":["../../src/bin/evershop.js"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,IAAI,CAAC;IACH,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QAC/B,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QACrC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,qBAAqB,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;SAAM,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;QACtC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QACrC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;QACtC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAC9B,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AACD,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAU,SAAS;IACjD,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;IAC7C,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/bin/install/index.js

@@ -9,6 +9,8 @@ import { Pool } from 'pg';
 import { CONSTANTS } from '../../lib/helpers.js';
 import { error, success } from '../../lib/log/logger.js';
 import { hashPassword } from '../../lib/util/passwordHelper.js';
+import { migrate } from '../lib/bootstrap/migrate.js';
+import { getCoreModules } from '../lib/loadModules.js';
 // The installation command will create a .env file in the root directory of the project.
 // If you are using docker, do not run this command. Instead, you should set the environment variables in the docker-compose.yml file and run `npm run start`
 // This command means for the developer who want to install the system on their local machine.
@@ -213,6 +215,9 @@ DB_SSLMODE="${sslMode}"
             full_name: (adminUser === null || adminUser === void 0 ? void 0 : adminUser.fullName) || 'Admin'
         })
             .execute(connection);
+        // Run module migrations
+        const coreModules = getCoreModules();
+        await migrate(coreModules, connection);
         await commit(connection);
     }
     catch (e) {

package/dist/bin/install/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bin/install/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bin/install/index.js"],"names":[],"mappings":"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"}

package/dist/bin/lib/addDefaultMiddlewareFuncs.d.ts

@@ -1 +1 @@
-export function addDefaultMiddlewareFuncs(app: any): void;
+export declare function addDefaultMiddlewareFuncs(app: any): void;

package/dist/bin/lib/addDefaultMiddlewareFuncs.js

@@ -3,9 +3,6 @@ import sessionStorage from 'connect-pg-simple';
 import cookieParser from 'cookie-parser';
 import session from 'express-session';
 import pathToRegexp from 'path-to-regexp';
-import webpack from 'webpack';
-import middleware from 'webpack-dev-middleware';
-import webpackHotMiddleware from 'webpack-hot-middleware';
 import { translate } from '../../lib/locale/translate/translate.js';
 import { debug, warning } from '../../lib/log/logger.js';
 import publicStatic from '../../lib/middlewares/publicStatic.js';
@@ -15,13 +12,11 @@ import { getRoutes } from '../../lib/router/Router.js';
 import { getConfig } from '../../lib/util/getConfig.js';
 import isDevelopmentMode from '../../lib/util/isDevelopmentMode.js';
 import isProductionMode from '../../lib/util/isProductionMode.js';
-import { createConfigClient } from '../../lib/webpack/dev/createConfigClient.js';
-import { isBuildRequired } from '../../lib/webpack/isBuildRequired.js';
 import { getAdminSessionCookieName } from '../../modules/auth/services/getAdminSessionCookieName.js';
 import { getCookieSecret } from '../../modules/auth/services/getCookieSecret.js';
 import { getFrontStoreSessionCookieName } from '../../modules/auth/services/getFrontStoreSessionCookieName.js';
-import { setContextValue } from '../../modules/graphql/services/contextHelper.js';
-import { findRoute } from './findRoute.js';
+import { setPageMetaInfo } from '../../modules/cms/services/pageMetaInfo.js';
+import { getDevMiddleware, getHotMiddleware } from './devEnvHelper.js';
 export function addDefaultMiddlewareFuncs(app) {
     app.use((request, response, next) => {
         response.debugMiddlewares = [];
@@ -163,111 +158,66 @@ export function addDefaultMiddlewareFuncs(app) {
             return next();
         }
     });
-    app.use((request, response, next) => {
-        if (!isDevelopmentMode()) {
-            return next();
-        }
-        const routes = getRoutes();
-        const route = findRoute(request);
-        request.locals = request.locals || {};
-        request.locals.webpackMatchedRoute = route;
-        if (!route || !isBuildRequired(route)) {
-            next();
-        }
-        else {
-            if (!route.webpackCompiler) {
-                route.webpackCompiler = webpack(createConfigClient(route));
-            }
-            const { webpackCompiler } = route;
-            let middlewareFunc;
-            if (!route.webpackMiddleware) {
-                middlewareFunc = route.webpackMiddleware = middleware(webpackCompiler, {
-                    serverSideRender: true,
-                    publicPath: '/',
-                    stats: 'none'
+    if (isDevelopmentMode()) {
+        // Admin webpack dev middleware - only for /backend/* paths
+        app.use((request, response, next) => {
+            if (request.path.startsWith('/backend/')) {
+                const adminDevMiddleware = getDevMiddleware(true);
+                adminDevMiddleware.waitUntilValid(() => {
+                    const { stats } = adminDevMiddleware.context;
+                    if (stats) {
+                        response.locals.jsonWebpackStats = stats.toJson();
+                    }
                 });
-                middlewareFunc.context.logger.info = () => { };
+                adminDevMiddleware(request, response, next);
             }
             else {
-                middlewareFunc = route.webpackMiddleware;
+                next();
             }
-            middlewareFunc.waitUntilValid(() => {
-                const { stats } = middlewareFunc.context;
-                const jsonWebpackStats = stats.toJson();
-                response.locals.jsonWebpackStats = jsonWebpackStats;
-            });
-            // We need to run build for notFound route
-            const notFoundRoute = routes.find((r) => r.id === 'notFound');
-            if (!notFoundRoute.webpackCompiler) {
-                notFoundRoute.webpackCompiler = webpack(createConfigClient(notFoundRoute));
+        });
+        app.use((request, response, next) => {
+            if (request.path.startsWith('/__webpack_hmr_admin')) {
+                const adminHotMiddleware = getHotMiddleware(true);
+                adminHotMiddleware(request, response, next);
+            }
+            else {
+                next();
             }
-            const notFoundWebpackCompiler = notFoundRoute.webpackCompiler;
-            let notFoundMiddlewareFunc;
-            if (!notFoundRoute.webpackMiddleware) {
-                notFoundMiddlewareFunc = notFoundRoute.webpackMiddleware = middleware(notFoundWebpackCompiler, {
-                    serverSideRender: true,
-                    publicPath: '/',
-                    stats: 'none'
+        });
+        // Frontstore webpack dev middleware - for all other paths
+        app.use((request, response, next) => {
+            if (!request.path.startsWith('/backend/') &&
+                !request.path.startsWith('/__webpack_hmr_admin')) {
+                const frontstoreDevMiddleware = getDevMiddleware(false);
+                frontstoreDevMiddleware.waitUntilValid(() => {
+                    const { stats } = frontstoreDevMiddleware.context;
+                    if (stats) {
+                        response.locals.jsonWebpackStats = stats.toJson();
+                    }
                 });
-                notFoundMiddlewareFunc.context.logger.info = () => { };
+                frontstoreDevMiddleware(request, response, next);
             }
             else {
-                notFoundMiddlewareFunc = notFoundRoute.webpackMiddleware;
-            }
-            // We need to run build for adminNotFound route
-            const adminNotFoundRoute = routes.find((r) => r.id === 'adminNotFound');
-            if (!adminNotFoundRoute.webpackCompiler) {
-                adminNotFoundRoute.webpackCompiler = webpack(createConfigClient(adminNotFoundRoute));
+                next();
             }
-            const adminNotFoundWebpackCompiler = adminNotFoundRoute.webpackCompiler;
-            let adminNotFoundMiddlewareFunc;
-            if (!adminNotFoundRoute.webpackMiddleware) {
-                adminNotFoundMiddlewareFunc = adminNotFoundRoute.webpackMiddleware =
-                    middleware(adminNotFoundWebpackCompiler, {
-                        serverSideRender: true,
-                        publicPath: '/',
-                        stats: 'none'
-                    });
-                adminNotFoundMiddlewareFunc.context.logger.info = () => { };
+        });
+        app.use((request, response, next) => {
+            if (request.path.startsWith('/__webpack_hmr_frontstore')) {
+                const frontstoreHotMiddleware = getHotMiddleware(false);
+                frontstoreHotMiddleware(request, response, next);
             }
             else {
-                adminNotFoundMiddlewareFunc = adminNotFoundRoute.webpackMiddleware;
+                next();
             }
-            middlewareFunc(request, response, () => {
-                notFoundMiddlewareFunc(request, response, () => {
-                    adminNotFoundMiddlewareFunc(request, response, next);
-                });
-            });
-        }
-    });
-    app.use((request, response, next) => {
-        if (!isDevelopmentMode()) {
-            return next();
-        }
-        const routes = getRoutes();
-        const route = findRoute(request);
-        request.currentRoute = route;
-        if (!isBuildRequired(route)) {
-            return next();
-        }
-        if (!route.hotMiddleware) {
-            const { webpackCompiler } = route;
-            const hotMiddleware = webpackHotMiddleware(webpackCompiler, {
-                path: `/eHot/${route.id}`
-            });
-            route.hotMiddleware = hotMiddleware;
-        }
-        return route.hotMiddleware(request, response, () => {
-            next();
         });
-    });
+    }
     /** 404 Not Found handle */
     app.use((request, response, next) => {
         if (!request.currentRoute) {
             response.status(404);
             const routes = getRoutes();
             request.currentRoute = routes.find((r) => r.id === 'notFound');
-            setContextValue(request, 'pageInfo', {
+            setPageMetaInfo(request, {
                 title: translate('Not found'),
                 description: translate('Not found')
             });

package/dist/bin/lib/addDefaultMiddlewareFuncs.js.map

@@ -1 +1 @@
-{"version":3,"file":"addDefaultMiddlewareFuncs.js","sourceRoot":"","sources":["../../../src/bin/lib/addDefaultMiddlewareFuncs.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"addDefaultMiddlewareFuncs.js","sourceRoot":"","sources":["../../../src/bin/lib/addDefaultMiddlewareFuncs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,iBAAiB,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,gBAAgB,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,0DAA0D,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEvE,MAAM,UAAU,yBAAyB,CAAC,GAAG;IAC3C,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QAClC,QAAQ,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC/B,IAAI,EAAE,CAAC;QACP,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;;YACzB,oCAAoC;YACpC,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,WAAW,IAAI,CAAC;YAC7D,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtC,OAAO,IAAI,CAAC,CAAC,IAAI;oBACf,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,OAAO;oBAC1C,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,kDAAkD;YAClD,IACE,CAAA,MAAA,OAAO,CAAC,YAAY,0CAAE,EAAE,MAAK,aAAa;gBAC1C,CAAA,MAAA,OAAO,CAAC,YAAY,0CAAE,EAAE,MAAK,kBAAkB,EAC/C,CAAC;gBACD,OAAO;YACT,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,+BAA+B;IAC/B,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtB,qCAAqC;IACrC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE3B,kBAAkB;IAClB,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG;QACX,KAAK,EACH,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5B,IAAI;aACL,CAAC;QACR,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE;YACN,MAAM,EAAE,SAAS,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;SAChE;QACD,MAAM,EAAE,SAAS,CAAC,uBAAuB,EAAE,KAAK,CAAC;QACjD,iBAAiB,EAAE,SAAS,CAAC,kCAAkC,EAAE,IAAI,CAAC;KAC7C,CAAC;IAE5B,IAAI,gBAAgB,EAAE,EAAE,CAAC;QACvB,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAO,CAAC,MAAM,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,MAAM,sBAAsB,GAAG,OAAO,CAAC;QACrC,GAAG,IAAI;QACP,IAAI,EAAE,yBAAyB,EAAE;KAClC,CAAC,CAAC;IAEH,MAAM,2BAA2B,GAAG,OAAO,CAAC;QAC1C,GAAG,IAAI;QACP,IAAI,EAAE,8BAA8B,EAAE;KACvC,CAAC,CAAC;IAEH,gBAAgB;IAChB,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;IACpC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACxC,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACvC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,CACL,+BAA+B,WAAW,+BAA+B,aAAa;iBACnF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChB,IAAI,CAAC,IAAI,CAAC,WAAW,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAC5D,CAAC;QACJ,CAAC;QACD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YACxC,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACpD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QACjC,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,EAAE,CAAC;YACxB,wEAAwE;YACxE,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE,CAAC;YACjC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;IACH,CAAC,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE3B,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACxC,kDAAkD;QAClD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACvE,kHAAkH;QAClH,IAAI,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACzD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,+CAA+C;QAC/C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;YACpC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,yDAAyD;QACzD,MAAM,WAAW,GAAG,MAAM,MAAM,EAAE;aAC/B,IAAI,CAAC,aAAa,CAAC;aACnB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;aACtC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,WAAW,EAAE,CAAC;YAChB,iBAAiB;YACjB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9B,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACnD,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;oBACtC,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,EAAE,CAAC;oBACjC,MAAM,IAAI,GAAU,EAAE,CAAC;oBACvB,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC3B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;wBAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;oBAC3D,CAAC,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YACH,8BAA8B;YAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC5C,sDAAsD;YACtD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;YAC/B,CAAC;YACD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAiB,EAAE,EAAE,CAAC;QACxB,2DAA2D;QAC3D,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;YAClC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBAClD,kBAAkB,CAAC,cAAc,CAAC,GAAG,EAAE;oBACrC,MAAM,EAAE,KAAK,EAAE,GAAG,kBAAkB,CAAC,OAAO,CAAC;oBAC7C,IAAI,KAAK,EAAE,CAAC;wBACV,QAAQ,CAAC,MAAM,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;oBACpD,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;YAClC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBACpD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBAClD,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,0DAA0D;QAC1D,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;YAClC,IACE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBACrC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAChD,CAAC;gBACD,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBACxD,uBAAuB,CAAC,cAAc,CAAC,GAAG,EAAE;oBAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC;oBAClD,IAAI,KAAK,EAAE,CAAC;wBACV,QAAQ,CAAC,MAAM,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;oBACpD,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;YAClC,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBACzD,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBACxD,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,2BAA2B;IAC3B,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QAClC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC;YAC/D,eAAe,CAAC,OAAO,EAAE;gBACvB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC;gBAC7B,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC;aACpC,CAAC,CAAC;YACH,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/bin/lib/bootstrap/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../src/bin/lib/bootstrap/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAgBpC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,UAAU,mBAAmB,CACnE,MAAc,EACd,UAA4B,EAAE;IAE9B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC3D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IACD,wBAAwB;IACxB,MAAM,aAAa,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzD,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAoB,CAAC;IAEnE,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../src/bin/lib/bootstrap/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAgBpC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,UAAU,mBAAmB,CACnE,MAAc,EACd,UAA4B,EAAE;IAE9B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC3D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,wBAAwB;IACxB,MAAM,aAAa,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzD,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAoB,CAAC;IAEnE,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC,CAAC"}

package/dist/bin/lib/bootstrap/migrate.d.ts

@@ -1 +1 @@
-export function migrate(modules: any): Promise<void>;
+export function migrate(modules: any, connection?: null): Promise<void>;

package/dist/bin/lib/bootstrap/migrate.js

@@ -6,12 +6,12 @@ import semver from 'semver';
 import { error } from '../../../lib/log/logger.js';
 import { getConnection, pool } from '../../../lib/postgres/connection.js';
 import { createMigrationTable } from '../../install/createMigrationTable.js';
-async function getCurrentInstalledVersion(module) {
+async function getCurrentInstalledVersion(module, connection = null) {
     /** Check for current installed version */
     const check = await select()
         .from('migration')
         .where('module', '=', module)
-        .load(pool);
+        .load(connection || pool);
     if (!check) {
         return '0.0.1';
     }
@@ -19,7 +19,7 @@ async function getCurrentInstalledVersion(module) {
         return check.version;
     }
 }
-async function migrateModule(module) {
+async function migrateModule(module, connection = null) {
     /** Check if the module has migration folder, if not ignore it */
     if (!existsSync(path.resolve(module.path, 'migration'))) {
         return;
@@ -31,39 +31,45 @@ async function migrateModule(module) {
         dirent.name.match(/^Version-+([1-9].[0-9].[0-9])+.js$/))
         .map((dirent) => dirent.name.replace('Version-', '').replace('.js', ''))
         .sort((first, second) => semver.lt(first, second));
-    const currentInstalledVersion = await getCurrentInstalledVersion(module.name);
+    const currentInstalledVersion = await getCurrentInstalledVersion(module.name, connection);
     for (const version of migrations) {
         /** If the version is lower or equal the installed version, ignore it */
         if (semver.lte(version, currentInstalledVersion)) {
             continue;
         }
-        const connection = await getConnection();
-        await startTransaction(connection);
+        const migrationConnection = connection || (await getConnection());
+        if (!connection) {
+            await startTransaction(migrationConnection);
+        }
         /** We expect the migration script to provide a function as a default export */
         try {
             const versionModule = await import(pathToFileURL(path.resolve(module.path, 'migration', `Version-${version}.js`)));
-            await versionModule.default(connection);
+            await versionModule.default(migrationConnection);
             await insertOnUpdate('migration', ['module'])
                 .given({
                 module: module.name,
                 version
             })
-                .execute(connection, false);
-            await commit(connection);
+                .execute(migrationConnection, false);
+            if (!connection) {
+                await commit(migrationConnection);
+            }
         }
         catch (e) {
-            await rollback(connection);
+            if (!connection) {
+                await rollback(migrationConnection);
+            }
             throw new Error(`Migration failed for module ${module.name}, version ${version}\n${e}`);
         }
     }
 }
-export async function migrate(modules) {
+export async function migrate(modules, connection = null) {
     try {
-        const connection = await getConnection();
+        const psqlConnection = connection || (await getConnection());
         // Create a migration table if not exists. This is for the first time installation
-        await createMigrationTable(connection);
+        await createMigrationTable(psqlConnection);
         for (const module of modules) {
-            await migrateModule(module);
+            await migrateModule(module, connection);
         }
     }
     catch (e) {

package/dist/bin/lib/bootstrap/migrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/bin/lib/bootstrap/migrate.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/bin/lib/bootstrap/migrate.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EACL,MAAM,EACN,cAAc,EACd,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,KAAK,UAAU,0BAA0B,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IACjE,0CAA0C;IAC1C,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE;SACzB,IAAI,CAAC,WAAW,CAAC;SACjB,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC;SAC5B,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IACpD,iEAAiE;IACjE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QACxD,OAAO;IACT,CAAC;IACD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE;QACrE,aAAa,EAAE,IAAI;KACpB,CAAC;SACC,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAC1D;SACA,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SACvE,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAErD,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAC9D,MAAM,CAAC,IAAI,EACX,UAAU,CACX,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE,CAAC;QACjC,wEAAwE;QACxE,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAC,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QACD,MAAM,mBAAmB,GAAG,UAAU,IAAI,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAC9C,CAAC;QAED,+EAA+E;QAC/E,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,MAAM,CAChC,aAAa,CACX,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,OAAO,KAAK,CAAC,CAChE,CACF,CAAC;YACF,MAAM,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAEjD,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC;iBAC1C,KAAK,CAAC;gBACL,MAAM,EAAE,MAAM,CAAC,IAAI;gBACnB,OAAO;aACR,CAAC;iBACD,OAAO,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACvC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,QAAQ,CAAC,mBAAmB,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,IAAI,KAAK,CACb,+BAA+B,MAAM,CAAC,IAAI,aAAa,OAAO,KAAK,CAAC,EAAE,CACvE,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;IACtD,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,UAAU,IAAI,CAAC,MAAM,aAAa,EAAE,CAAC,CAAC;QAC7D,kFAAkF;QAClF,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAE3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,CAAC,CAAC,CAAC;QACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/bin/lib/buildEntry.js

@@ -7,8 +7,8 @@ import JSON5 from 'json5';
 import { getComponentsByRoute } from '../../lib/componee/getComponentsByRoute.js';
 import { CONSTANTS } from '../../lib/helpers.js';
 import { error } from '../../lib/log/logger.js';
+import { generateComponentKey } from '../../lib/util/keyGenerator.js';
 import { getRouteBuildPath } from '../../lib/webpack/getRouteBuildPath.js';
-import { generateComponentKey } from '../../lib/webpack/util/keyGenerator.js';
 import { parseGraphql } from '../../lib/webpack/util/parseGraphql.js';
 import { getEnabledWidgets } from '../../lib/widget/widgetManager.js';
 /**
@@ -67,12 +67,15 @@ export async function buildEntry(routes, clientOnly = false) {
             const url = route.isAdmin
                 ? pathToFileURL(widget.settingComponent).toString()
                 : pathToFileURL(widget.component).toString();
-            imports.push(`import ${widget.type} from '${url}';`);
-            areas['*'][widget.type] = {
-                id: widget.type,
+            const id = generateComponentKey(route.isAdmin
+                ? `admin_widget_${widget.type}`
+                : `widget_${widget.type}`);
+            imports.push(`import ${id} from '${url}';`);
+            areas['*'][id] = {
+                id,
                 sortOrder: widget.sortOrder || 0,
                 component: {
-                    default: `---${widget.type}---`
+                    default: `---${id}---`
                 }
             };
         });

package/dist/bin/lib/buildEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildEntry.js","sourceRoot":"","sources":["../../../src/bin/lib/buildEntry.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildEntry.js","sourceRoot":"","sources":["../../../src/bin/lib/buildEntry.js"],"names":[],"mappings":"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"}

package/dist/bin/lib/devEnvHelper.d.ts

@@ -0,0 +1,6 @@
+import webpack from 'webpack';
+import middleware from 'webpack-dev-middleware';
+declare function getWebpackCompiler(isAdmin: boolean): webpack.Compiler;
+declare function getDevMiddleware(isAdmin: boolean): middleware.API<import("http").IncomingMessage, middleware.ServerResponse>;
+declare function getHotMiddleware(isAdmin: boolean): any;
+export { getWebpackCompiler, getDevMiddleware, getHotMiddleware };

package/dist/bin/lib/devEnvHelper.js

@@ -0,0 +1,42 @@
+import webpack from 'webpack';
+import middleware from 'webpack-dev-middleware';
+import webpackHotMiddleware from 'webpack-hot-middleware';
+import { createConfigClient } from '../../lib/webpack/dev/createConfigClient.js';
+const webpackConfig = {
+    admin: {},
+    frontStore: {}
+};
+function getWebpackCompiler(isAdmin) {
+    const area = isAdmin ? 'admin' : 'frontStore';
+    if (!webpackConfig[area].compiler) {
+        webpackConfig[area].compiler = webpack(createConfigClient(isAdmin));
+    }
+    return webpackConfig[area].compiler;
+}
+function getDevMiddleware(isAdmin) {
+    const area = isAdmin ? 'admin' : 'frontStore';
+    if (!webpackConfig[area].devMiddleware) {
+        const compiler = getWebpackCompiler(isAdmin);
+        const devMiddleware = middleware(compiler, {
+            serverSideRender: true,
+            publicPath: isAdmin ? '/backend/' : '/',
+            stats: 'none'
+        });
+        devMiddleware.context.logger.info = () => { };
+        webpackConfig[area].devMiddleware = devMiddleware;
+    }
+    return webpackConfig[area].devMiddleware;
+}
+function getHotMiddleware(isAdmin) {
+    const area = isAdmin ? 'admin' : 'frontStore';
+    if (!webpackConfig[area].hotMiddleware) {
+        const compiler = getWebpackCompiler(isAdmin);
+        const hotMiddleware = webpackHotMiddleware(compiler, {
+            path: isAdmin ? `/__webpack_hmr_admin` : `/__webpack_hmr_frontstore`
+        });
+        webpackConfig[area].hotMiddleware = hotMiddleware;
+    }
+    return webpackConfig[area].hotMiddleware;
+}
+export { getWebpackCompiler, getDevMiddleware, getHotMiddleware };
+//# sourceMappingURL=devEnvHelper.js.map

package/dist/bin/lib/devEnvHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devEnvHelper.js","sourceRoot":"","sources":["../../../src/bin/lib/devEnvHelper.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAejF,MAAM,aAAa,GAAG;IACpB,KAAK,EAAE,EAAE;IACT,UAAU,EAAE,EAAE;CACF,CAAC;AAEf,SAAS,kBAAkB,CAAC,OAAgB;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACtC,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB;IACxC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,EAAE;YACzC,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG;YACvC,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QACH,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC7C,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,GAAG,aAAa,CAAC;IACpD,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC;AAC3C,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB;IACxC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,oBAAoB,CAAC,QAAQ,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,2BAA2B;SACrE,CAAC,CAAC;QACH,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,GAAG,aAAa,CAAC;IACpD,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC;AAC3C,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/bin/lib/watch/broadcast.js

@@ -2,14 +2,11 @@ import { getRoutes } from '../../../lib/router/Router.js';
 export const broadcast = async () => {
     const routes = getRoutes();
     routes.forEach((route) => {
-        if (!route.isApi &&
-            !['staticAsset', 'adminStaticAsset'].includes(route.id)) {
+        if (route.hotMiddleware) {
             const { hotMiddleware } = route;
-            if (hotMiddleware) {
-                hotMiddleware.publish({
-                    action: 'serverReloaded'
-                });
-            }
+            hotMiddleware.publish({
+                action: 'serverReloaded'
+            });
         }
     });
 };

package/dist/bin/lib/watch/broadcast.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/bin/lib/watch/broadcast.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IACE,CAAC,KAAK,CAAC,KAAK;YACZ,CAAC,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EACvD,CAAC;YACD,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;YAChC,IAAI,aAAa,EAAE,CAAC;gBAClB,aAAa,CAAC,OAAO,CAAC;oBACpB,MAAM,EAAE,gBAAgB;iBACzB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../../src/bin/lib/watch/broadcast.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;YAChC,aAAa,CAAC,OAAO,CAAC;gBACpB,MAAM,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}