Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-10 22:54:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update electron-packager, remove .dmg mac build - it’s unused

Browse source
This commit is contained in:
Ben Gotow 2024-06-02 09:29:16 -05:00
parent c214361b92
commit 8364579581
6 changed files with 750 additions and 1420 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build/Gruntfile.js
View file

@ -56,7 +56,7 @@ module.exports = grunt => {
// The Windows electron-winstaller task must be run outside of grunt // The Windows electron-winstaller task must be run outside of grunt
]); ]);
} else if (grunt.option('platform') === 'darwin') { } else if (grunt.option('platform') === 'darwin') {
grunt.registerTask('build-client', ['package', 'create-mac-zip', 'create-mac-dmg']); grunt.registerTask('build-client', ['package', 'create-mac-zip']);
} else if (grunt.option('platform') === 'linux') { } else if (grunt.option('platform') === 'linux') {
grunt.registerTask('build-client', ['package', 'create-deb-installer', 'create-rpm-installer']); grunt.registerTask('build-client', ['package', 'create-deb-installer', 'create-rpm-installer']);
} }

35
app/build/tasks/create-mac-dmg.js
View file

@ -1,35 +0,0 @@
const path = require('path');
const createDMG = require('electron-installer-dmg');
module.exports = grunt => {
grunt.registerTask('create-mac-dmg', 'Create DMG for Mailspring', function pack() {
const done = this.async();
const dmgPath = path.join(grunt.config('outputDir'), 'Mailspring.dmg');
createDMG({
appPath: path.join(
grunt.config('outputDir'),
`Mailspring-darwin-${process.arch}`,
'Mailspring.app'
),
name: 'Mailspring',
background: path.resolve(
grunt.config('appDir'),
'build',
'resources',
'mac',
'DMG-background.png'
),
icon: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'mailspring.icns'),
overwrite: true,
out: grunt.config('outputDir'),
}).then(
() => {
grunt.log.writeln(`>> Created ${dmgPath}`);
done(null);
},
err => {
done(err);
}
);
});
};

2
app/build/tasks/package-task.js
View file

@ -1,6 +1,6 @@
/* eslint global-require: 0 */ /* eslint prefer-template: 0 */ /* eslint global-require: 0 */ /* eslint prefer-template: 0 */
/* eslint quote-props: 0 */ /* eslint quote-props: 0 */
const packager = require('electron-packager'); const packager = require('@electron/packager');
const path = require('path'); const path = require('path');
const util = require('util'); const util = require('util');
const tmpdir = path.resolve(require('os').tmpdir(), 'nylas-build'); const tmpdir = path.resolve(require('os').tmpdir(), 'nylas-build');

2
app/internal_packages/notifications/lib/items/update-notification.tsx
View file

@ -1,5 +1,5 @@
import { localized, React } from 'mailspring-exports'; import { localized, React } from 'mailspring-exports';
import { ipcRenderer, remote, shell } from 'electron'; import { ipcRenderer, shell } from 'electron';
import { Notification } from 'mailspring-component-kit'; import { Notification } from 'mailspring-component-kit';
import { Disposable } from 'event-kit'; import { Disposable } from 'event-kit';

2126
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

3
package.json
View file

@ -53,8 +53,7 @@
"chalk": "1.x.x", "chalk": "1.x.x",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "30.0.9", "electron": "30.0.9",
"electron-installer-dmg": "^4.0.0", "@electron/packager": "18.3.2",
"electron-packager": "17.1.x",
"electron-winstaller": "5.1.x", "electron-winstaller": "5.1.x",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-prettier": "7.2.0", "eslint-config-prettier": "7.2.0",