Spartan/wiki
1
0
Fork 0
mirror of https://github.com/requarks/wiki.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from opalmay/revert-3-revert-2-dev

Browse Source 
Revert "Revert "a""
This commit is contained in:
opalmay 2021-03-28 12:34:30 +03:00 committed by GitHub
commit 543092a250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/servers.js
View File

@ -130,7 +130,7 @@ module.exports = {
path: '/graphql-subscriptions'
}
})
this.servers.graph.applyMiddleware({ app: WIKI.app })
this.servers.graph.applyMiddleware({ app: WIKI.app, cors: false })
},
/**
* Close all active connections

4
server/master.js
View File

@ -42,8 +42,8 @@ module.exports = async () => {
// ----------------------------------------
app.use(mw.security)
app.use(cors(WIKI.config.cors))
app.options('*', cors(WIKI.config.cors))
app.use(cors({ origin: false }))
app.options('*', cors({ origin: false }))
if (WIKI.config.security.securityTrustProxy) {
app.enable('trust proxy')
}

2
server/modules/rendering/html-core/renderer.js
View File

@ -250,7 +250,7 @@ module.exports = {
const list = $(node).contents().toArray()
list.forEach(item => {
if (item.type === 'text') {
const rawText = $(item).text()
const rawText = $(item).text().replace(/\r?\n|\r/g, '')
if (mustacheRegExp.test(rawText)) {
$(item).parent().attr('v-pre', true)
}