mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-26 15:56:29 +01:00 
			
		
		
		
	chore(monorepo): handle build chains in root package scripts
This commit is contained in:
		| @@ -27,10 +27,6 @@ BUILD_DIR="./build" | |||||||
| DIST_DIR="./dist" | DIST_DIR="./dist" | ||||||
| CLEANUP_SCRIPT="./scripts/cleanupNodeModules.ts" | CLEANUP_SCRIPT="./scripts/cleanupNodeModules.ts" | ||||||
|  |  | ||||||
| # Build the package dependencies |  | ||||||
| npm run build:packages --prefix ../.. |  | ||||||
| npm run client:build --prefix ../.. |  | ||||||
|  |  | ||||||
| # Trigger the build | # Trigger the build | ||||||
| echo "Build start" | echo "Build start" | ||||||
| npm run build:prepare-dist | npm run build:prepare-dist | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -7,6 +7,7 @@ | |||||||
|         "": { |         "": { | ||||||
|             "name": "trilium", |             "name": "trilium", | ||||||
|             "version": "0.93.0", |             "version": "0.93.0", | ||||||
|  |             "hasInstallScript": true, | ||||||
|             "license": "AGPL-3.0-only", |             "license": "AGPL-3.0-only", | ||||||
|             "devDependencies": { |             "devDependencies": { | ||||||
|                 "tsx": "^4.19.3" |                 "tsx": "^4.19.3" | ||||||
|   | |||||||
| @@ -18,7 +18,6 @@ | |||||||
|         ] |         ] | ||||||
|     }, |     }, | ||||||
|     "scripts": { |     "scripts": { | ||||||
|         "build": "npm run client:build && npm run server:build", |  | ||||||
|         "build:packages": "npm --workspace=packages/commons run build", |         "build:packages": "npm --workspace=packages/commons run build", | ||||||
|         "test": "npm --workspace=apps/client --workspace=apps/server run test", |         "test": "npm --workspace=apps/client --workspace=apps/server run test", | ||||||
|  |  | ||||||
| @@ -28,9 +27,9 @@ | |||||||
|         "server:test": "npm --workspace=apps/server run test", |         "server:test": "npm --workspace=apps/server run test", | ||||||
|         "server:coverage": "npm --workspace=apps/server run coverage", |         "server:coverage": "npm --workspace=apps/server run coverage", | ||||||
|         "server:build": "npm --workspace=apps/server run build:ts", |         "server:build": "npm --workspace=apps/server run build:ts", | ||||||
|         "server:package": "npm --workspace=apps/server run package", |         "server:package": "npm run build:packages && npm run client:build && npm --workspace=apps/server run package", | ||||||
|  |  | ||||||
|         "electron-forge:make": "npm --workspace=apps/desktop run electron-forge:make", |         "electron-forge:make": "npm run build:packages && npm run client:build && npm run server:build && npm --workspace=apps/desktop run electron-forge:make", | ||||||
|  |  | ||||||
|         "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts", |         "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts", | ||||||
|         "chore:update-build-info": "tsx ./scripts/update-build-info.ts" |         "chore:update-build-info": "tsx ./scripts/update-build-info.ts" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user