mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 13:39:01 +01:00 
			
		
		
		
	fix ci build
This commit is contained in:
		
							parent
							
								
									690bd4ce5f
								
							
						
					
					
						commit
						86603573f0
					
				
							
								
								
									
										1
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							@ -29,6 +29,7 @@ jobs:
 | 
			
		||||
          node-version: 20
 | 
			
		||||
          cache: "npm"
 | 
			
		||||
      - run: npm ci
 | 
			
		||||
      - run: npm install --save-dev appdmg
 | 
			
		||||
      - name: Run MacOS installer build (x86_64)
 | 
			
		||||
        run: |
 | 
			
		||||
          npm run update-build-info
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								loader-register.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								loader-register.js
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
			
		||||
// Used to register the loader with Node.js
 | 
			
		||||
// This is used to avoid the warning message when using the loader
 | 
			
		||||
// Can be removed if this PR is merged:
 | 
			
		||||
// https://github.com/TypeStrong/ts-node/pull/2073
 | 
			
		||||
// Then probably can change webpack comand to
 | 
			
		||||
// "webpack": "cross-env NODE_OPTIONS=--import=ts-node/esm webpack -c webpack.config.ts",
 | 
			
		||||
 | 
			
		||||
import { register } from 'node:module';
 | 
			
		||||
import { pathToFileURL } from 'node:url';
 | 
			
		||||
register('ts-node/esm', pathToFileURL('./'));
 | 
			
		||||
@ -33,7 +33,7 @@
 | 
			
		||||
    "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 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' node_modules/webpack/bin/webpack.js -c webpack.config.ts",
 | 
			
		||||
    "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/.bin/jasmine",
 | 
			
		||||
    "test-es6": "tsx -r esm spec-es6/attribute_parser.spec.ts",
 | 
			
		||||
    "test": "npm run test-jasmine && npm run test-es6",
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user