Summary:
Started with upgrading electron from 3.0.0 to 4.0.5. This required a bunch of subsequent updates:
* upgrading `electron-builder` to latest version, because the old version couldn't build electron 4 apps.
* `appDir` is deprecated in builder config, `projectDir` is used instead, which we already had set, so its fine to just remove this ([see GitHub commit](a5e457163e)).
* upgrading `jest-runner/electron` because the old version couldn't run electron 4 tests.
* upgrading our custom dependency resolution to use electron 4.0.5, because the test runner still resolves to 2.0.8 ([see GitHub issue](https://github.com/facebook-atom/jest-electron-runner/issues/31)).
* updating `sandcastle.sh` to use the new cache files from D14131344.
* removing `package-lock.json` as is was causing warnings. We use `yarn` and `yarn.lock` anyways. This file must have been committed by accident.
* updating our check to only run one version of Flipper at a time to use the new electron API `app.requestSingleInstanceLock` as the old one was removed in electron 4.
* updating the snapshot test that checks App rendering, which changed a little due to the electron upgrade.
* upgrading flow-type definitions to `electron-v4.0.5.js` generated by [electron-flowtype-definitions](https://github.com/danielbuechele/electron-flowtype-definitions).
**PS: Best new feature in Electron 4: Copy&paste working in dev tools**
Reviewed By: jknoxville
Differential Revision: D14131360
fbshipit-source-id: d7ed9643875629a1fa1860bb61b11dd0c64112ab
118 lines
3.4 KiB
JavaScript
Executable File
118 lines
3.4 KiB
JavaScript
Executable File
/**
|
|
* Copyright 2018-present Facebook.
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
* @format
|
|
*/
|
|
const path = require('path');
|
|
const fs = require('fs-extra');
|
|
const builder = require('electron-builder');
|
|
const Platform = builder.Platform;
|
|
const {
|
|
buildFolder,
|
|
compile,
|
|
die,
|
|
compileDefaultPlugins,
|
|
getVersionNumber,
|
|
} = require('./build-utils.js');
|
|
|
|
function generateManifest(versionNumber) {
|
|
const filePath = path.join(__dirname, '..', 'dist');
|
|
if (!fs.existsSync(filePath)) {
|
|
fs.mkdirSync(filePath);
|
|
}
|
|
fs.writeFileSync(
|
|
path.join(__dirname, '../dist/manifest.json'),
|
|
JSON.stringify({
|
|
package: 'com.facebook.sonar',
|
|
version_name: versionNumber,
|
|
}),
|
|
);
|
|
}
|
|
|
|
function modifyPackageManifest(buildFolder, versionNumber) {
|
|
// eslint-disable-next-line no-console
|
|
console.log('Creating package.json manifest');
|
|
const manifest = require('../package.json');
|
|
const manifestStatic = require('../static/package.json');
|
|
|
|
// The manifest's dependencies are bundled with the final app by
|
|
// electron-builder. We want to bundle the dependencies from the static-folder
|
|
// because all dependencies from the root-folder are already bundled by metro.
|
|
manifest.dependencies = manifestStatic.dependencies;
|
|
manifest.main = 'index.js';
|
|
manifest.version = versionNumber;
|
|
fs.writeFileSync(
|
|
path.join(buildFolder, 'package.json'),
|
|
JSON.stringify(manifest, null, ' '),
|
|
);
|
|
}
|
|
|
|
function buildDist(buildFolder) {
|
|
const targetsRaw = [];
|
|
|
|
if (process.argv.indexOf('--mac') > -1) {
|
|
targetsRaw.push(Platform.MAC.createTarget(['zip']));
|
|
}
|
|
if (process.argv.indexOf('--linux') > -1) {
|
|
targetsRaw.push(Platform.LINUX.createTarget(['zip']));
|
|
}
|
|
if (process.argv.indexOf('--win') > -1) {
|
|
targetsRaw.push(Platform.WINDOWS.createTarget(['zip']));
|
|
}
|
|
if (!targetsRaw.length) {
|
|
throw new Error('No targets specified. eg. --mac, --win, or --linux');
|
|
}
|
|
|
|
// merge all target maps into a single map
|
|
let targetsMerged = [];
|
|
for (const target of targetsRaw) {
|
|
targetsMerged = targetsMerged.concat(Array.from(target));
|
|
}
|
|
const targets = new Map(targetsMerged);
|
|
|
|
const electronDownload = {};
|
|
if (process.env.electron_config_cache) {
|
|
electronDownload.cache = process.env.electron_config_cache;
|
|
}
|
|
|
|
return builder
|
|
.build({
|
|
publish: 'never',
|
|
config: {
|
|
appId: `com.facebook.sonar`,
|
|
directories: {
|
|
buildResources: path.join(__dirname, '..', 'static'),
|
|
output: path.join(__dirname, '..', 'dist'),
|
|
},
|
|
electronDownload,
|
|
npmRebuild: false,
|
|
},
|
|
projectDir: buildFolder,
|
|
targets,
|
|
})
|
|
.catch(die);
|
|
}
|
|
|
|
function copyStaticFolder(buildFolder) {
|
|
fs.copySync(path.join(__dirname, '..', 'static'), buildFolder, {
|
|
dereference: true,
|
|
});
|
|
}
|
|
|
|
(async () => {
|
|
const dir = await buildFolder();
|
|
// eslint-disable-next-line no-console
|
|
console.log('Created build directory', dir);
|
|
copyStaticFolder(dir);
|
|
await compileDefaultPlugins(path.join(dir, 'defaultPlugins'));
|
|
await compile(dir, path.join(__dirname, '..', 'src', 'init.js'));
|
|
const versionNumber = getVersionNumber();
|
|
modifyPackageManifest(dir, versionNumber);
|
|
generateManifest(versionNumber);
|
|
await buildDist(dir);
|
|
// eslint-disable-next-line no-console
|
|
console.log('✨ Done');
|
|
process.exit();
|
|
})();
|