mirror of
				https://github.com/Foundry376/Mailspring.git
				synced 2025-11-01 00:46:25 +08:00 
			
		
		
		
	Upgrade to Electron 0.30.8. Remove unsused packages. Upgrade deps
- Upgrade node-sqlite3 from patched 3.0.2 to mainline 3.1.0 - Upgrade Electron to 0.30.8: NOTE: This is the latest in the 0.30 line. The 0.31+ line did a Chrome upgrade that we want to save for a later day. We've had a history of serious instabilities with these upgrades and are doing them conservatively - Upgrade coffee-script from 1.9.0 to 1.10.0 - Package updates in /build folder
This commit is contained in:
		
							parent
							
								
									7f0fca9c25
								
							
						
					
					
						commit
						bd065b7fb4
					
				
					 3 changed files with 12 additions and 19 deletions
				
			
		|  | @ -6,15 +6,13 @@ | ||||||
|     "url": "https://github.com/nylas/edgehill.git" |     "url": "https://github.com/nylas/edgehill.git" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "archiver": "^0.13", |  | ||||||
|     "async": "~0.2.9", |     "async": "~0.2.9", | ||||||
|     "bluebird": "^2.3", |     "bluebird": "^2.3", | ||||||
|     "coffee-react-transform": "^3.1.0", |     "coffee-react-transform": "^3.1.0", | ||||||
|     "coffeelint-cjsx": "^2.0", |     "coffeelint-cjsx": "^2.0", | ||||||
|     "donna": "1.0.10", |     "donna": "1.0.10", | ||||||
|     "formidable": "~1.0.14", |  | ||||||
|     "fs-plus": "2.x", |     "fs-plus": "2.x", | ||||||
|     "github-releases": "~0.2.0", |     "github-releases": "~0.3.0", | ||||||
|     "grunt": "~0.4.1", |     "grunt": "~0.4.1", | ||||||
|     "grunt-cli": "~0.1.9", |     "grunt-cli": "~0.1.9", | ||||||
|     "grunt-coffee-react": "^2.1.0", |     "grunt-coffee-react": "^2.1.0", | ||||||
|  | @ -24,8 +22,8 @@ | ||||||
|     "grunt-contrib-csslint": "~0.1.2", |     "grunt-contrib-csslint": "~0.1.2", | ||||||
|     "grunt-contrib-less": "~0.8.0", |     "grunt-contrib-less": "~0.8.0", | ||||||
|     "grunt-cson": "0.14.0", |     "grunt-cson": "0.14.0", | ||||||
|     "grunt-download-electron": "^2.1.1", |     "grunt-download-electron": "^2.1", | ||||||
|     "grunt-electron-installer": "1.0.5", |     "grunt-electron-installer": "^1.0", | ||||||
|     "grunt-lesslint": "0.13.0", |     "grunt-lesslint": "0.13.0", | ||||||
|     "grunt-markdown": "^0.7.0", |     "grunt-markdown": "^0.7.0", | ||||||
|     "grunt-peg": "~1.1.0", |     "grunt-peg": "~1.1.0", | ||||||
|  | @ -37,17 +35,17 @@ | ||||||
|     "legal-eagle": "~0.9.0", |     "legal-eagle": "~0.9.0", | ||||||
|     "meta-marked": "^0.3.3", |     "meta-marked": "^0.3.3", | ||||||
|     "minidump": "~0.8", |     "minidump": "~0.8", | ||||||
|     "moment": "^2.8", |     "moment": "^2.10", | ||||||
|     "npm": "2.13.3", |     "npm": "2.14.7", | ||||||
|     "rcedit": "~0.3.0", |     "rcedit": "~0.3.0", | ||||||
|     "request": "~2.27.0", |     "request": "^2.64", | ||||||
|     "rimraf": "~2.2.2", |     "rimraf": "~2.2.2", | ||||||
|     "runas": "^3.1", |     "runas": "^3.1", | ||||||
|     "s3": "^4.3", |     "s3": "^4.3", | ||||||
|     "tello": "git+https://github.com/nylas/tello.git#built", |     "tello": "git+https://github.com/nylas/tello.git#built", | ||||||
|     "temp": "~0.8.1", |     "temp": "~0.8.1", | ||||||
|     "underscore": "^1.8", |     "underscore": "^1.8", | ||||||
|     "underscore.string": "^3.0", |     "underscore.string": "^3.2", | ||||||
|     "unzip": "~0.1.9", |     "unzip": "~0.1.9", | ||||||
|     "vm-compatibility-layer": "~0.1.0", |     "vm-compatibility-layer": "~0.1.0", | ||||||
|     "webdriverio": "^2.4.5" |     "webdriverio": "^2.4.5" | ||||||
|  |  | ||||||
							
								
								
									
										13
									
								
								package.json
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								package.json
									
										
									
									
									
								
							|  | @ -6,12 +6,12 @@ | ||||||
|   "main": "./src/browser/main.js", |   "main": "./src/browser/main.js", | ||||||
|   "repository": { |   "repository": { | ||||||
|     "type": "git", |     "type": "git", | ||||||
|     "url": "https://github.com/nylas/edgehill.git" |     "url": "https://github.com/nylas/N1.git" | ||||||
|   }, |   }, | ||||||
|   "bugs": { |   "bugs": { | ||||||
|     "url": "https://github.com/nylas/edgehill/issues" |     "url": "https://github.com/nylas/N1/issues" | ||||||
|   }, |   }, | ||||||
|   "electronVersion": "0.30.7", |   "electronVersion": "0.30.8", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "6to5-core": "^3.5", |     "6to5-core": "^3.5", | ||||||
|     "asar": "^0.5.0", |     "asar": "^0.5.0", | ||||||
|  | @ -22,7 +22,7 @@ | ||||||
|     "classnames": "1.2.1", |     "classnames": "1.2.1", | ||||||
|     "clear-cut": "0.4.0", |     "clear-cut": "0.4.0", | ||||||
|     "coffee-react": "^2.0.0", |     "coffee-react": "^2.0.0", | ||||||
|     "coffee-script": "1.9.0", |     "coffee-script": "1.10.0", | ||||||
|     "coffeestack": "^1.1", |     "coffeestack": "^1.1", | ||||||
|     "color": "^0.7.3", |     "color": "^0.7.3", | ||||||
|     "delegato": "^1", |     "delegato": "^1", | ||||||
|  | @ -53,24 +53,19 @@ | ||||||
|     "q": "^1.0.1", |     "q": "^1.0.1", | ||||||
|     "raven": "0.7.2", |     "raven": "0.7.2", | ||||||
|     "react": "^0.13.2", |     "react": "^0.13.2", | ||||||
|     "react-atom-fork": "^0.11.5", |  | ||||||
|     "react-hot-api": "0.4.5", |     "react-hot-api": "0.4.5", | ||||||
|     "reactionary-atom-fork": "^1.0.0", |  | ||||||
|     "reflux": "0.1.13", |     "reflux": "0.1.13", | ||||||
|     "request": "^2.53", |     "request": "^2.53", | ||||||
|     "request-progress": "^0.3", |     "request-progress": "^0.3", | ||||||
|     "runas": "^2.0", |     "runas": "^2.0", | ||||||
|     "sanitize-html": "^1.9", |     "sanitize-html": "^1.9", | ||||||
|     "scandal": "2.0.0", |  | ||||||
|     "scoped-property-store": "^0.16.2", |     "scoped-property-store": "^0.16.2", | ||||||
|     "scrollbar-style": "^2.0", |  | ||||||
|     "season": "^5.1", |     "season": "^5.1", | ||||||
|     "semver": "^4.2", |     "semver": "^4.2", | ||||||
|     "serializable": "^1", |     "serializable": "^1", | ||||||
|     "service-hub": "^0.2.0", |     "service-hub": "^0.2.0", | ||||||
|     "space-pen": "3.8.2", |     "space-pen": "3.8.2", | ||||||
|     "spellchecker": "2.2.1", |     "spellchecker": "2.2.1", | ||||||
|     "stacktrace-parser": "^0.1", |  | ||||||
|     "temp": "^0.8", |     "temp": "^0.8", | ||||||
|     "text-buffer": "^4.1", |     "text-buffer": "^4.1", | ||||||
|     "theorist": "^1.0", |     "theorist": "^1.0", | ||||||
|  |  | ||||||
|  | @ -43,7 +43,7 @@ function makeSqlite3Command() { | ||||||
|     // Unless electron for windows goes 64bit, this should stay |     // Unless electron for windows goes 64bit, this should stay | ||||||
|     throw new Error("Building for win32 with architecture "+targetArch+". Are you sure you meant to do this?"); |     throw new Error("Building for win32 with architecture "+targetArch+". Are you sure you meant to do this?"); | ||||||
|   } |   } | ||||||
|   return npmPath+" install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch |   return npmPath+" install https://github.com/mapbox/node-sqlite3/archive/v3.1.0.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function bootstrap() { | function bootstrap() { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue