Compare commits

...

3 Commits
master ... pkg

Author SHA1 Message Date
Louis Lam
3b4b0b4caa Try to add pkg 2022-05-19 22:46:44 +08:00
Louis Lam
c292b74f8e Merge remote-tracking branch 'origin/master' into pkg
# Conflicts:
#	package-lock.json
#	package.json
2022-05-19 21:31:57 +08:00
Louis Lam
58bd14ee2e add pkg 2022-04-07 23:40:21 +08:00
5 changed files with 1122 additions and 29 deletions

View File

@ -8,6 +8,7 @@
**/.dockerignore
/private
**/.git
**/bin
**/.gitignore
**/docker-compose*
**/[Dd]ockerfile*

2
.gitignore vendored
View File

@ -4,7 +4,7 @@ dist
dist-ssr
*.local
.idea
/bin
/data
!/data/.gitkeep
.vscode

1126
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,19 @@
"engines": {
"node": "14.* || >=16.*"
},
"bin": {
"uptime-kuma": "./server/server.js"
},
"pkg": {
"assets": [
"dist/**/*",
"db/**/*",
"server/jobs/**/*",
"server/model/**/*"
],
"targets": [ "node16-win-x64" ],
"outputPath": "bin"
},
"scripts": {
"install-legacy": "npm install",
"update-legacy": "npm update",
@ -57,7 +70,8 @@
"ncu-patch": "npm-check-updates -u -t patch",
"release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
"release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
"git-remove-tag": "git tag -d"
"git-remove-tag": "git tag -d",
"build-binary": "pkg ."
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "~1.2.36",
@ -143,6 +157,7 @@
"jest": "~27.2.5",
"jest-puppeteer": "~6.0.3",
"npm-check-updates": "^12.5.9",
"pkg": "5.7.0",
"postcss-html": "^1.3.1",
"puppeteer": "~13.1.3",
"sass": "~1.42.1",

View File

@ -16,8 +16,11 @@ const jobs = [
* @returns {Bree}
*/
const initBackgroundJobs = function (args) {
log.debug("jobs", "Jobs dir: " + path.resolve("server", "jobs"));
log.debug("jobs", "Jobs dir: " + path.join(__dirname, "./jobs"));
bree = new Bree({
root: path.resolve("server", "jobs"),
root: path.join(__dirname, "./jobs"),
jobs,
worker: {
env: SHARE_ENV,