mirror of
https://github.com/Foundry376/Mailspring.git
synced 2025-02-27 09:36:28 +08:00
bump(⚡️): Electron 0.29.2 > 0.34.3, Sqlite 3.0.11 > 3.1.1
This commit is contained in:
parent
72b8bc1853
commit
74252d58d9
7 changed files with 15 additions and 21 deletions
|
@ -8,8 +8,9 @@ module.exports =
|
||||||
ComponentRegistry.register FeedbackButton,
|
ComponentRegistry.register FeedbackButton,
|
||||||
location: WorkspaceStore.Sheet.Global.Footer
|
location: WorkspaceStore.Sheet.Global.Footer
|
||||||
|
|
||||||
protocol.registerProtocol 'nylas-feedback-available', =>
|
protocol.registerStringProtocol 'nylas-feedback-available', (request, callback) =>
|
||||||
FeedbackActions.feedbackAvailable()
|
FeedbackActions.feedbackAvailable()
|
||||||
|
callback('ok')
|
||||||
|
|
||||||
serialize: ->
|
serialize: ->
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 18 KiB |
12
package.json
12
package.json
|
@ -11,10 +11,10 @@
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/nylas/N1/issues"
|
"url": "https://github.com/nylas/N1/issues"
|
||||||
},
|
},
|
||||||
"electronVersion": "0.29.2",
|
"electronVersion": "0.34.3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"async": "^0.9",
|
"async": "^0.9",
|
||||||
"atom-keymap": "5.1.11",
|
"atom-keymap": "^6.1.1",
|
||||||
"babel-core": "^5.8.21",
|
"babel-core": "^5.8.21",
|
||||||
"bluebird": "^2.9",
|
"bluebird": "^2.9",
|
||||||
"classnames": "1.2.1",
|
"classnames": "1.2.1",
|
||||||
|
@ -40,11 +40,11 @@
|
||||||
"mkdirp": "^0.5",
|
"mkdirp": "^0.5",
|
||||||
"moment": "^2.8",
|
"moment": "^2.8",
|
||||||
"moment-timezone": "^0.3",
|
"moment-timezone": "^0.3",
|
||||||
"nslog": "^2.0.0",
|
"nslog": "^3",
|
||||||
"node-uuid": "^1.4",
|
"node-uuid": "^1.4",
|
||||||
"nock": "^2",
|
"nock": "^2",
|
||||||
"optimist": "0.4.0",
|
"optimist": "0.4.0",
|
||||||
"pathwatcher": "^4.4.0",
|
"pathwatcher": "~6.2",
|
||||||
"property-accessors": "^1",
|
"property-accessors": "^1",
|
||||||
"promise-queue": "2.1.1",
|
"promise-queue": "2.1.1",
|
||||||
"proxyquire": "1.3.1",
|
"proxyquire": "1.3.1",
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
"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": "^3.1",
|
||||||
"sanitize-html": "1.9.0",
|
"sanitize-html": "1.9.0",
|
||||||
"scoped-property-store": "^0.16.2",
|
"scoped-property-store": "^0.16.2",
|
||||||
"season": "^5.1",
|
"season": "^5.1",
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
"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": "^3.1.2",
|
||||||
"temp": "^0.8",
|
"temp": "^0.8",
|
||||||
"theorist": "^1.0",
|
"theorist": "^1.0",
|
||||||
"underscore": "^1.8",
|
"underscore": "^1.8",
|
||||||
|
|
|
@ -48,7 +48,7 @@ function makeSqlite3Command() {
|
||||||
|
|
||||||
// Use our local version of npm (npm 3x) to build sqlite
|
// Use our local version of npm (npm 3x) to build sqlite
|
||||||
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
|
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
|
||||||
return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --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.1.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v46-"+targetPlatform+"-"+targetArch
|
||||||
}
|
}
|
||||||
|
|
||||||
function bootstrap() {
|
function bootstrap() {
|
||||||
|
|
|
@ -1,15 +1,9 @@
|
||||||
{$} = require '../src/space-pen-extensions'
|
|
||||||
|
|
||||||
describe '"nylas" protocol URL', ->
|
describe '"nylas" protocol URL', ->
|
||||||
it 'sends the file relative in the package as response', ->
|
it 'sends the file relative in the package as response', ->
|
||||||
called = false
|
called = false
|
||||||
callback = -> called = true
|
request = new XMLHttpRequest()
|
||||||
$.ajax
|
request.addEventListener('load', -> called = true)
|
||||||
url: 'nylas://async/package.json'
|
request.open('GET', 'nylas://async/package.json', true)
|
||||||
success: callback
|
request.send()
|
||||||
# In old versions of jQuery, ajax calls to custom protocol would always
|
|
||||||
# be treated as error eventhough the browser thinks it's a success
|
|
||||||
# request.
|
|
||||||
error: callback
|
|
||||||
|
|
||||||
waitsFor 'request to be done', -> called is true
|
waitsFor 'request to be done', -> called is true
|
||||||
|
|
|
@ -30,7 +30,7 @@ class NylasProtocolHandler
|
||||||
|
|
||||||
# Creates the 'Nylas' custom protocol handler.
|
# Creates the 'Nylas' custom protocol handler.
|
||||||
registerNylasProtocol: ->
|
registerNylasProtocol: ->
|
||||||
protocol.registerProtocol 'nylas', (request) =>
|
protocol.registerFileProtocol 'nylas', (request, callback) =>
|
||||||
relativePath = path.normalize(request.url.substr(7))
|
relativePath = path.normalize(request.url.substr(7))
|
||||||
|
|
||||||
if relativePath.indexOf('assets/') is 0
|
if relativePath.indexOf('assets/') is 0
|
||||||
|
@ -42,4 +42,4 @@ class NylasProtocolHandler
|
||||||
filePath = path.join(loadPath, relativePath)
|
filePath = path.join(loadPath, relativePath)
|
||||||
break if fs.statSyncNoException(filePath).isFile?()
|
break if fs.statSyncNoException(filePath).isFile?()
|
||||||
|
|
||||||
new protocol.RequestFileJob(filePath)
|
callback(filePath)
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
.popover {
|
.popover {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
|
||||||
max-height:400px;
|
max-height:400px;
|
||||||
background-color: @background-primary;
|
background-color: @background-primary;
|
||||||
border-radius: @border-radius-base;
|
border-radius: @border-radius-base;
|
||||||
|
|
Loading…
Reference in a new issue