mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	Compare commits
	
		
			8 Commits
		
	
	
		
			v0.41.3-be
			...
			v0.41.5
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | a86177bb59 | ||
|  | 9f1b3cc892 | ||
|  | 8473f72ec8 | ||
|  | 666d202a3a | ||
|  | 988fae50cb | ||
|  | 98bbd17920 | ||
|  | dadcc93ae3 | ||
|  | 48e19d0149 | 
							
								
								
									
										2
									
								
								.idea/dataSources.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								.idea/dataSources.xml
									
									
									
										generated
									
									
									
								
							| @@ -5,7 +5,7 @@ | ||||
|       <driver-ref>sqlite.xerial</driver-ref> | ||||
|       <synchronize>true</synchronize> | ||||
|       <jdbc-driver>org.sqlite.JDBC</jdbc-driver> | ||||
|       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url> | ||||
|       <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url> | ||||
|     </data-source> | ||||
|   </component> | ||||
| </project> | ||||
| @@ -8,7 +8,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l | ||||
| ## Features | ||||
|  | ||||
| * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes)) | ||||
| * Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-editor#autoformat) | ||||
| * Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat) | ||||
| * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting | ||||
| * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting) | ||||
| * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions) | ||||
|   | ||||
| @@ -12,7 +12,7 @@ echo "Copying required linux-x64 binaries" | ||||
| rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/* | ||||
| rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/* | ||||
|  | ||||
| rm -r $SRC_DIR/src/public/dist/*.mobile.* | ||||
| rm -r $SRC_DIR/src/public/app-dist/*.mobile.* | ||||
|  | ||||
| cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/ | ||||
| cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/ | ||||
|   | ||||
| @@ -19,7 +19,7 @@ cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/ | ||||
| cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/ | ||||
| cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/ | ||||
|  | ||||
| rm -r $SRC_DIR/src/public/dist/*.mobile.* | ||||
| rm -r $SRC_DIR/src/public/app-dist/*.mobile.* | ||||
|  | ||||
| ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns | ||||
|  | ||||
|   | ||||
| @@ -19,7 +19,7 @@ cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/ | ||||
| cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/ | ||||
| cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/ | ||||
|  | ||||
| rm -r $SRC_DIR/src/public/dist/*.mobile.* | ||||
| rm -r $SRC_DIR/src/public/app-dist/*.mobile.* | ||||
|  | ||||
| ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico | ||||
|  | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| For bug reports, please mention **version of the application** and include **log files** from following location: | ||||
| For bug reports, **PLEASE mention version of Trilium you're using** and also include **log files** from following location: | ||||
|  | ||||
| * `/home/[user]/.local/share/trilium-data/log` for Linux | ||||
| * `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up | ||||
|   | ||||
							
								
								
									
										351
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										351
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "trilium", | ||||
|   "version": "0.41.2-beta", | ||||
|   "version": "0.41.4-beta", | ||||
|   "lockfileVersion": 1, | ||||
|   "requires": true, | ||||
|   "dependencies": { | ||||
| @@ -25,13 +25,33 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@develar/schema-utils": { | ||||
|       "version": "2.1.0", | ||||
|       "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.1.0.tgz", | ||||
|       "integrity": "sha512-qjCqB4ctMig9Gz5bd6lkdFr3bO6arOdQqptdBSpF1ZpCnjofieCciEzkoS9ujY9cMGyllYSCSmBJ3x9OKHXzoA==", | ||||
|       "version": "2.6.5", | ||||
|       "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", | ||||
|       "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "ajv": "^6.1.0", | ||||
|         "ajv-keywords": "^3.1.0" | ||||
|         "ajv": "^6.12.0", | ||||
|         "ajv-keywords": "^3.4.1" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "ajv": { | ||||
|           "version": "6.12.0", | ||||
|           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", | ||||
|           "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "fast-deep-equal": "^3.1.1", | ||||
|             "fast-json-stable-stringify": "^2.0.0", | ||||
|             "json-schema-traverse": "^0.4.1", | ||||
|             "uri-js": "^4.2.2" | ||||
|           } | ||||
|         }, | ||||
|         "fast-deep-equal": { | ||||
|           "version": "3.1.1", | ||||
|           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", | ||||
|           "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", | ||||
|           "dev": true | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "@electron/get": { | ||||
| @@ -1172,58 +1192,41 @@ | ||||
|       "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==" | ||||
|     }, | ||||
|     "app-builder-bin": { | ||||
|       "version": "3.5.5", | ||||
|       "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.5.tgz", | ||||
|       "integrity": "sha512-ZcHzJ9Xl+azPqdKzXZKdRZmkNmbxHHZyl4cbobNf8qMQpoPChpcov8riVrZSbu/0cT/JqJ8LOwJjy1OAwbChaQ==", | ||||
|       "version": "3.5.6", | ||||
|       "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.6.tgz", | ||||
|       "integrity": "sha512-gY9ABoV5jh67IrPEwF81R8l9LwE3RqHUyU3rIKitwqMpKhplN5OZC6WEHOXO3XhwiLCIlr9LLI6OPhr3bmtQIg==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "app-builder-lib": { | ||||
|       "version": "22.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.4.1.tgz", | ||||
|       "integrity": "sha512-epwUzIM+2pcdy/If9koTP74CKx4v7xGPj75a2Z5cM4rrGN9yVZ3eDUBbfF0e0qE4Qmcv5pd0BAZJ26bGm8NWsQ==", | ||||
|       "version": "22.5.1", | ||||
|       "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.5.1.tgz", | ||||
|       "integrity": "sha512-VtB/PD8actR1317D/0uGzuJIYbpw4pRrfMB6IyTLwGynUd3ihqiCFjejVWHjCwopgCct2kE0MvLwo8P49xHIeQ==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "7zip-bin": "~5.0.3", | ||||
|         "@develar/schema-utils": "~2.1.0", | ||||
|         "@develar/schema-utils": "~2.6.5", | ||||
|         "async-exit-hook": "^2.0.1", | ||||
|         "bluebird-lst": "^1.0.9", | ||||
|         "builder-util": "22.4.1", | ||||
|         "builder-util-runtime": "8.6.2", | ||||
|         "builder-util": "22.5.1", | ||||
|         "builder-util-runtime": "8.7.0", | ||||
|         "chromium-pickle-js": "^0.2.0", | ||||
|         "debug": "^4.1.1", | ||||
|         "ejs": "^3.0.1", | ||||
|         "electron-publish": "22.4.1", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "ejs": "^3.0.2", | ||||
|         "electron-publish": "22.5.1", | ||||
|         "fs-extra": "^9.0.0", | ||||
|         "hosted-git-info": "^3.0.4", | ||||
|         "is-ci": "^2.0.0", | ||||
|         "isbinaryfile": "^4.0.4", | ||||
|         "isbinaryfile": "^4.0.5", | ||||
|         "js-yaml": "^3.13.1", | ||||
|         "lazy-val": "^1.0.4", | ||||
|         "minimatch": "^3.0.4", | ||||
|         "normalize-package-data": "^2.5.0", | ||||
|         "read-config-file": "5.0.2", | ||||
|         "read-config-file": "6.0.0", | ||||
|         "sanitize-filename": "^1.6.3", | ||||
|         "semver": "^7.1.3", | ||||
|         "temp-file": "^3.3.7" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "ejs": { | ||||
|           "version": "3.0.1", | ||||
|           "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.0.1.tgz", | ||||
|           "integrity": "sha512-cuIMtJwxvzumSAkqaaoGY/L6Fc/t6YvoP9/VIaK0V/CyqKLEQ8sqODmYfy/cjXEdZ9+OOL8TecbJu+1RsofGDw==", | ||||
|           "dev": true | ||||
|         }, | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         }, | ||||
|         "hosted-git-info": { | ||||
|           "version": "3.0.4", | ||||
|           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", | ||||
| @@ -1260,7 +1263,7 @@ | ||||
|       "dependencies": { | ||||
|         "file-type": { | ||||
|           "version": "3.9.0", | ||||
|           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" | ||||
|         } | ||||
|       } | ||||
| @@ -1416,9 +1419,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "async-mutex": { | ||||
|       "version": "0.2.1", | ||||
|       "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.1.tgz", | ||||
|       "integrity": "sha512-8GAyGD9/Fr4TgMigfCAXsyjvPturIqHDDw7Mim6DtNRbwxY2ul/D4b4CF1qjaMvomd/SJs/8EM23M+RGDEpaKA==", | ||||
|       "version": "0.2.2", | ||||
|       "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.2.tgz", | ||||
|       "integrity": "sha512-L1wZNK83y16khj/Fqezy+FfOp5KuywxypF/C2aYfAN3NOMLYdAVKRk3UDklqv+ngX+O+tNSEkPX+FxprxELsMA==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.11.1" | ||||
|       } | ||||
| @@ -1536,7 +1539,7 @@ | ||||
|         }, | ||||
|         "uuid": { | ||||
|           "version": "2.0.3", | ||||
|           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", | ||||
|           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" | ||||
|         } | ||||
|       } | ||||
| @@ -1570,7 +1573,7 @@ | ||||
|       "dependencies": { | ||||
|         "semver": { | ||||
|           "version": "4.3.6", | ||||
|           "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", | ||||
|           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" | ||||
|         } | ||||
|       } | ||||
| @@ -1590,7 +1593,7 @@ | ||||
|     }, | ||||
|     "bl": { | ||||
|       "version": "1.2.2", | ||||
|       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", | ||||
|       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", | ||||
|       "requires": { | ||||
|         "readable-stream": "^2.3.5", | ||||
| @@ -1850,31 +1853,31 @@ | ||||
|       "dependencies": { | ||||
|         "file-type": { | ||||
|           "version": "3.9.0", | ||||
|           "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" | ||||
|         }, | ||||
|         "uuid": { | ||||
|           "version": "2.0.3", | ||||
|           "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", | ||||
|           "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "builder-util": { | ||||
|       "version": "22.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.4.1.tgz", | ||||
|       "integrity": "sha512-+ysLc7cC4w6P7rBxmZ5X2aU3QvcwFoWCl1us+mcUKdsGmJAtFUMPJqueeptdxjyPrPShIUOKHzA8uk5A3d1fHg==", | ||||
|       "version": "22.5.1", | ||||
|       "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.5.1.tgz", | ||||
|       "integrity": "sha512-CelDTP3+fvDfZfbwy3PXif7mudPaWankJ8vrRg/NtCGvL+hXnwycnJZr46d5EQL7AgQcpJ27o9LTdfu61cxTFw==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "7zip-bin": "~5.0.3", | ||||
|         "@types/debug": "^4.1.5", | ||||
|         "@types/fs-extra": "^8.1.0", | ||||
|         "app-builder-bin": "3.5.5", | ||||
|         "app-builder-bin": "3.5.6", | ||||
|         "bluebird-lst": "^1.0.9", | ||||
|         "builder-util-runtime": "8.6.2", | ||||
|         "builder-util-runtime": "8.7.0", | ||||
|         "chalk": "^3.0.0", | ||||
|         "debug": "^4.1.1", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "fs-extra": "^9.0.0", | ||||
|         "is-ci": "^2.0.0", | ||||
|         "js-yaml": "^3.13.1", | ||||
|         "source-map-support": "^0.5.16", | ||||
| @@ -1917,17 +1920,6 @@ | ||||
|           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", | ||||
|           "dev": true | ||||
|         }, | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         }, | ||||
|         "stat-mode": { | ||||
|           "version": "1.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", | ||||
| @@ -1946,9 +1938,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "builder-util-runtime": { | ||||
|       "version": "8.6.2", | ||||
|       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz", | ||||
|       "integrity": "sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A==", | ||||
|       "version": "8.7.0", | ||||
|       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz", | ||||
|       "integrity": "sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "debug": "^4.1.1", | ||||
| @@ -1971,7 +1963,7 @@ | ||||
|         }, | ||||
|         "readable-stream": { | ||||
|           "version": "1.1.14", | ||||
|           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", | ||||
|           "requires": { | ||||
|             "core-util-is": "~1.0.0", | ||||
| @@ -2146,7 +2138,7 @@ | ||||
|     }, | ||||
|     "chalk": { | ||||
|       "version": "1.1.3", | ||||
|       "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", | ||||
|       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", | ||||
|       "requires": { | ||||
|         "ansi-styles": "^2.2.1", | ||||
| @@ -2463,7 +2455,7 @@ | ||||
|     }, | ||||
|     "commander": { | ||||
|       "version": "2.8.1", | ||||
|       "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", | ||||
|       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", | ||||
|       "requires": { | ||||
|         "graceful-readlink": ">= 1.0.0" | ||||
| @@ -3126,7 +3118,7 @@ | ||||
|         }, | ||||
|         "readable-stream": { | ||||
|           "version": "1.1.14", | ||||
|           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", | ||||
|           "requires": { | ||||
|             "core-util-is": "~1.0.0", | ||||
| @@ -3151,31 +3143,19 @@ | ||||
|       } | ||||
|     }, | ||||
|     "dmg-builder": { | ||||
|       "version": "22.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.4.1.tgz", | ||||
|       "integrity": "sha512-hEemh7n0zoVt7zPPwvn7iOttP03oENjJ4ApttPmt8oDnX8T4q42MjGWyDlLkPMplMJfoTxkkNqmm296f0OYM8Q==", | ||||
|       "version": "22.5.1", | ||||
|       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.5.1.tgz", | ||||
|       "integrity": "sha512-AwIiyGwgqhA8Ty/YnEU20aSzfrWZns6suOBTqddD+rLDI4jEASKGQadfvcXRSWgaK/VQW0GrhheXrhJpzZzt3g==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "app-builder-lib": "~22.4.1", | ||||
|         "bluebird-lst": "^1.0.9", | ||||
|         "builder-util": "~22.4.1", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "app-builder-lib": "22.5.1", | ||||
|         "builder-util": "22.5.1", | ||||
|         "fs-extra": "^9.0.0", | ||||
|         "iconv-lite": "^0.5.1", | ||||
|         "js-yaml": "^3.13.1", | ||||
|         "sanitize-filename": "^1.6.3" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         }, | ||||
|         "iconv-lite": { | ||||
|           "version": "0.5.1", | ||||
|           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz", | ||||
| @@ -3352,9 +3332,9 @@ | ||||
|       "integrity": "sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA==" | ||||
|     }, | ||||
|     "electron": { | ||||
|       "version": "9.0.0-beta.16", | ||||
|       "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.16.tgz", | ||||
|       "integrity": "sha512-Ky+rH7JwioIRDv4JTOt7B76gTgOrNq0Y3PyDPR6AaDabTYaIG5dNAY8hLRNHVkWkuMPToKLz1F1gJfFohqxtvQ==", | ||||
|       "version": "9.0.0-beta.18", | ||||
|       "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.18.tgz", | ||||
|       "integrity": "sha512-mOdPB4nPc4kO2uwpvvbNZz0RDrRDIko/C8XFmOZmz7k3JaU7r0h/tLxdeypiqfLwxW/Bu1n+uwqG1X34i3fTEw==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "@electron/get": "^1.0.1", | ||||
| @@ -3363,25 +3343,25 @@ | ||||
|       } | ||||
|     }, | ||||
|     "electron-builder": { | ||||
|       "version": "22.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.4.1.tgz", | ||||
|       "integrity": "sha512-13CjZcGeJS+c3EKRwFT/Oty5Niif5g1FwDioBLEbjkPCPQgxdtDsr+rJtCu9qxkiKDYpAoPS+t/clNk0efONvQ==", | ||||
|       "version": "22.5.1", | ||||
|       "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.5.1.tgz", | ||||
|       "integrity": "sha512-7gnHN8Ml5zecDerN8/ljAwUKtE+hhGLuT/X2/zO0FJM2q2hlLx/6ZgzESFILKqnPQFEBRxQ8SL1OxjdIY0HIrw==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "@types/yargs": "^15.0.4", | ||||
|         "app-builder-lib": "22.4.1", | ||||
|         "app-builder-lib": "22.5.1", | ||||
|         "bluebird-lst": "^1.0.9", | ||||
|         "builder-util": "22.4.1", | ||||
|         "builder-util-runtime": "8.6.2", | ||||
|         "builder-util": "22.5.1", | ||||
|         "builder-util-runtime": "8.7.0", | ||||
|         "chalk": "^3.0.0", | ||||
|         "dmg-builder": "22.4.1", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "dmg-builder": "22.5.1", | ||||
|         "fs-extra": "^9.0.0", | ||||
|         "is-ci": "^2.0.0", | ||||
|         "lazy-val": "^1.0.4", | ||||
|         "read-config-file": "5.0.2", | ||||
|         "read-config-file": "6.0.0", | ||||
|         "sanitize-filename": "^1.6.3", | ||||
|         "update-notifier": "^4.1.0", | ||||
|         "yargs": "^15.1.0" | ||||
|         "yargs": "^15.3.1" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "ansi-styles": { | ||||
| @@ -3419,17 +3399,6 @@ | ||||
|           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", | ||||
|           "dev": true | ||||
|         }, | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         }, | ||||
|         "supports-color": { | ||||
|           "version": "7.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", | ||||
| @@ -3752,17 +3721,17 @@ | ||||
|       } | ||||
|     }, | ||||
|     "electron-publish": { | ||||
|       "version": "22.4.1", | ||||
|       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.4.1.tgz", | ||||
|       "integrity": "sha512-nwKNum3KXm+01rtWX2pc1jhazdzDy2zYnQx+zmXphZchjd6UOMX3ZN0xyZUCKugw5ZliflT6LkgbrcBXBtYD3A==", | ||||
|       "version": "22.5.1", | ||||
|       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.5.1.tgz", | ||||
|       "integrity": "sha512-g5bwLAHZT6A++yU1+Et+fncnFAdXXgkRao9rzTFAvhQ0QJBsmLiyOd0Ta2RI/EQcVoy6jyHtxFs7CWIXE5aZOA==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "@types/fs-extra": "^8.1.0", | ||||
|         "bluebird-lst": "^1.0.9", | ||||
|         "builder-util": "~22.4.1", | ||||
|         "builder-util-runtime": "8.6.2", | ||||
|         "builder-util": "22.5.1", | ||||
|         "builder-util-runtime": "8.7.0", | ||||
|         "chalk": "^3.0.0", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "fs-extra": "^9.0.0", | ||||
|         "lazy-val": "^1.0.4", | ||||
|         "mime": "^2.4.4" | ||||
|       }, | ||||
| @@ -3802,17 +3771,6 @@ | ||||
|           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", | ||||
|           "dev": true | ||||
|         }, | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         }, | ||||
|         "mime": { | ||||
|           "version": "2.4.4", | ||||
|           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", | ||||
| @@ -4273,9 +4231,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "express-session": { | ||||
|       "version": "1.17.0", | ||||
|       "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.0.tgz", | ||||
|       "integrity": "sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg==", | ||||
|       "version": "1.17.1", | ||||
|       "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz", | ||||
|       "integrity": "sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==", | ||||
|       "requires": { | ||||
|         "cookie": "0.4.0", | ||||
|         "cookie-signature": "1.0.6", | ||||
| @@ -4287,11 +4245,6 @@ | ||||
|         "uid-safe": "~2.1.5" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "cookie": { | ||||
|           "version": "0.4.0", | ||||
|           "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", | ||||
|           "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" | ||||
|         }, | ||||
|         "debug": { | ||||
|           "version": "2.6.9", | ||||
|           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", | ||||
| @@ -4983,7 +4936,7 @@ | ||||
|     }, | ||||
|     "get-stream": { | ||||
|       "version": "3.0.0", | ||||
|       "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|     }, | ||||
|     "getpass": { | ||||
| @@ -5247,7 +5200,7 @@ | ||||
|     }, | ||||
|     "got": { | ||||
|       "version": "5.7.1", | ||||
|       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", | ||||
|       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", | ||||
|       "requires": { | ||||
|         "create-error-class": "^3.0.1", | ||||
| @@ -5895,7 +5848,7 @@ | ||||
|     }, | ||||
|     "into-stream": { | ||||
|       "version": "3.1.0", | ||||
|       "resolved": "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", | ||||
|       "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", | ||||
|       "requires": { | ||||
|         "from2": "^2.1.1", | ||||
| @@ -6007,9 +5960,9 @@ | ||||
|       "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=" | ||||
|     }, | ||||
|     "is-installed-globally": { | ||||
|       "version": "0.3.1", | ||||
|       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.1.tgz", | ||||
|       "integrity": "sha512-oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg==", | ||||
|       "version": "0.3.2", | ||||
|       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", | ||||
|       "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "global-dirs": "^2.0.1", | ||||
| @@ -6047,7 +6000,7 @@ | ||||
|     }, | ||||
|     "is-obj": { | ||||
|       "version": "1.0.1", | ||||
|       "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", | ||||
|       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" | ||||
|     }, | ||||
|     "is-object": { | ||||
| @@ -6161,9 +6114,9 @@ | ||||
|       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" | ||||
|     }, | ||||
|     "isbinaryfile": { | ||||
|       "version": "4.0.4", | ||||
|       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.4.tgz", | ||||
|       "integrity": "sha512-pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ==", | ||||
|       "version": "4.0.6", | ||||
|       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz", | ||||
|       "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "isexe": { | ||||
| @@ -6448,12 +6401,20 @@ | ||||
|       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" | ||||
|     }, | ||||
|     "json5": { | ||||
|       "version": "2.1.1", | ||||
|       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", | ||||
|       "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==", | ||||
|       "version": "2.1.3", | ||||
|       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", | ||||
|       "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "minimist": "^1.2.0" | ||||
|         "minimist": "^1.2.5" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "minimist": { | ||||
|           "version": "1.2.5", | ||||
|           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", | ||||
|           "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", | ||||
|           "dev": true | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "jsonfile": { | ||||
| @@ -6590,7 +6551,7 @@ | ||||
|     }, | ||||
|     "load-json-file": { | ||||
|       "version": "1.1.0", | ||||
|       "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", | ||||
|       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", | ||||
|       "requires": { | ||||
|         "graceful-fs": "^4.1.2", | ||||
| @@ -7099,7 +7060,7 @@ | ||||
|     }, | ||||
|     "minimist": { | ||||
|       "version": "1.2.0", | ||||
|       "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", | ||||
|       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" | ||||
|     }, | ||||
|     "minipass": { | ||||
| @@ -7199,7 +7160,7 @@ | ||||
|     }, | ||||
|     "mkdirp": { | ||||
|       "version": "0.5.1", | ||||
|       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", | ||||
|       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", | ||||
|       "requires": { | ||||
|         "minimist": "0.0.8" | ||||
| @@ -7207,7 +7168,7 @@ | ||||
|       "dependencies": { | ||||
|         "minimist": { | ||||
|           "version": "0.0.8", | ||||
|           "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", | ||||
|           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" | ||||
|         } | ||||
|       } | ||||
| @@ -7401,7 +7362,7 @@ | ||||
|             }, | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             }, | ||||
|             "got": { | ||||
| @@ -7437,7 +7398,7 @@ | ||||
|             }, | ||||
|             "p-cancelable": { | ||||
|               "version": "0.4.1", | ||||
|               "resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", | ||||
|               "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" | ||||
|             }, | ||||
|             "p-event": { | ||||
| @@ -7561,7 +7522,7 @@ | ||||
|           "dependencies": { | ||||
|             "file-type": { | ||||
|               "version": "3.9.0", | ||||
|               "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|               "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" | ||||
|             } | ||||
|           } | ||||
| @@ -7586,7 +7547,7 @@ | ||||
|           "dependencies": { | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             }, | ||||
|             "pify": { | ||||
| @@ -7643,7 +7604,7 @@ | ||||
|         }, | ||||
|         "get-stream": { | ||||
|           "version": "2.3.1", | ||||
|           "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", | ||||
|           "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", | ||||
|           "requires": { | ||||
|             "object-assign": "^4.0.1", | ||||
| @@ -7673,7 +7634,7 @@ | ||||
|           "dependencies": { | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             } | ||||
|           } | ||||
| @@ -7713,7 +7674,7 @@ | ||||
|         }, | ||||
|         "pify": { | ||||
|           "version": "2.3.0", | ||||
|           "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", | ||||
|           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" | ||||
|         }, | ||||
|         "prepend-http": { | ||||
| @@ -7818,7 +7779,7 @@ | ||||
|         }, | ||||
|         "readable-stream": { | ||||
|           "version": "1.1.14", | ||||
|           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | ||||
|           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", | ||||
|           "requires": { | ||||
|             "core-util-is": "~1.0.0", | ||||
| @@ -8187,7 +8148,7 @@ | ||||
|     }, | ||||
|     "onetime": { | ||||
|       "version": "1.1.0", | ||||
|       "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", | ||||
|       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" | ||||
|     }, | ||||
|     "open": { | ||||
| @@ -8339,7 +8300,7 @@ | ||||
|     }, | ||||
|     "p-is-promise": { | ||||
|       "version": "1.1.0", | ||||
|       "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", | ||||
|       "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" | ||||
|     }, | ||||
|     "p-limit": { | ||||
| @@ -8820,7 +8781,7 @@ | ||||
|             }, | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             } | ||||
|           } | ||||
| @@ -9104,7 +9065,7 @@ | ||||
|           "dependencies": { | ||||
|             "file-type": { | ||||
|               "version": "3.9.0", | ||||
|               "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", | ||||
|               "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" | ||||
|             } | ||||
|           } | ||||
| @@ -9129,7 +9090,7 @@ | ||||
|           "dependencies": { | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             }, | ||||
|             "pify": { | ||||
| @@ -9167,7 +9128,7 @@ | ||||
|             }, | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             } | ||||
|           } | ||||
| @@ -9219,7 +9180,7 @@ | ||||
|         }, | ||||
|         "get-stream": { | ||||
|           "version": "2.3.1", | ||||
|           "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", | ||||
|           "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", | ||||
|           "requires": { | ||||
|             "object-assign": "^4.0.1", | ||||
| @@ -9249,7 +9210,7 @@ | ||||
|           "dependencies": { | ||||
|             "get-stream": { | ||||
|               "version": "3.0.0", | ||||
|               "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | ||||
|               "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" | ||||
|             } | ||||
|           } | ||||
| @@ -9437,7 +9398,7 @@ | ||||
|     }, | ||||
|     "query-string": { | ||||
|       "version": "5.1.1", | ||||
|       "resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", | ||||
|       "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", | ||||
|       "requires": { | ||||
|         "decode-uri-component": "^0.2.0", | ||||
| @@ -9526,30 +9487,16 @@ | ||||
|       } | ||||
|     }, | ||||
|     "read-config-file": { | ||||
|       "version": "5.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-5.0.2.tgz", | ||||
|       "integrity": "sha512-tVt1lsiSjs+FtL/vtfCivqtKR1UNk3BB3uPJQvJqkgtAYDvZjo0xyXFYSVmzaTcO+Jdi5G7O2K2vDV+p1M/oug==", | ||||
|       "version": "6.0.0", | ||||
|       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.0.0.tgz", | ||||
|       "integrity": "sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "dotenv": "^8.2.0", | ||||
|         "dotenv-expand": "^5.1.0", | ||||
|         "fs-extra": "^8.1.0", | ||||
|         "js-yaml": "^3.13.1", | ||||
|         "json5": "^2.1.1", | ||||
|         "json5": "^2.1.2", | ||||
|         "lazy-val": "^1.0.4" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "fs-extra": { | ||||
|           "version": "8.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", | ||||
|           "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.2.0", | ||||
|             "jsonfile": "^4.0.0", | ||||
|             "universalify": "^0.1.0" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "read-pkg": { | ||||
| @@ -9590,7 +9537,7 @@ | ||||
|     }, | ||||
|     "readable-stream": { | ||||
|       "version": "2.3.6", | ||||
|       "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | ||||
|       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | ||||
|       "requires": { | ||||
|         "core-util-is": "~1.0.0", | ||||
| @@ -10458,7 +10405,7 @@ | ||||
|     }, | ||||
|     "strip-ansi": { | ||||
|       "version": "3.0.1", | ||||
|       "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", | ||||
|       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", | ||||
|       "requires": { | ||||
|         "ansi-regex": "^2.0.0" | ||||
| @@ -10483,7 +10430,7 @@ | ||||
|     }, | ||||
|     "strip-dirs": { | ||||
|       "version": "1.1.1", | ||||
|       "resolved": "http://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", | ||||
|       "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", | ||||
|       "requires": { | ||||
|         "chalk": "^1.0.0", | ||||
| @@ -10741,7 +10688,7 @@ | ||||
|     }, | ||||
|     "through": { | ||||
|       "version": "2.3.8", | ||||
|       "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", | ||||
|       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", | ||||
|       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" | ||||
|     }, | ||||
|     "through2": { | ||||
| @@ -10760,7 +10707,7 @@ | ||||
|         }, | ||||
|         "readable-stream": { | ||||
|           "version": "1.0.34", | ||||
|           "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | ||||
|           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | ||||
|           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", | ||||
|           "requires": { | ||||
|             "core-util-is": "~1.0.0", | ||||
| @@ -11986,9 +11933,9 @@ | ||||
|       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" | ||||
|     }, | ||||
|     "yargs": { | ||||
|       "version": "15.3.0", | ||||
|       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz", | ||||
|       "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==", | ||||
|       "version": "15.3.1", | ||||
|       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", | ||||
|       "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "cliui": "^6.0.0", | ||||
| @@ -12001,7 +11948,7 @@ | ||||
|         "string-width": "^4.2.0", | ||||
|         "which-module": "^2.0.0", | ||||
|         "y18n": "^4.0.0", | ||||
|         "yargs-parser": "^18.1.0" | ||||
|         "yargs-parser": "^18.1.1" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "ansi-regex": { | ||||
| @@ -12130,9 +12077,9 @@ | ||||
|           } | ||||
|         }, | ||||
|         "yargs-parser": { | ||||
|           "version": "18.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz", | ||||
|           "integrity": "sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==", | ||||
|           "version": "18.1.3", | ||||
|           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", | ||||
|           "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "camelcase": "^5.0.0", | ||||
|   | ||||
							
								
								
									
										10
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								package.json
									
									
									
									
									
								
							| @@ -2,7 +2,7 @@ | ||||
|   "name": "trilium", | ||||
|   "productName": "Trilium Notes", | ||||
|   "description": "Trilium Notes", | ||||
|   "version": "0.41.3-beta", | ||||
|   "version": "0.41.5", | ||||
|   "license": "AGPL-3.0-only", | ||||
|   "main": "electron.js", | ||||
|   "bin": { | ||||
| @@ -21,7 +21,7 @@ | ||||
|     "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "async-mutex": "0.2.1", | ||||
|     "async-mutex": "0.2.2", | ||||
|     "axios": "0.19.2", | ||||
|     "body-parser": "1.19.0", | ||||
|     "cls-hooked": "4.2.2", | ||||
| @@ -36,7 +36,7 @@ | ||||
|     "electron-find": "1.0.6", | ||||
|     "electron-window-state": "5.0.3", | ||||
|     "express": "4.17.1", | ||||
|     "express-session": "1.17.0", | ||||
|     "express-session": "1.17.1", | ||||
|     "file-type": "14.1.4", | ||||
|     "fs-extra": "9.0.0", | ||||
|     "helmet": "3.22.0", | ||||
| @@ -78,8 +78,8 @@ | ||||
|     "yazl": "^2.5.1" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "electron": "9.0.0-beta.16", | ||||
|     "electron-builder": "22.4.1", | ||||
|     "electron": "9.0.0-beta.18", | ||||
|     "electron-builder": "22.5.1", | ||||
|     "electron-packager": "14.2.1", | ||||
|     "electron-rebuild": "1.10.1", | ||||
|     "jsdoc": "3.6.4", | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| import optionsService from "../../services/options.js"; | ||||
| import utils from "../../services/utils.js"; | ||||
| import server from "../../services/server.js"; | ||||
| import toastService from "../../services/toast.js"; | ||||
|  | ||||
| @@ -20,7 +20,9 @@ const TPL = ` | ||||
|         <input type="text" class="form-control" id="spell-check-language-code" placeholder="for example "en-US", "de-AT""> | ||||
|     </div> | ||||
|  | ||||
|     <p>Multiple languages can be separated by comman. Changes to the spell check options will take effect after application restart.</p> | ||||
|     <p>Multiple languages can be separated by comma, e.g. <code>en-US, de-DE, cs</code>. Changes to the spell check options will take effect after application restart.</p> | ||||
|      | ||||
|     <p><strong>Available language codes: </strong> <span id="available-language-codes"></span></p> | ||||
| </div> | ||||
|  | ||||
| <div> | ||||
| @@ -95,6 +97,14 @@ export default class ProtectedSessionOptions { | ||||
|             return false; | ||||
|         }); | ||||
|  | ||||
|         this.$availableLanguageCodes = $("#available-language-codes"); | ||||
|  | ||||
|         if (utils.isElectron()) { | ||||
|             const {webContents} = utils.dynamicRequire('electron').remote.getCurrentWindow(); | ||||
|  | ||||
|             this.$availableLanguageCodes.text(webContents.session.availableSpellCheckerLanguages.join(', ')); | ||||
|         } | ||||
|  | ||||
|         this.$eraseNotesAfterTimeInSeconds = $("#erase-notes-after-time-in-seconds"); | ||||
|  | ||||
|         this.$eraseNotesAfterTimeInSeconds.on('change', () => { | ||||
|   | ||||
| @@ -162,6 +162,7 @@ $(document).on('contextmenu', 'a.ck-link-actions__preview', newTabContextMenu); | ||||
| $(document).on('contextmenu', '.note-detail-text a', newTabContextMenu); | ||||
| $(document).on('contextmenu', "a[data-action='note']", newTabContextMenu); | ||||
| $(document).on('contextmenu', ".note-detail-render a", newTabContextMenu); | ||||
| $(document).on('contextmenu', ".note-paths-widget a", newTabContextMenu); | ||||
|  | ||||
| export default { | ||||
|     getNotePathFromUrl, | ||||
|   | ||||
| @@ -42,6 +42,8 @@ export default class MainTreeExecutors extends Component { | ||||
|         await ws.waitForMaxKnownSyncId(); | ||||
|  | ||||
|         appContext.tabManager.getActiveTabContext().setNote(note.noteId); | ||||
|  | ||||
|         appContext.triggerCommand('focusAndSelectTitle'); | ||||
|     } | ||||
|  | ||||
|     async createNoteAfterCommand() { | ||||
| @@ -63,5 +65,7 @@ export default class MainTreeExecutors extends Component { | ||||
|         await ws.waitForMaxKnownSyncId(); | ||||
|  | ||||
|         appContext.tabManager.getActiveTabContext().setNote(note.noteId); | ||||
|  | ||||
|         appContext.triggerCommand('focusAndSelectTitle'); | ||||
|     } | ||||
| } | ||||
| @@ -239,7 +239,7 @@ function focusSavedElement() { | ||||
|     $lastFocusedElement = null; | ||||
| } | ||||
|  | ||||
| function openDialog($dialog) { | ||||
| async function openDialog($dialog) { | ||||
|     closeActiveDialog(); | ||||
|  | ||||
|     glob.activeDialog = $dialog; | ||||
| @@ -253,6 +253,9 @@ function openDialog($dialog) { | ||||
|             focusSavedElement(); | ||||
|         } | ||||
|     }); | ||||
|  | ||||
|     const keyboardActionsService = (await import("./keyboard_actions.js")).default; | ||||
|     keyboardActionsService.updateDisplayedShortcuts($dialog); | ||||
| } | ||||
|  | ||||
| function isHtmlEmpty(html) { | ||||
|   | ||||
| @@ -84,6 +84,7 @@ export default class NotePathsWidget extends TabAwareWidget { | ||||
|                 this.$currentPath.append( | ||||
|                     $("<a>") | ||||
|                         .attr('href', '#' + curPath) | ||||
|                         .attr('data-note-path', curPath) | ||||
|                         .addClass('no-tooltip-preview') | ||||
|                         .text(await treeService.getNoteTitle(noteId, parentNoteId)) | ||||
|                 ); | ||||
|   | ||||
| @@ -1 +1 @@ | ||||
| module.exports = { buildDate:"2020-04-14T22:19:56+02:00", buildRevision: "61167f664644a60d207e7d2d8a0c3bedd2543397" }; | ||||
| module.exports = { buildDate:"2020-04-20T22:39:23+02:00", buildRevision: "9f1b3cc892bdbbb150d54bac1bbe6356168ed5d3" }; | ||||
|   | ||||
| @@ -68,7 +68,7 @@ async function createMainWindow() { | ||||
|  | ||||
|     if (spellcheckEnabled) { | ||||
|         const languageCodes = (await optionService.getOption('spellCheckLanguageCode')) | ||||
|             .split('/') | ||||
|             .split(',') | ||||
|             .map(code => code.trim()); | ||||
|  | ||||
|         webContents.session.setSpellCheckerLanguages(languageCodes); | ||||
|   | ||||
| @@ -18,7 +18,7 @@ | ||||
|                                 <ul> | ||||
|                                     <li><kbd>UP</kbd>, <kbd>DOWN</kbd> - go up/down in the list of notes</li> | ||||
|                                     <li><kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - collapse/expand node</li> | ||||
|                                     <li><kbd data-command="backInNoteHistory"></kbd>, <kbd data-command="BackInNoteHistory"></kbd> - go back / forwards in the history</li> | ||||
|                                     <li><kbd data-command="backInNoteHistory"></kbd>, <kbd data-command="forwardInNoteHistory"></kbd> - go back / forwards in the history</li> | ||||
|                                     <li><kbd data-command="jumpToNote"></kbd> - show <a class="external" href="https://github.com/zadam/trilium/wiki/Note-navigation#jump-to-note">"Jump to" dialog</a></li> | ||||
|                                     <li><kbd data-command="scrollToActiveNote"></kbd> - scroll to active note</li> | ||||
|                                     <li><kbd data-command="activateParentNote"></kbd> - jumps to parent note</li> | ||||
| @@ -69,9 +69,9 @@ | ||||
|  | ||||
|                             <p class="card-text"> | ||||
|                                 <ul> | ||||
|                                     <li><kbd data-command="moveNoteUp"></kbd>, <kbd data-command="MoveNoteDown"></kbd> - move note up/down in the note list</li> | ||||
|                                     <li><kbd data-command="moveNoteUpInHierarchy"></kbd>, <kbd data-command="MoveNoteDownInHierarchy"></kbd> - move note up in the hierarchy</li> | ||||
|                                     <li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="AddNoteBelowToSelection"></kbd> - multi-select note above/below</li> | ||||
|                                     <li><kbd data-command="moveNoteUp"></kbd>, <kbd data-command="moveNoteDown"></kbd> - move note up/down in the note list</li> | ||||
|                                     <li><kbd data-command="moveNoteUpInHierarchy"></kbd>, <kbd data-command="moveNoteDownInHierarchy"></kbd> - move note up in the hierarchy</li> | ||||
|                                     <li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="addNoteBelowToSelection"></kbd> - multi-select note above/below</li> | ||||
|                                     <li><kbd data-command="selectAllNotesInParent"></kbd> - select all notes in the current level</li> | ||||
|                                     <li><kbd>Shift+click</kbd> - select note</li> | ||||
|                                     <li><kbd data-command="copyNotesToClipboard"></kbd> - copies active note (or current selection) into clipboard (used for <a class="external" href="https://github.com/zadam/trilium/wiki/Cloning notes">cloning</a>)</li> | ||||
| @@ -102,7 +102,7 @@ | ||||
|  | ||||
|                     <div class="card"> | ||||
|                         <div class="card-body"> | ||||
|                             <h5 class="card-title"><a class="external" href="https://github.com/zadam/trilium/wiki/Text-editor#autoformat">Markdown-like autoformatting</a></h5> | ||||
|                             <h5 class="card-title"><a class="external" href="https://github.com/zadam/trilium/wiki/Text-notes#autoformat">Markdown-like autoformatting</a></h5> | ||||
|  | ||||
|                             <p class="card-text"> | ||||
|                                 <ul> | ||||
|   | ||||
| @@ -6,7 +6,7 @@ module.exports = { | ||||
|         mobile: './src/public/app/desktop.js', | ||||
|     }, | ||||
|     output: { | ||||
|         publicPath: 'dist/', | ||||
|         publicPath: 'app-dist/', | ||||
|         path: path.resolve(__dirname, 'src/public/app-dist'), | ||||
|         filename: 'desktop.js' | ||||
|     }, | ||||
|   | ||||
| @@ -6,7 +6,7 @@ module.exports = { | ||||
|         mobile: './src/public/app/mobile.js', | ||||
|     }, | ||||
|     output: { | ||||
|         publicPath: '/dist/', | ||||
|         publicPath: 'app-dist/', | ||||
|         path: path.resolve(__dirname, 'src/public/app-dist'), | ||||
|         filename: 'mobile.js' | ||||
|     }, | ||||
|   | ||||
| @@ -6,7 +6,7 @@ module.exports = { | ||||
|         mobile: './src/public/app/setup.js', | ||||
|     }, | ||||
|     output: { | ||||
|         publicPath: '/dist/', | ||||
|         publicPath: 'app-dist/', | ||||
|         path: path.resolve(__dirname, 'src/public/app-dist'), | ||||
|         filename: 'setup.js' | ||||
|     }, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user