0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-15 10:32:45 +00:00

Switch to npm mopdule based brew variables

`
This commit is contained in:
David Bolack
2025-06-04 21:43:51 -05:00
parent 13450cc081
commit 21192505bb
3 changed files with 7 additions and 6 deletions

5
package-lock.json generated
View File

@@ -43,7 +43,7 @@
"marked-nonbreaking-spaces": "^1.0.1", "marked-nonbreaking-spaces": "^1.0.1",
"marked-smartypants-lite": "^1.0.3", "marked-smartypants-lite": "^1.0.3",
"marked-subsuper-text": "^1.0.3", "marked-subsuper-text": "^1.0.3",
"marked-variables": "file:../marked-variables", "marked-variables": "^1.0.0",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.30.1", "moment": "^2.30.1",
"mongoose": "^8.15.0", "mongoose": "^8.15.0",
@@ -84,6 +84,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"dedent": "^1.6.0",
"dedent-tabs": "^0.10.3", "dedent-tabs": "^0.10.3",
"expr-eval": "^2.0.2", "expr-eval": "^2.0.2",
"romans": "^3.1.0", "romans": "^3.1.0",
@@ -109,7 +110,7 @@
"eslint-plugin-promise": "^6.6.0", "eslint-plugin-promise": "^6.6.0",
"jest-cli": "^29.7.0", "jest-cli": "^29.7.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"marked": "^15.0.4", "marked": "^15.0.12",
"rollup": "^4.29.2", "rollup": "^4.29.2",
"semantic-release": "^24.2.0" "semantic-release": "^24.2.0"
}, },

View File

@@ -116,7 +116,7 @@
"marked-nonbreaking-spaces": "^1.0.1", "marked-nonbreaking-spaces": "^1.0.1",
"marked-smartypants-lite": "^1.0.3", "marked-smartypants-lite": "^1.0.3",
"marked-subsuper-text": "^1.0.3", "marked-subsuper-text": "^1.0.3",
"marked-variables": "file:../marked-variables", "marked-variables": "^1.0.0",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.30.1", "moment": "^2.30.1",
"mongoose": "^8.15.0", "mongoose": "^8.15.0",

View File

@@ -479,13 +479,13 @@ const mergeHTMLTags = (originalTags, newTags)=>{
const Markdown = { const Markdown = {
marked : Marked, marked : Marked,
render : (rawBrewText, pageNumber=0)=>{ render : (rawBrewText, pageNumber=0)=>{
const lastPageNumber = pageNumber > 0 ? getMarkedVariable(pageNumber - 1, 'HB_pageNumber.content') : 0; const lastPageNumber = pageNumber > 0 ? getMarkedVariable(pageNumber - 1, 'HB_pageNumber') : 0;
setMarkedVarPage(pageNumber);
clearMarkedVarsQueue();
setMarkedVariable(pageNumber, //Reset global links for current page, to ensure values are parsed in order setMarkedVariable(pageNumber, //Reset global links for current page, to ensure values are parsed in order
'HB_pageNumber', //Add document variables for this page 'HB_pageNumber', //Add document variables for this page
!isNaN(Number(lastPageNumber)) ? Number(lastPageNumber) + 1 : lastPageNumber !isNaN(Number(lastPageNumber)) ? Number(lastPageNumber) + 1 : lastPageNumber
); );
clearMarkedVarsQueue(); //Could move into MarkedVariables()
setMarkedVarPage(pageNumber);
if(pageNumber==0) { if(pageNumber==0) {
MarkedGFMResetHeadingIDs(); MarkedGFMResetHeadingIDs();
} }