From d570b3c428d06734340a564efd4d0537f129d6d0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:18:47 +0300 Subject: [PATCH 1/6] build: Move rimraf to devDependencies --- package-lock.json | 22 +++++++++++++++++++--- package.json | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ddc29506f..07f06f645e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -64,7 +64,6 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "request": "2.88.2", - "rimraf": "^6.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", "sanitize-html": "^2.13.0", @@ -125,6 +124,7 @@ "lorem-ipsum": "2.0.8", "nodemon": "^3.1.4", "rcedit": "4.0.1", + "rimraf": "^6.0.1", "ts-node": "^10.9.2", "tslib": "^2.6.2", "typescript": "^5.3.3", @@ -11179,6 +11179,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", + "dev": true, "dependencies": { "glob": "^11.0.0", "package-json-from-dist": "^1.0.0" @@ -11197,6 +11198,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -11205,6 +11207,7 @@ "version": "11.0.0", "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", + "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^4.0.1", @@ -11227,6 +11230,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -11244,6 +11248,7 @@ "version": "11.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "dev": true, "engines": { "node": "20 || >=22" } @@ -11252,6 +11257,7 @@ "version": "10.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -11266,6 +11272,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -11274,6 +11281,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "dev": true, "dependencies": { "lru-cache": "^11.0.0", "minipass": "^7.1.2" @@ -22031,6 +22039,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", + "dev": true, "requires": { "glob": "^11.0.0", "package-json-from-dist": "^1.0.0" @@ -22040,6 +22049,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, "requires": { "balanced-match": "^1.0.0" } @@ -22048,6 +22058,7 @@ "version": "11.0.0", "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", + "dev": true, "requires": { "foreground-child": "^3.1.0", "jackspeak": "^4.0.1", @@ -22061,6 +22072,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "dev": true, "requires": { "@isaacs/cliui": "^8.0.2", "@pkgjs/parseargs": "^0.11.0" @@ -22069,12 +22081,14 @@ "lru-cache": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", - "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==" + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "dev": true }, "minimatch": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dev": true, "requires": { "brace-expansion": "^2.0.1" } @@ -22082,12 +22096,14 @@ "minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true }, "path-scurry": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "dev": true, "requires": { "lru-cache": "^11.0.0", "minipass": "^7.1.2" diff --git a/package.json b/package.json index e8042247cb..55f4d52744 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,6 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "request": "2.88.2", - "rimraf": "^6.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", "sanitize-html": "^2.13.0", @@ -146,6 +145,7 @@ "lorem-ipsum": "2.0.8", "nodemon": "^3.1.4", "rcedit": "4.0.1", + "rimraf": "^6.0.1", "ts-node": "^10.9.2", "tslib": "^2.6.2", "typescript": "^5.3.3", From 366e791e2d74237eaff11bfebc98712e7bbca186 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:19:38 +0300 Subject: [PATCH 2/6] build: Use--omit=dev --- bin/copy-trilium.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index 2936a925b3..b58f8cef6c 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -40,7 +40,7 @@ cp -Rv "$script_dir/../build/src" "$DIR" cp "$script_dir/../build/electron.js" "$DIR" # run in subshell (so we return to original dir) -(cd $DIR && npm install --only=prod) +(cd $DIR && npm install --omit=dev) if [[ -d "$DIR"/node_modules ]]; then # cleanup of useless files in dependencies From 389097bcc29a8605be927675715b3f7325793c45 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:31:36 +0300 Subject: [PATCH 3/6] build: Silence clean-up phase --- bin/copy-trilium.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index b58f8cef6c..afe74e7dda 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -43,14 +43,14 @@ cp "$script_dir/../build/electron.js" "$DIR" (cd $DIR && npm install --omit=dev) if [[ -d "$DIR"/node_modules ]]; then -# cleanup of useless files in dependencies + # cleanup of useless files in dependencies for d in 'image-q/demo' 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do - [[ -e "$DIR"/node_modules/"$d" ]] && rm -rv "$DIR"/node_modules/"$d" + [[ -e "$DIR"/node_modules/"$d" ]] && rm -r "$DIR"/node_modules/"$d" done -# delete all tests (there are often large images as test file for jimp etc.) + # delete all tests (there are often large images as test file for jimp etc.) for d in 'test' 'docs' 'demo'; do - find "$DIR"/node_modules -name "$d" -exec rm -rf {} \; + find "$DIR"/node_modules -name "$d" -exec rm -rf {} + done fi From 9dcf51b117303686903d5b23b4bd13e51b4a1b1f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:39:18 +0300 Subject: [PATCH 4/6] build: Remove some unnecessary files --- bin/copy-trilium.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index afe74e7dda..25b8fa9571 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -44,12 +44,16 @@ cp "$script_dir/../build/electron.js" "$DIR" if [[ -d "$DIR"/node_modules ]]; then # cleanup of useless files in dependencies - for d in 'image-q/demo' 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do + for d in 'image-q/demo' \ + '@excalidraw/excalidraw/excalidraw-assets-dev' '@excalidraw/excalidraw/dist/excalidraw.development.js' '@excalidraw/excalidraw/dist/excalidraw-with-preact.development.js' \ + 'mermaid/dist/mermaid.js' \ + 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' 'better-sqlite3/deps/sqlite3' \ + '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do [[ -e "$DIR"/node_modules/"$d" ]] && rm -r "$DIR"/node_modules/"$d" done # delete all tests (there are often large images as test file for jimp etc.) - for d in 'test' 'docs' 'demo'; do + for d in 'test' 'docs' 'demo' 'example'; do find "$DIR"/node_modules -name "$d" -exec rm -rf {} + done fi From cb0d1d80a125aa959132c8aa160c89b74ed91adc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:53:33 +0300 Subject: [PATCH 5/6] build: Remove some more unnecessary files --- bin/copy-trilium.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index 25b8fa9571..f0ff728886 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -45,8 +45,9 @@ cp "$script_dir/../build/electron.js" "$DIR" if [[ -d "$DIR"/node_modules ]]; then # cleanup of useless files in dependencies for d in 'image-q/demo' \ - '@excalidraw/excalidraw/excalidraw-assets-dev' '@excalidraw/excalidraw/dist/excalidraw.development.js' '@excalidraw/excalidraw/dist/excalidraw-with-preact.development.js' \ + '@excalidraw/excalidraw/dist/excalidraw-assets-dev' '@excalidraw/excalidraw/dist/excalidraw.development.js' '@excalidraw/excalidraw/dist/excalidraw-with-preact.development.js' \ 'mermaid/dist/mermaid.js' \ + 'boxicons/svg' 'boxicons/node_modules/react'/* \ 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' 'better-sqlite3/deps/sqlite3' \ '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do [[ -e "$DIR"/node_modules/"$d" ]] && rm -r "$DIR"/node_modules/"$d" From 758c08ec859c11e94cfd5a13ecad6e9d4aedc26d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 20 Jul 2024 20:55:38 +0300 Subject: [PATCH 6/6] build: Remove map files & ts files --- bin/copy-trilium.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index f0ff728886..141e988e0e 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -60,6 +60,8 @@ if [[ -d "$DIR"/node_modules ]]; then fi find $DIR/libraries -name "*.map" -type f -delete +find $DIR/node_modules -name "*.map" -type f -delete +find $DIR -name "*.ts" -type f -delete d="$DIR"/src/public [[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist