diff --git a/server/admin.api.js b/server/admin.api.js index d0676f47f..1b6e5328d 100644 --- a/server/admin.api.js +++ b/server/admin.api.js @@ -13,7 +13,6 @@ const isProd = nodeEnv === 'production'; import HomebrewAPI from './homebrew.api.js'; import asyncHandler from 'express-async-handler'; -import { splitTextStyleAndMetadata } from '../shared/helpers.js'; process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin'; process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password3'; @@ -148,8 +147,6 @@ export default function createAdminApi(vite) { brew[property] = cleanText(brew[property]); }); - splitTextStyleAndMetadata(brew); - req.body = brew; // Remove Account from request to prevent Admin user from being added to brew as an Author diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 4cf9f1fc1..70a32c59c 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -193,13 +193,13 @@ const api = { const fixedStub = migrateSystemsToTags(stub); req.brew = fixedStub; + splitTextStyleAndMetadata(req.brew); next(); }; }, getCSS : async (req, res)=>{ const { brew } = req; if(!brew) return res.status(404).send(''); - splitTextStyleAndMetadata(brew); if(!brew.style) return res.status(404).send(''); res.set({ @@ -345,7 +345,6 @@ const api = { }); currentTheme = req.brew; - splitTextStyleAndMetadata(currentTheme); if(!currentTheme.tags.some((tag)=>tag === 'meta:theme' || tag === 'meta:Theme')) throw { brewId: req.params.id, name: 'Invalid Theme Selected', message: 'Selected theme does not have the meta:theme tag', status: 422, HBErrorCode: '10' }; themeName ??= currentTheme.title; @@ -384,7 +383,6 @@ const api = { // Initialize brew from request and body, destructure query params, and set the initial value for the after-save method const brewFromClient = api.excludePropsFromUpdate(req.body); const brewFromServer = req.brew; - splitTextStyleAndMetadata(brewFromServer); if(brewFromServer?.version !== brewFromClient?.version){ console.log(`Version mismatch on brew ${brewFromClient.editId}`); diff --git a/server/page-routes.js b/server/page-routes.js index e2e7be193..85436d2bc 100644 --- a/server/page-routes.js +++ b/server/page-routes.js @@ -244,7 +244,6 @@ export default function pageRoutes({ }; sanitizeBrew(req.brew, 'edit'); - splitTextStyleAndMetadata(req.brew); res.header('Cache-Control', 'no-cache, no-store'); //reload the latest saved brew when pressing back button, not the cached version before save. return next(); })); @@ -252,7 +251,6 @@ export default function pageRoutes({ //New Page from ID app.get('/new/:id', asyncHandler(getBrew('share')), asyncHandler(async(req, res, next)=>{ sanitizeBrew(req.brew, 'share'); - splitTextStyleAndMetadata(req.brew); const brew = { shareId : req.brew.shareId, title : `CLONE - ${req.brew.title}`, @@ -303,14 +301,13 @@ export default function pageRoutes({ const googleId = brew.googleId; const shareId = brew.shareId; await GoogleActions.increaseView(googleId, shareId, 'share', brew) - .catch((err)=>{next(err);}); + .catch((err)=>{next(err);}); } else { await HomebrewModel.increaseView({ shareId: brew.shareId }); } }; brew.authors.includes(req.account?.username) ? sanitizeBrew(req.brew, 'shareAuthor') : sanitizeBrew(req.brew, 'share'); - splitTextStyleAndMetadata(req.brew); return next(); })); diff --git a/vite.config.js b/vite.config.js index 4ec249a88..b22747ce5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,12 +8,12 @@ export default defineConfig({ plugins : [react(), generateAssetsPlugin()], resolve : { alias : { - '@vitreum' : path.resolve(__dirname, './vitreum'), - '@shared' : path.resolve(__dirname, './shared'), - '@sharedStyles' : path.resolve(__dirname, './shared/naturalcrit/styles'), - '@navbar' : path.resolve(__dirname, './client/homebrew/navbar'), - '@themes' : path.resolve(__dirname, './themes'), - '@components' : path.resolve(__dirname, './client/components') + '@vitreum' : path.resolve(import.meta.dirname, './vitreum'), + '@shared' : path.resolve(import.meta.dirname, './shared'), + '@sharedStyles' : path.resolve(import.meta.dirname, './shared/naturalcrit/styles'), + '@navbar' : path.resolve(import.meta.dirname, './client/homebrew/navbar'), + '@themes' : path.resolve(import.meta.dirname, './themes'), + '@components' : path.resolve(import.meta.dirname, './client/components') }, }, build : {