Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
278a9bef
You need to sign in or sign up before continuing.
Unverified
Commit
278a9bef
authored
Apr 04, 2023
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: ext path fix + noto-emoji build script
parent
50054dfa
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
20 deletions
+28
-20
.eslintignore
.eslintignore
+0
-8
.eslintrc.yml
.eslintrc.yml
+8
-0
SECURITY.md
.github/SECURITY.md
+0
-0
.gitignore
.gitignore
+0
-5
build.sh
dev/noto-emoji-build/build.sh
+9
-0
ext.js
server/modules/extensions/puppeteer/ext.js
+2
-2
ext.js
server/modules/extensions/sharp/ext.js
+3
-3
EditorMarkdown.vue
ux/src/components/EditorMarkdown.vue
+1
-1
EditorWysiwyg.vue
ux/src/components/EditorWysiwyg.vue
+5
-1
No files found.
.eslintignore
deleted
100644 → 0
View file @
50054dfa
**/node_modules/**
**/*.min.js
assets/**
client/libs/**
coverage/**
repo/**
data/**
logs/**
.eslintrc.yml
View file @
278a9bef
...
@@ -14,3 +14,11 @@ globals:
...
@@ -14,3 +14,11 @@ globals:
navigator
:
false
navigator
:
false
window
:
false
window
:
false
WIKI
:
true
WIKI
:
true
ignorePatterns
:
-
'
**/node_modules/**'
-
'
**/*.min.js'
-
'
assets/**'
-
'
coverage/**'
-
'
repo/**'
-
'
data/**'
-
'
logs/**'
SECURITY.md
→
.github/
SECURITY.md
View file @
278a9bef
File moved
.gitignore
View file @
278a9bef
...
@@ -18,13 +18,8 @@ npm-debug.log*
...
@@ -18,13 +18,8 @@ npm-debug.log*
# Generated assets
# Generated assets
/assets
/assets
/assets-legacy
/server/views/base.pug
/server/views/base.pug
# Webpack
.webpack-cache
.fusebox
# Config Files
# Config Files
/config.yml
/config.yml
...
...
dev/noto-emoji-build/build.sh
0 → 100755
View file @
278a9bef
echo
"Downloading latest assets..."
wget
-q
-O
noto-emoji.tar.gz https://github.com/googlefonts/noto-emoji/archive/refs/heads/main.tar.gz
echo
"Extracting assets..."
tar
--strip-components
=
1
-xzf
noto-emoji.tar.gz noto-emoji-main/svg
echo
"Building asar..."
npx @electron/asar pack svg noto-emoji.asar
echo
"Cleaning up..."
rm
-rf
svg noto-emoji.tar.gz
echo
"Done."
server/modules/extensions/puppeteer/ext.js
View file @
278a9bef
...
@@ -15,7 +15,7 @@ module.exports = {
...
@@ -15,7 +15,7 @@ module.exports = {
isInstallable
:
true
,
isInstallable
:
true
,
async
check
()
{
async
check
()
{
try
{
try
{
this
.
isInstalled
=
await
fs
.
pathExists
(
path
.
join
(
process
.
cwd
()
,
'node_modules/puppeteer-core/.local-chromium'
))
this
.
isInstalled
=
await
fs
.
pathExists
(
path
.
join
(
WIKI
.
SERVERPATH
,
'node_modules/puppeteer-core/.local-chromium'
))
}
catch
(
err
)
{
}
catch
(
err
)
{
this
.
isInstalled
=
false
this
.
isInstalled
=
false
}
}
...
@@ -24,7 +24,7 @@ module.exports = {
...
@@ -24,7 +24,7 @@ module.exports = {
async
install
()
{
async
install
()
{
try
{
try
{
const
{
stdout
,
stderr
}
=
await
exec
(
'node install.js'
,
{
const
{
stdout
,
stderr
}
=
await
exec
(
'node install.js'
,
{
cwd
:
path
.
join
(
process
.
cwd
()
,
'node_modules/puppeteer-core'
),
cwd
:
path
.
join
(
WIKI
.
SERVERPATH
,
'node_modules/puppeteer-core'
),
timeout
:
300000
,
timeout
:
300000
,
windowsHide
:
true
windowsHide
:
true
})
})
...
...
server/modules/extensions/sharp/ext.js
View file @
278a9bef
...
@@ -15,17 +15,17 @@ module.exports = {
...
@@ -15,17 +15,17 @@ module.exports = {
isInstalled
:
false
,
isInstalled
:
false
,
isInstallable
:
true
,
isInstallable
:
true
,
async
check
()
{
async
check
()
{
this
.
isInstalled
=
await
fs
.
pathExists
(
path
.
join
(
process
.
cwd
()
,
'node_modules/sharp/wiki_installed.txt'
))
this
.
isInstalled
=
await
fs
.
pathExists
(
path
.
join
(
WIKI
.
SERVERPATH
,
'node_modules/sharp/wiki_installed.txt'
))
return
this
.
isInstalled
return
this
.
isInstalled
},
},
async
install
()
{
async
install
()
{
try
{
try
{
const
{
stdout
,
stderr
}
=
await
exec
(
'node install/libvips && node install/dll-copy'
,
{
const
{
stdout
,
stderr
}
=
await
exec
(
'node install/libvips && node install/dll-copy'
,
{
cwd
:
path
.
join
(
process
.
cwd
()
,
'node_modules/sharp'
),
cwd
:
path
.
join
(
WIKI
.
SERVERPATH
,
'node_modules/sharp'
),
timeout
:
120000
,
timeout
:
120000
,
windowsHide
:
true
windowsHide
:
true
})
})
await
fs
.
ensureFile
(
path
.
join
(
process
.
cwd
()
,
'node_modules/sharp/wiki_installed.txt'
))
await
fs
.
ensureFile
(
path
.
join
(
WIKI
.
SERVERPATH
,
'node_modules/sharp/wiki_installed.txt'
))
this
.
isInstalled
=
true
this
.
isInstalled
=
true
WIKI
.
logger
.
info
(
stdout
)
WIKI
.
logger
.
info
(
stdout
)
WIKI
.
logger
.
warn
(
stderr
)
WIKI
.
logger
.
warn
(
stderr
)
...
...
ux/src/components/EditorMarkdown.vue
View file @
278a9bef
...
@@ -494,7 +494,7 @@ onMounted(async () => {
...
@@ -494,7 +494,7 @@ onMounted(async () => {
// this.cm.on('paste', this.onCmPaste)
// this.cm.on('paste', this.onCmPaste)
// // Render initial preview
// // Render initial preview
// this.processContent(this.$store.get('editor/content')
)
processContent
(
pageStore
.
content
)
nextTick
(()
=>
{
nextTick
(()
=>
{
cm
.
value
.
refresh
()
cm
.
value
.
refresh
()
cm
.
value
.
focus
()
cm
.
value
.
focus
()
...
...
ux/src/components/EditorWysiwyg.vue
View file @
278a9bef
...
@@ -116,6 +116,7 @@ import { useMeta, useQuasar, setCssVar } from 'quasar'
...
@@ -116,6 +116,7 @@ import { useMeta, useQuasar, setCssVar } from 'quasar'
import
{
useI18n
}
from
'vue-i18n'
import
{
useI18n
}
from
'vue-i18n'
import
{
useEditorStore
}
from
'src/stores/editor'
import
{
useEditorStore
}
from
'src/stores/editor'
import
{
useSiteStore
}
from
'src/stores/site'
// QUASAR
// QUASAR
...
@@ -124,6 +125,7 @@ const $q = useQuasar()
...
@@ -124,6 +125,7 @@ const $q = useQuasar()
// STORES
// STORES
const
editorStore
=
useEditorStore
()
const
editorStore
=
useEditorStore
()
const
siteStore
=
useSiteStore
()
// I18N
// I18N
...
@@ -494,7 +496,9 @@ const menuBar = [
...
@@ -494,7 +496,9 @@ const menuBar = [
icon
:
'mdi-image-plus'
,
icon
:
'mdi-image-plus'
,
title
:
'Image'
,
title
:
'Image'
,
action
:
()
=>
{
action
:
()
=>
{
// TODO: insert image
siteStore
.
$patch
({
overlay
:
'FileManager'
})
}
}
},
},
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment