Adorian Doran
c2d917b926
style(next): restyle WebKit scrollbars
2025-03-26 18:53:17 +02:00
--global
0cedd697cc
fix(electron): not starting on an empty DB
2025-03-26 18:41:36 +02:00
Jin
647226858d
feat: 🎸 Disable MFA on electron instance
2025-03-26 11:04:04 +01:00
Jin
0741c8546f
feat: 🎸 fix electron login logic
2025-03-26 10:58:34 +01:00
Jin
347c644f23
Merge branch 'develop' into feature/MFA
2025-03-26 10:48:16 +01:00
Panagiotis Papadopoulos
0b428035ae
build(cleanupNodeModules): move removal of elements to its own function
...
also added a logging function for debugging purposes
2025-03-26 09:48:06 +01:00
Panagiotis Papadopoulos
51f2e23c2f
build(cleanupNodeModules): delete .bin folder
...
this is only needed for executing package scripts -> which we don't do in production
fixes #1499
2025-03-26 09:28:50 +01:00
Panagiotis Papadopoulos
1528703ed9
build(cleanupNodeModules): add some minimalistic logging
2025-03-26 09:26:22 +01:00
Panagiotis Papadopoulos
1150f78b15
build(cleanupNodeModules): use path.join and basePath for extraFoldersDelete
2025-03-26 09:18:16 +01:00
Panagiotis Papadopoulos
6fe23f9a13
chore(cleanupNodeModules): remove commented out paths
...
extra note on mermaid: that should be packed by webpack now, so we just need to move it to devDeps and and we should be good
2025-03-26 09:15:33 +01:00
Panagiotis Papadopoulos
b457fa2e87
chore(cleanupNodeModules): rename nodeDir to nodeModulesContent
2025-03-26 09:12:22 +01:00
Panagiotis Papadopoulos
83da24b38d
build(dockerignore): add cleanupNodeModules as exception
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
57ee61938d
build(copy-trilium): delete now unused script
...
all of its functionality has been "absorbed" by the cross-platform copy-dist and cleanupNodeModules scripts, that can be used for all of our builds now
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
f79b925e49
build(server): use cleanupNodeModules script
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
3e3344b329
chore(scripts): remove now unneeded electron-forge:prepare
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
1ceaafa1e8
build: move cleanupNodeModules to its own file
...
this is necessary, since for Docker and electron-forge, we need to run this as an extra step after copy-dist
for electron-forge: after it is done with its own "pruning", as we otherwise would need to also take care of certain electron related pruning
for Docker: as a last step in the build stage
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
cd8401089d
build(copy-trilium): update list of useless deps paths
...
* image-q/demo -> doesn't exist anymore (and even if it did - previous cleanup step, would've removed this anyways)
* @excalidraw/excalidraw/dist/* -> updated to point to the dev folder
* boxicons -> only fonts and css folders are used, so remove the other ones
* jimp -> updated paths and removed non-existent path
fixing here for historical reasons, next step is to move these over to copy-dist.ts
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
6749d8084b
build(copy-dist): add further cleanupNodeModules functionality
...
deleting of ts and map files from node_modules folder,
adapted from copy-trilium.sh.
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
8275f3c867
build(copy-dist): execute filterableDirs cleanup in one chain
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
a9643174cc
build(copy-dist): add further folders to list of filterableDirs
...
same as before, but some of the modules use singular/plural, so just check for both
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
6260ea1532
build(copy-dist): add initial cleanupNodeModules functionality
...
adapted from copy-trilium.sh
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
bee7793d32
build(copy-trilium): remove now unnecessary package.json patching
...
this is not needed anymore since commit 6b9d8f0d677763f29d29abd0816b1a5d40e858c8
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
8feb201d3d
build(electron-forge): set prune to false
...
since we our own more "sophisticated" pruning during copy-dist, we need to set this to false, as otherwise build will fail
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
6fb270e4f8
build(copy-dist): copy over existing node_modules
...
helps avoiding downloading the packages a 2nd time during our prune stage
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
8977492981
build(copy-dist): move "pruning" to copy-dist from copy-trilium.sh
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
1640000291
build(build-server): move "build:prepare-dist" call to build-server from copy-trilium
...
in preparation to get rid of the file altogether - rest of the functionality will be merged into copy-dist.ts
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
17d5fdb4b0
build(copy-dist): get rid of manual node_module copying
...
this is useless at the moment, as all build processes are running "npm ci --omit=dev" anyways, i.e. they will just install everything remaining again
2025-03-26 08:12:48 +01:00
Panagiotis Papadopoulos
1e713469e7
build(server): bump to latest node v22.14.0 -> fixes EBADENGINE warning
...
npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE package: 'node-abi@4.2.0',
npm warn EBADENGINE required: { node: '>=22.12.0' },
npm warn EBADENGINE current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
2025-03-26 08:12:22 +01:00
Panagiotis Papadopoulos
b97c28bc13
ci: bump to node v22 -> fixes EBADENGINE warning
...
npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE package: 'node-abi@4.2.0',
npm warn EBADENGINE required: { node: '>=22.12.0' },
npm warn EBADENGINE current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
2025-03-26 08:10:04 +01:00
Elian Doran
5ec3d58f6f
fix(electron): option does not exist
2025-03-26 08:30:56 +02:00
Jin
d010e6cc73
Merge branch 'develop' into feature/MFA
2025-03-26 03:56:53 +01:00
Jin
7024166fc0
feat: 🎸 Add CN translation
2025-03-26 03:55:06 +01:00
Jin
ce053323a9
feat: 🎸 Format code
2025-03-26 03:53:00 +01:00
Jin
e2ea6f96ce
feat: 🎸 Add CN translation
2025-03-26 03:51:09 +01:00
Jin
4959dbf126
feat: 🎸 Improve TOTP setting page
2025-03-26 03:22:57 +01:00
renovate[bot]
e0522fcd48
fix(deps): update dependency mermaid to v11.6.0
2025-03-26 02:11:39 +00:00
Jin
979000c5c8
feat: 🎸 Fix recovery key error
2025-03-26 02:55:42 +01:00
Jin
f2a29653b2
feat: 🎸 Fix SSO login
2025-03-26 02:39:29 +01:00
Jin
d4b657e4d8
feat: 🎸 Fix import naming
2025-03-26 02:04:24 +01:00
Jin
4762287d61
feat: 🎸 Remove redundant func
2025-03-26 01:58:54 +01:00
Jin
886e63f128
feat: 🎸 Add SSO login button
2025-03-26 01:48:42 +01:00
Jin
a30695b9fb
feat: 🎸 Remove redundant check auth
2025-03-26 01:36:48 +01:00
Jin
e957a17f1c
feat: 🎸 Seperate auth check
2025-03-26 00:50:37 +01:00
Jin
083ee5d23b
feat: 🎸 Fix TOTP not load correctly
2025-03-26 00:42:19 +01:00
Jin
8f157e04d4
feat: 🎸 Show correct login error to user
2025-03-26 00:13:56 +01:00
Jin
c1ed471403
feat: 🎸 Ask user to login if any MFA configs are changed
2025-03-26 00:04:55 +01:00
Jin
c2a6d517f0
feat: 🎸 Better naming for vars
2025-03-25 23:53:49 +01:00
Jin
1afccb4129
feat: 🎸 Fix app start error with MFA configs
2025-03-25 23:14:25 +01:00
Jin
ae794a562f
feat: 🎸 Use config.ini configure
2025-03-25 22:44:59 +01:00
Jin
3fa89b2eba
feat: 🎸 Remove unuse gitignore file
2025-03-25 22:32:52 +01:00
