Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

chore(nx): integrate edit-docs

Browse Source
This commit is contained in:
Elian Doran
2025-04-29 12:50:05 +03:00
parent d812471f8c
commit 00396614ed
12 changed files with 145 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_regroup_monorepo/apps/edit-docs/package.json
View File

@@ -5,9 +5,9 @@
"main": "index.js",
"type": "module",
"scripts": {
"docs:edit": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-docs TRILIUM_ENV=dev TRILIUM_INTEGRATION_TEST=memory-no-store TRILIUM_PORT=37741 electron ./src/electron-docs-main.ts .",
"docs:edit-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-docs TRILIUM_PORT=37741 TRILIUM_ENV=dev TRILIUM_INTEGRATION_TEST=memory-no-store nix-shell -p electron_33 --run \"electron ./src/electron-docs-main.ts .\"",
"demo:edit": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-demo TRILIUM_ENV=dev TRILIUM_INTEGRATION_TEST=memory-no-store TRILIUM_PORT=37741 electron ./src/electron-edit-demo.ts .",
"docs:edit": "cross-env NODE_OPTIONS=\"--import tsx\" electron ./src/electron-docs-main.ts .",
"docs:edit-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" nix-shell -p electron_33 --run \"electron ./src/electron-docs-main.ts .\"",
"demo:edit": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-demo electron ./src/electron-edit-demo.ts .",
"demo:edit-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data-docs TRILIUM_PORT=37741 TRILIUM_ENV=dev TRILIUM_INTEGRATION_TEST=memory-no-store nix-shell -p electron_33 --run \"electron ./src/electron-edit-demo.ts .\""
},
"repository": {

4
apps/edit-docs/.env Normal file
View File

@@ -0,0 +1,4 @@
TRILIUM_DATA_DIR=./data-docs
TRILIUM_ENV=dev
TRILIUM_INTEGRATION_TEST=memory-no-store
TRILIUM_PORT=37741

5
apps/edit-docs/eslint.config.mjs Normal file
View File

@@ -0,0 +1,5 @@
import baseConfig from "../../eslint.config.mjs";
export default [
...baseConfig
];

36
apps/edit-docs/package.json Normal file
View File

@@ -0,0 +1,36 @@
{
"name": "@triliumnext/edit-docs",
"version": "0.0.1",
"private": true,
"type": "module",
"devDependencies": {
"@triliumnext/client": "workspace:*",
"@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4",
"fs-extra": "11.3.0"
},
"nx": {
"name": "edit-docs",
"targets": {
"serve": {
"executor": "@nx/js:node",
"defaultConfiguration": "development",
"dependsOn": [
"build"
],
"options": {
"buildTarget": "edit-docs:build",
"runBuildTargetDependencies": false
},
"configurations": {
"development": {
"buildTarget": "edit-docs:build:development"
},
"production": {
"buildTarget": "edit-docs:build:production"
}
}
}
}
}
}

3
_regroup_monorepo/apps/edit-docs/src/electron-docs-main.ts → apps/edit-docs/src/electron-docs-main.ts
View File

@@ -1,7 +1,6 @@
import fs from "fs/promises";
import fsExtra from "fs-extra";
import path from "path";
import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js";
import type { NoteMetaFile } from "@triliumnext/server/src/services/meta/note_meta.js";
import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js";
import archiver, { type Archiver } from "archiver";
@@ -233,4 +232,4 @@ async function registerHandlers() {
});
}
await main();
main();

0
_regroup_monorepo/apps/edit-docs/src/electron-edit-demo.ts → apps/edit-docs/src/electron-edit-demo.ts
View File

2
_regroup_monorepo/apps/edit-docs/src/electron-utils.ts → apps/edit-docs/src/electron-utils.ts
View File

@@ -16,7 +16,7 @@ export function initializeDatabase(skipDemoDb: boolean) {
}
export async function startElectron() {
await import("@triliumnext/electron/src/electron-main.js");
await import("@triliumnext/desktop/src/electron-main.js");
}
export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set<string>) {

30
apps/edit-docs/tsconfig.app.json Normal file
View File

@@ -0,0 +1,30 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "dist",
"types": [
"node"
],
"rootDir": "src",
"tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"exclude": [
"eslint.config.js",
"eslint.config.cjs",
"eslint.config.mjs"
],
"references": [
{
"path": "../server/tsconfig.app.json"
},
{
"path": "../desktop/tsconfig.app.json"
},
{
"path": "../client/tsconfig.app.json"
}
]
}

19
apps/edit-docs/tsconfig.json Normal file
View File

@@ -0,0 +1,19 @@
{
"extends": "../../tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "../server"
},
{
"path": "../desktop"
},
{
"path": "../client"
},
{
"path": "./tsconfig.app.json"
}
]
}

19
apps/edit-docs/webpack.config.cjs Normal file
View File

@@ -0,0 +1,19 @@
const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
const { join } = require('path');
module.exports = {
output: {
path: join(__dirname, 'dist'),
},
plugins: [
new NxAppWebpackPlugin({
target: 'node',
compiler: 'tsc',
main: './src/electron-docs-main.ts',
tsConfig: './tsconfig.app.json',
optimization: false,
outputHashing: 'none',
generatePackageJson: true,
})
],
};

33
pnpm-lock.yaml generated
View File

@@ -349,7 +349,7 @@ importers:
version: 1.0.2
copy-webpack-plugin:
specifier: 13.0.0
version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4))
version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)))
electron:
specifier: 35.1.5
version: 35.1.5
@@ -385,6 +385,21 @@ importers:
specifier: ^17.0.33
version: 17.0.33
apps/edit-docs:
devDependencies:
'@triliumnext/client':
specifier: workspace:*
version: link:../client
'@triliumnext/desktop':
specifier: workspace:*
version: link:../desktop
'@types/fs-extra':
specifier: 11.0.4
version: 11.0.4
fs-extra:
specifier: 11.3.0
version: 11.3.0
apps/server:
dependencies:
'@highlightjs/cdn-assets':
@@ -555,7 +570,7 @@ importers:
version: 1.4.7
copy-webpack-plugin:
specifier: 13.0.0
version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4))
version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)))
csrf-csrf:
specifier: 3.1.0
version: 3.1.0
@@ -726,7 +741,7 @@ importers:
version: 1.0.1
webpack:
specifier: 5.99.6
version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)
version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))
ws:
specifier: 8.18.1
version: 8.18.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)
@@ -15770,14 +15785,14 @@ snapshots:
serialize-javascript: 6.0.2
webpack: 5.98.0(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)
copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)):
copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))):
dependencies:
glob-parent: 6.0.2
normalize-path: 3.0.0
schema-utils: 4.3.2
serialize-javascript: 6.0.2
tinyglobby: 0.2.13
webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)
webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))
core-js-compat@3.41.0:
dependencies:
@@ -21483,14 +21498,14 @@ snapshots:
'@swc/core': 1.5.29(@swc/helpers@0.5.17)
esbuild: 0.19.12
terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)):
terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))):
dependencies:
'@jridgewell/trace-mapping': 0.3.25
jest-worker: 27.5.1
schema-utils: 4.3.2
serialize-javascript: 6.0.2
terser: 5.39.0
webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)
webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))
optionalDependencies:
'@swc/core': 1.5.29(@swc/helpers@0.5.17)
esbuild: 0.19.12
@@ -22231,7 +22246,7 @@ snapshots:
- esbuild
- uglify-js
webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4):
webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)):
dependencies:
'@types/eslint-scope': 3.7.7
'@types/estree': 1.0.7
@@ -22253,7 +22268,7 @@ snapshots:
neo-async: 2.6.2
schema-utils: 4.3.2
tapable: 2.2.1
terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4))
terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)))
watchpack: 2.4.2
webpack-sources: 3.2.3
optionalDependencies:

3
tsconfig.json
View File

@@ -26,6 +26,9 @@
},
{
"path": "./apps/dump-db"
},
{
"path": "./apps/edit-docs"
}
]
}