diff --git a/_regroup/package.json b/_regroup/package.json index b2165a72e..5b47d4363 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -118,7 +118,6 @@ "swagger-ui-express": "5.0.1", "time2fa": "^1.3.0", "tmp": "0.2.3", - "turndown": "7.2.0", "unescape": "1.0.1", "ws": "8.18.1", "xml2js": "0.6.2", diff --git a/_regroup/tsconfig.json b/_regroup/tsconfig.json index 10da18c4b..a61b9b432 100644 --- a/_regroup/tsconfig.json +++ b/_regroup/tsconfig.json @@ -1,20 +1,9 @@ { "compilerOptions": { - "module": "NodeNext", "declaration": false, "sourceMap": true, - "outDir": "./build", - "strict": true, - "noImplicitAny": true, - "resolveJsonModule": true, - "allowJs": true, - "lib": ["ES2023"], - "downlevelIteration": true, - "skipLibCheck": true, - "esModuleInterop": true, - "verbatimModuleSyntax": true }, - "include": ["./src/**/*.js", "./src/**/*.ts", "./*.ts", "./*.js", "./spec/**/*.ts"], + "include": ["./src/**/*.js", , "./*.ts", "./*.js", "./spec/**/*.ts"], "exclude": ["./node_modules/**/*", "./spec-es6/**/*.ts"], - "files": ["src/types.d.ts", "src/public/app/types.d.ts"] + "files": [ "src/public/app/types.d.ts"] } diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index 5be2878f1..3af672df9 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -6,5 +6,8 @@ "resolveJsonModule": true, "allowSyntheticDefaultImports": true }, - "include": [ "./src/**/*.ts" ] + "include": [ "./src/**/*.ts" ], + "files": [ + "./src/types.d.ts", + ] } \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index 375717cd6..c69fa054c 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -20,5 +20,8 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" + }, + "devDependencies": { + "turndown": "7.2.0" } } diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json new file mode 100644 index 000000000..671ae891d --- /dev/null +++ b/apps/server/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compilerOptions": { + "module": "NodeNext", + "declaration": false, + "sourceMap": true, + "outDir": "./build", + "strict": true, + "noImplicitAny": true, + "resolveJsonModule": true, + "lib": ["ES2023"], + "downlevelIteration": true, + "skipLibCheck": true, + "esModuleInterop": true, + "verbatimModuleSyntax": true + }, + "include": [ "./src/**/*.ts" ], + "files": [ + "./src/types.d.ts", + ] +} \ No newline at end of file diff --git a/_regroup/src/types.d.ts b/apps/server/types.d.ts similarity index 100% rename from _regroup/src/types.d.ts rename to apps/server/types.d.ts diff --git a/package-lock.json b/package-lock.json index f106451f8..2426ba314 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5335,6 +5335,14 @@ } } }, + "apps/server": { + "name": "@triliumnext/server", + "version": "0.0.1", + "license": "AGPL-3.0-only", + "devDependencies": { + "turndown": "7.2.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.26.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", @@ -5834,6 +5842,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@mixmark-io/domino": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz", + "integrity": "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==", + "dev": true, + "license": "BSD-2-Clause" + }, "node_modules/@popperjs/core": { "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", @@ -6159,6 +6174,10 @@ "resolved": "packages/commons", "link": true }, + "node_modules/@triliumnext/server": { + "resolved": "apps/server", + "link": true + }, "node_modules/@tweenjs/tween.js": { "version": "25.0.0", "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-25.0.0.tgz", @@ -8243,6 +8262,16 @@ "node": ">=14.0.0" } }, + "node_modules/turndown": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz", + "integrity": "sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@mixmark-io/domino": "^2.2.0" + } + }, "node_modules/type-fest": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",