diff --git a/bin/update-nightly-version.ts b/bin/update-nightly-version.ts index 44b352fb46..aad8da3cf0 100644 --- a/bin/update-nightly-version.ts +++ b/bin/update-nightly-version.ts @@ -7,7 +7,7 @@ * user might run into module not found errors or styling errors caused by an old cache. * * This script is supposed to be run in the CI, which will update locally the version field of - * `package.json` to contain the date. For example, `0.90.9-beta` will become `0.90.9-nightly-20241102-092832`. + * `package.json` to contain the date. For example, `0.90.9-beta` will become `0.90.9-test-YYMMDD-HHMMSS`. * */ @@ -22,10 +22,10 @@ function processVersion(version) { // Add the nightly suffix, plus the date. const referenceDate = new Date() .toISOString() - .substring(0, 19) + .substring(2, 19) .replace(/[-:]*/g, "") .replace("T", "-"); - version = `${version}-nightly-${referenceDate}`; + version = `${version}-test-${referenceDate}`; return version; } diff --git a/package.json b/package.json index c425ad3e24..f719723cc5 100644 --- a/package.json +++ b/package.json @@ -1,200 +1,200 @@ { - "name": "trilium", - "productName": "TriliumNext Notes", - "description": "Build your personal knowledge base with TriliumNext Notes", - "version": "0.90.9-beta", - "license": "AGPL-3.0-only", - "main": "./dist/electron-main.js", - "author": { - "name": "TriliumNext Notes Team", - "email": "contact@eliandoran.me", - "url": "https://github.com/TriliumNext/Notes" - }, - "copyright": "", - "bin": { - "trilium": "src/main.js" - }, - "repository": { - "type": "git", - "url": "https://github.com/TriliumNext/Notes.git" - }, - "type": "module", - "scripts": { - "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", - "start-server-safe": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", - "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", - "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts", - "qstart-server": "npm run switch-server && npm run start-server", - "start-electron": "npm run prepare-dist && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .", - "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .", - "qstart-electron": "npm run switch-electron && npm run start-electron", - "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install", - "switch-electron": "npx electron-rebuild", - "build-backend-docs": "rimraf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", - "build-frontend-docs": "rimraf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js", - "build-docs": "npm run build-backend-docs && npm run build-frontend-docs", - "webpack": "cross-env node --import ./loader-register.js node_modules/webpack/bin/webpack.js -c webpack.config.ts", - "test-jasmine": "cross-env TRILIUM_DATA_DIR=./data-test tsx ./node_modules/jasmine/bin/jasmine.js", - "test-es6": "tsx -r esm spec-es6/attribute_parser.spec.ts", - "test": "npm run test-jasmine && npm run test-es6", - "start-electron-forge": "npm run prepare-dist && electron-forge start", - "make-electron": "npm run webpack && npm run prepare-dist && electron-forge make", - "package-electron": "electron-forge package", - "prepare-dist": "rimraf ./dist && tsc && tsx ./bin/copy-dist.ts", - "update-build-info": "tsx bin/update-build-info.ts", - "errors": "tsc --watch --noEmit", - "integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", - "integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", - "integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", - "generate-document": "cross-env nodemon src/tools/generate_document.ts 1000", - "ci-update-nightly-version": "tsx ./bin/update-nightly-version.ts" - }, - "dependencies": { - "@braintree/sanitize-url": "7.1.0", - "@electron/remote": "2.1.2", - "@excalidraw/excalidraw": "0.17.6", - "@highlightjs/cdn-assets": "11.10.0", - "archiver": "7.0.1", - "async-mutex": "0.5.0", - "autocomplete.js": "0.38.1", - "axios": "1.7.7", - "better-sqlite3": "11.3.0", - "bootstrap": "5.3.3", - "boxicons": "2.1.4", - "chokidar": "3.6.0", - "cls-hooked": "4.2.2", - "codemirror": "5.65.18", - "compression": "1.7.4", - "cookie-parser": "1.4.7", - "csurf": "1.11.0", - "dayjs": "1.11.13", - "dayjs-plugin-utc": "0.1.2", - "debounce": "2.2.0", - "ejs": "3.1.10", - "electron-debug": "4.0.1", - "electron-dl": "4.0.0", - "electron-squirrel-startup": "1.0.1", - "electron-window-state": "5.0.3", - "escape-html": "1.0.3", - "eslint": "9.14.0", - "express": "4.21.1", - "express-partial-content": "1.0.2", - "express-rate-limit": "7.4.1", - "express-session": "1.18.1", - "force-graph": "1.45.0", - "fs-extra": "11.2.0", - "helmet": "7.1.0", - "html": "1.0.0", - "html2plaintext": "2.1.4", - "http-proxy-agent": "7.0.2", - "https-proxy-agent": "7.0.5", - "i18next": "23.16.4", - "i18next-fs-backend": "2.3.2", - "i18next-http-backend": "2.6.2", - "image-type": "4.1.0", - "ini": "5.0.0", - "is-animated": "2.0.2", - "is-svg": "4.3.2", - "jimp": "0.22.12", - "joplin-turndown-plugin-gfm": "1.0.12", - "jquery": "3.7.1", - "jquery-hotkeys": "0.2.2", - "jquery.fancytree": "2.38.3", - "jsdom": "25.0.0", - "jsplumb": "2.15.6", - "katex": "0.16.11", - "knockout": "3.5.1", - "mark.js": "8.11.1", - "marked": "14.1.3", - "mermaid": "11.4.0", - "mime-types": "2.1.35", - "mind-elixir": "4.2.4", - "multer": "1.4.5-lts.1", - "node-abi": "3.67.0", - "normalize-strings": "1.1.1", - "normalize.css": "8.0.1", - "panzoom": "9.4.3", - "print-this": "2.0.0", - "rand-token": "1.0.1", - "react": "18.3.1", - "react-dom": "18.3.1", - "request": "2.88.2", - "safe-compare": "1.1.4", - "sanitize-filename": "1.6.3", - "sanitize-html": "2.13.1", - "sax": "1.4.1", - "semver": "7.6.3", - "serve-favicon": "2.5.0", - "session-file-store": "1.5.0", - "source-map-support": "0.5.21", - "split.js": "1.6.5", - "stream-throttle": "0.1.3", - "striptags": "3.2.0", - "tmp": "0.2.3", - "tree-kill": "1.2.2", - "turndown": "7.2.0", - "unescape": "1.0.1", - "vanilla-js-wheel-zoom": "9.0.4", - "ws": "8.18.0", - "xml2js": "0.6.2", - "yauzl": "3.1.3" - }, - "devDependencies": { - "@electron-forge/cli": "7.5.0", - "@electron-forge/maker-deb": "7.5.0", - "@electron-forge/maker-dmg": "7.5.0", - "@electron-forge/maker-squirrel": "7.5.0", - "@electron-forge/maker-zip": "7.5.0", - "@electron-forge/plugin-auto-unpack-natives": "7.5.0", - "@playwright/test": "1.48.2", - "@types/archiver": "6.0.2", - "@types/better-sqlite3": "7.6.11", - "@types/cls-hooked": "4.3.8", - "@types/compression": "1.7.5", - "@types/cookie-parser": "1.4.7", - "@types/csurf": "1.11.5", - "@types/debounce": "1.2.4", - "@types/ejs": "3.1.5", - "@types/electron-squirrel-startup": "1.0.2", - "@types/escape-html": "1.0.4", - "@types/express": "4.17.21", - "@types/express-session": "1.18.0", - "@types/html": "1.0.4", - "@types/ini": "4.1.1", - "@types/jasmine": "5.1.4", - "@types/jsdom": "21.1.7", - "@types/mime-types": "2.1.4", - "@types/multer": "1.4.12", - "@types/node": "22.7.8", - "@types/safe-compare": "1.1.2", - "@types/sanitize-html": "2.13.0", - "@types/sax": "1.2.7", - "@types/semver": "7.5.8", - "@types/serve-favicon": "2.5.7", - "@types/session-file-store": "1.2.5", - "@types/source-map-support": "0.5.10", - "@types/stream-throttle": "0.1.4", - "@types/tmp": "0.2.6", - "@types/turndown": "5.0.5", - "@types/ws": "8.5.12", - "@types/xml2js": "0.4.14", - "cross-env": "7.0.3", - "electron": "31.3.1", - "electron-packager": "17.1.2", - "electron-rebuild": "3.2.9", - "esm": "3.2.25", - "iconsur": "1.7.0", - "jasmine": "5.4.0", - "jsdoc": "4.0.3", - "lorem-ipsum": "2.0.8", - "nodemon": "3.1.7", - "rcedit": "4.0.1", - "rimraf": "6.0.1", - "ts-node": "10.9.2", - "tslib": "2.8.1", - "tsx": "4.19.2", - "typescript": "5.6.3", - "webpack": "5.96.1", - "webpack-cli": "5.1.4" - } -} + "name": "trilium", + "productName": "TriliumNext Notes", + "description": "Build your personal knowledge base with TriliumNext Notes", + "version": "0.90.9-test-241102-085637", + "license": "AGPL-3.0-only", + "main": "./dist/electron-main.js", + "author": { + "name": "TriliumNext Notes Team", + "email": "contact@eliandoran.me", + "url": "https://github.com/TriliumNext/Notes" + }, + "copyright": "", + "bin": { + "trilium": "src/main.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/TriliumNext/Notes.git" + }, + "type": "module", + "scripts": { + "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", + "start-server-safe": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", + "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts", + "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts", + "qstart-server": "npm run switch-server && npm run start-server", + "start-electron": "npm run prepare-dist && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .", + "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .", + "qstart-electron": "npm run switch-electron && npm run start-electron", + "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install", + "switch-electron": "npx electron-rebuild", + "build-backend-docs": "rimraf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", + "build-frontend-docs": "rimraf ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/basic_widget.js src/public/app/widgets/note_context_aware_widget.js src/public/app/widgets/right_panel_widget.js", + "build-docs": "npm run build-backend-docs && npm run build-frontend-docs", + "webpack": "cross-env node --import ./loader-register.js node_modules/webpack/bin/webpack.js -c webpack.config.ts", + "test-jasmine": "cross-env TRILIUM_DATA_DIR=./data-test tsx ./node_modules/jasmine/bin/jasmine.js", + "test-es6": "tsx -r esm spec-es6/attribute_parser.spec.ts", + "test": "npm run test-jasmine && npm run test-es6", + "start-electron-forge": "npm run prepare-dist && electron-forge start", + "make-electron": "npm run webpack && npm run prepare-dist && electron-forge make", + "package-electron": "electron-forge package", + "prepare-dist": "rimraf ./dist && tsc && tsx ./bin/copy-dist.ts", + "update-build-info": "tsx bin/update-build-info.ts", + "errors": "tsc --watch --noEmit", + "integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", + "integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", + "integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts", + "generate-document": "cross-env nodemon src/tools/generate_document.ts 1000", + "ci-update-nightly-version": "tsx ./bin/update-nightly-version.ts" + }, + "dependencies": { + "@braintree/sanitize-url": "7.1.0", + "@electron/remote": "2.1.2", + "@excalidraw/excalidraw": "0.17.6", + "@highlightjs/cdn-assets": "11.10.0", + "archiver": "7.0.1", + "async-mutex": "0.5.0", + "autocomplete.js": "0.38.1", + "axios": "1.7.7", + "better-sqlite3": "11.3.0", + "bootstrap": "5.3.3", + "boxicons": "2.1.4", + "chokidar": "3.6.0", + "cls-hooked": "4.2.2", + "codemirror": "5.65.18", + "compression": "1.7.4", + "cookie-parser": "1.4.7", + "csurf": "1.11.0", + "dayjs": "1.11.13", + "dayjs-plugin-utc": "0.1.2", + "debounce": "2.2.0", + "ejs": "3.1.10", + "electron-debug": "4.0.1", + "electron-dl": "4.0.0", + "electron-squirrel-startup": "1.0.1", + "electron-window-state": "5.0.3", + "escape-html": "1.0.3", + "eslint": "9.14.0", + "express": "4.21.1", + "express-partial-content": "1.0.2", + "express-rate-limit": "7.4.1", + "express-session": "1.18.1", + "force-graph": "1.45.0", + "fs-extra": "11.2.0", + "helmet": "7.1.0", + "html": "1.0.0", + "html2plaintext": "2.1.4", + "http-proxy-agent": "7.0.2", + "https-proxy-agent": "7.0.5", + "i18next": "23.16.4", + "i18next-fs-backend": "2.3.2", + "i18next-http-backend": "2.6.2", + "image-type": "4.1.0", + "ini": "5.0.0", + "is-animated": "2.0.2", + "is-svg": "4.3.2", + "jimp": "0.22.12", + "joplin-turndown-plugin-gfm": "1.0.12", + "jquery": "3.7.1", + "jquery-hotkeys": "0.2.2", + "jquery.fancytree": "2.38.3", + "jsdom": "25.0.0", + "jsplumb": "2.15.6", + "katex": "0.16.11", + "knockout": "3.5.1", + "mark.js": "8.11.1", + "marked": "14.1.3", + "mermaid": "11.4.0", + "mime-types": "2.1.35", + "mind-elixir": "4.2.4", + "multer": "1.4.5-lts.1", + "node-abi": "3.67.0", + "normalize-strings": "1.1.1", + "normalize.css": "8.0.1", + "panzoom": "9.4.3", + "print-this": "2.0.0", + "rand-token": "1.0.1", + "react": "18.3.1", + "react-dom": "18.3.1", + "request": "2.88.2", + "safe-compare": "1.1.4", + "sanitize-filename": "1.6.3", + "sanitize-html": "2.13.1", + "sax": "1.4.1", + "semver": "7.6.3", + "serve-favicon": "2.5.0", + "session-file-store": "1.5.0", + "source-map-support": "0.5.21", + "split.js": "1.6.5", + "stream-throttle": "0.1.3", + "striptags": "3.2.0", + "tmp": "0.2.3", + "tree-kill": "1.2.2", + "turndown": "7.2.0", + "unescape": "1.0.1", + "vanilla-js-wheel-zoom": "9.0.4", + "ws": "8.18.0", + "xml2js": "0.6.2", + "yauzl": "3.1.3" + }, + "devDependencies": { + "@electron-forge/cli": "7.5.0", + "@electron-forge/maker-deb": "7.5.0", + "@electron-forge/maker-dmg": "7.5.0", + "@electron-forge/maker-squirrel": "7.5.0", + "@electron-forge/maker-zip": "7.5.0", + "@electron-forge/plugin-auto-unpack-natives": "7.5.0", + "@playwright/test": "1.48.2", + "@types/archiver": "6.0.2", + "@types/better-sqlite3": "7.6.11", + "@types/cls-hooked": "4.3.8", + "@types/compression": "1.7.5", + "@types/cookie-parser": "1.4.7", + "@types/csurf": "1.11.5", + "@types/debounce": "1.2.4", + "@types/ejs": "3.1.5", + "@types/electron-squirrel-startup": "1.0.2", + "@types/escape-html": "1.0.4", + "@types/express": "4.17.21", + "@types/express-session": "1.18.0", + "@types/html": "1.0.4", + "@types/ini": "4.1.1", + "@types/jasmine": "5.1.4", + "@types/jsdom": "21.1.7", + "@types/mime-types": "2.1.4", + "@types/multer": "1.4.12", + "@types/node": "22.7.8", + "@types/safe-compare": "1.1.2", + "@types/sanitize-html": "2.13.0", + "@types/sax": "1.2.7", + "@types/semver": "7.5.8", + "@types/serve-favicon": "2.5.7", + "@types/session-file-store": "1.2.5", + "@types/source-map-support": "0.5.10", + "@types/stream-throttle": "0.1.4", + "@types/tmp": "0.2.6", + "@types/turndown": "5.0.5", + "@types/ws": "8.5.12", + "@types/xml2js": "0.4.14", + "cross-env": "7.0.3", + "electron": "31.3.1", + "electron-packager": "17.1.2", + "electron-rebuild": "3.2.9", + "esm": "3.2.25", + "iconsur": "1.7.0", + "jasmine": "5.4.0", + "jsdoc": "4.0.3", + "lorem-ipsum": "2.0.8", + "nodemon": "3.1.7", + "rcedit": "4.0.1", + "rimraf": "6.0.1", + "ts-node": "10.9.2", + "tslib": "2.8.1", + "tsx": "4.19.2", + "typescript": "5.6.3", + "webpack": "5.96.1", + "webpack-cli": "5.1.4" + } +} \ No newline at end of file