Update URL for resolving Electron headers, atom.io is going away

This commit is contained in:
Ben Gotow 2022-08-09 08:30:31 -05:00
parent af83444a63
commit b1ed7fbb8e
4 changed files with 9 additions and 5 deletions

View file

@ -6,7 +6,11 @@ module.exports = grunt => {
const done = this.async(); const done = this.async();
const dmgPath = path.join(grunt.config('outputDir'), 'Mailspring.dmg'); const dmgPath = path.join(grunt.config('outputDir'), 'Mailspring.dmg');
createDMG({ createDMG({
appPath: path.join(grunt.config('outputDir'), 'Mailspring-darwin-x64', 'Mailspring.app'), appPath: path.join(
grunt.config('outputDir'),
`Mailspring-darwin-${process.arch}`,
'Mailspring.app'
),
name: 'Mailspring', name: 'Mailspring',
background: path.resolve( background: path.resolve(
grunt.config('appDir'), grunt.config('appDir'),

View file

@ -15,7 +15,7 @@ module.exports = grunt => {
} }
const orig = process.cwd(); const orig = process.cwd();
process.chdir(path.join(grunt.config('outputDir'), 'Mailspring-darwin-x64')); process.chdir(path.join(grunt.config('outputDir'), `Mailspring-darwin-${process.arch}`));
spawn( spawn(
{ {

4
app/package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "mailspring", "name": "mailspring",
"version": "1.10.3", "version": "1.10.4",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mailspring", "name": "mailspring",
"version": "1.10.3", "version": "1.10.4",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108", "@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108",

View file

@ -18,7 +18,7 @@ const npmEnvs = {
npm_config_target: npmElectronTarget, npm_config_target: npmElectronTarget,
npm_config_arch: process.arch, npm_config_arch: process.arch,
npm_config_target_arch: process.arch, npm_config_target_arch: process.arch,
npm_config_disturl: 'https://atom.io/download/electron', npm_config_disturl: 'https://electronjs.org/headers',
npm_config_runtime: 'electron', npm_config_runtime: 'electron',
npm_config_build_from_source: true, npm_config_build_from_source: true,
}), }),