mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 02:02:14 +01:00 
			
		
		
		
	Proper two package.json format, release.sh bumps 2nd json ver too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
		
							parent
							
								
									9e2324fb69
								
							
						
					
					
						commit
						f54708227e
					
				@ -1,5 +1,9 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "description": "Electron main process dependencies",
 | 
					  "name": "riot-web",
 | 
				
			||||||
 | 
					  "main": "src/electron-main.js",
 | 
				
			||||||
 | 
					  "version": "0.0.0",
 | 
				
			||||||
 | 
					  "description": "A feature-rich client for Matrix.org",
 | 
				
			||||||
 | 
					  "author": "Vector Creations Ltd.",
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
    "electron-window-state": "^4.1.0"
 | 
					    "electron-window-state": "^4.1.0"
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										14
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								package.json
									
									
									
									
									
								
							@ -146,11 +146,12 @@
 | 
				
			|||||||
    "dereference": true,
 | 
					    "dereference": true,
 | 
				
			||||||
    "//files": "We bundle everything, so we only need to include webapp/",
 | 
					    "//files": "We bundle everything, so we only need to include webapp/",
 | 
				
			||||||
    "files": [
 | 
					    "files": [
 | 
				
			||||||
      "electron/node_modules/**",
 | 
					      "node_modules/**",
 | 
				
			||||||
      "electron/src/**",
 | 
					      "src/**",
 | 
				
			||||||
      "electron/img/**",
 | 
					      "img/**"
 | 
				
			||||||
      "webapp/**",
 | 
					    ],
 | 
				
			||||||
      "package.json"
 | 
					    "extraResources": [
 | 
				
			||||||
 | 
					      "webapp/**/*"
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "linux": {
 | 
					    "linux": {
 | 
				
			||||||
      "target": "deb",
 | 
					      "target": "deb",
 | 
				
			||||||
@ -164,7 +165,8 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "directories": {
 | 
					    "directories": {
 | 
				
			||||||
      "buildResources": "electron/build",
 | 
					      "buildResources": "electron/build",
 | 
				
			||||||
      "output": "electron/dist"
 | 
					      "output": "electron/dist",
 | 
				
			||||||
 | 
					      "app": "electron"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								release.sh
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								release.sh
									
									
									
									
									
								
							@ -9,4 +9,17 @@ set -e
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
cd `dirname $0`
 | 
					cd `dirname $0`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# bump Electron's package.json first
 | 
				
			||||||
 | 
					release="${1#v}"
 | 
				
			||||||
 | 
					tag="v${release}"
 | 
				
			||||||
 | 
					echo "electron npm version"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cd electron
 | 
				
			||||||
 | 
					npm version --no-git-tag-version "$release"
 | 
				
			||||||
 | 
					git commit package.json -m "$tag"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					cd ..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
 | 
					exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user