qumra-engine 2.0.17 → 2.0.19

package/dist/filters/logic/urls/assets.d.ts

@@ -1 +1 @@
-export default function assets(file: string): string;
+export default function assets(file: string, env: any): string;

package/dist/filters/logic/urls/assets.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = assets;
-function assets(file) {
-    return `/assets/${file}`;
+const globals_1 = require("../../../store/globals");
+function assets(file, env) {
+    const assets = (0, globals_1.getGlobal)("assets");
+    console.log("🚀 ~ assets ~ assets:", assets);
+    return `${assets}${file}`;
 }

package/dist/filters/registerAllFilters.d.ts

@@ -1,2 +1,2 @@
 import nunjucks from 'nunjucks';
-export default function registerAllFilters(env: nunjucks.Environment): void;
+export declare function registerAllFilters(env: nunjucks.Environment): void;

package/dist/filters/registerAllFilters.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = registerAllFilters;
+exports.registerAllFilters = registerAllFilters;
 const filters = __importStar(require("./"));
 function registerAllFilters(env) {
     Object.entries(filters).forEach(([name, fn]) => {

package/dist/middleware/filters.middleware.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nunjucksFiltersMiddleWare = void 0;
-const registerAllFilters_1 = __importDefault(require("../filters/registerAllFilters"));
+const registerAllFilters_1 = require("../filters/registerAllFilters");
 const nunjucksFiltersMiddleWare = (req, res, next) => {
-    (0, registerAllFilters_1.default)(res.locals.env);
+    (0, registerAllFilters_1.registerAllFilters)(res.locals.env);
     next();
 };
 exports.nunjucksFiltersMiddleWare = nunjucksFiltersMiddleWare;

package/dist/middleware/nunjucks.middleware.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nunjucksMiddleWare = void 0;
 const path_1 = __importDefault(require("path"));
 const nunjucksEnv_1 = require("../nunjucksEnv");
+const globals_1 = require("../store/globals");
 const nunjucksMiddleWare = (req, res, next) => {
     console.log(2222222222);
     const isDev = res.locals.mode === "devlopment";
@@ -13,7 +14,10 @@ const nunjucksMiddleWare = (req, res, next) => {
     console.log("🚀 ~ res.locals:", res.locals);
     console.log("🚀 ~ isDev:", isDev);
     console.log("🚀 ~ res.locals.themePath:", res.locals.render.themePath);
-    const mainPath = isDev ? path_1.default.join(process.cwd()) : res.locals.render.themePath;
+    const mainPath = isDev
+        ? path_1.default.join(process.cwd())
+        : path_1.default.join(res.locals.themesRepo, res.locals.render.themePath);
+    console.log("🚀 ~ mainPath:", mainPath);
     const paths = {
         pagesPath: path_1.default.join(mainPath, "pages"),
         layoutsPath: path_1.default.join(mainPath, "layouts"),
@@ -31,6 +35,7 @@ const nunjucksMiddleWare = (req, res, next) => {
         env.addGlobal(key, value);
     }
     env.addGlobal("mainPath", mainPath);
+    (0, globals_1.setGlobal)("assets", res.locals.render.globals?.assets);
     res.locals.env = env;
     next();
 };

package/dist/middleware.d.ts

@@ -4,6 +4,7 @@ interface IStartEngine {
     getRender?: CacheGetter;
     setRender?: CacheSetter;
     port: number;
+    themesRepo?: string;
 }
-declare const startEngine: ({ mode, getRender, setRender, port }: IStartEngine) => Promise<void>;
+declare const startEngine: ({ mode, getRender, setRender, port, themesRepo, }: IStartEngine) => Promise<void>;
 export default startEngine;

package/dist/middleware.js

@@ -17,7 +17,7 @@ const globals_middleware_1 = require("./middleware/globals.middleware");
 const extensions_middleware_1 = require("./middleware/extensions.middleware");
 const isPathAllowedToRender_1 = require("./utils/isPathAllowedToRender");
 const mergeData_middleware_1 = require("./middleware/mergeData.middleware");
-const startEngine = async ({ mode, getRender, setRender, port = 3000 }) => {
+const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo, }) => {
     try {
         const app = (0, express_1.default)();
         app.set("view engine", "nunjucks");
@@ -25,8 +25,8 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000 }) => {
         app.use((0, init_middleware_1.initMiddleware)({ mode, getRender, setRender }));
         const avilablePort = await (0, findAvailablePort_1.findAvailablePort)(port);
         if (mode === "devlopment") {
-            const staticPath = path_1.default.join(process.cwd(), 'assets');
-            app.use('/assets', express_1.default.static(staticPath));
+            const staticPath = path_1.default.join(process.cwd(), "assets");
+            app.use("/assets", express_1.default.static(staticPath));
         }
         app.use((req, res, next) => {
             if (!(0, isPathAllowedToRender_1.isPathAllowedToRender)(res.locals.parsedUrl.pathname)) {
@@ -36,6 +36,17 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000 }) => {
                 next();
             }
         });
+        app.use((req, res, next) => {
+            var themesRepoPath;
+            if (themesRepo) {
+                themesRepoPath = path_1.default.join(process.cwd(), themesRepo);
+            }
+            else {
+                themesRepoPath = process.cwd();
+            }
+            res.locals.themesRepo = themesRepoPath;
+            next();
+        });
         app.use(prepareData_middleware_1.prepareDataMiddleware);
         app.use(nunjucks_middleware_1.nunjucksMiddleWare);
         app.use(mergeData_middleware_1.mergeDataMiddleware);

package/dist/types/sharedTypes.d.ts

@@ -1,6 +1,7 @@
 export interface Globals {
     app: any;
     Setting: any;
+    assets: string;
 }
 export interface RenderContext {
     page: Page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {