Bumped electron version

Summary:
We in React VR were need newer Chrome DevTools version to make our plugin work properly. Chromium version with required fixes were shipped in electron 5.0.0.

This diff bumps electron version and explicitly allows node integration (accessing require, process and other node related functions from window object in index.html), because it was disabled by default in 5.0.0.

Reviewed By: jknoxville

Differential Revision: D15693539

fbshipit-source-id: 4f71a07b2afaa489aec46940c924f4ad30ad0413
This commit is contained in:
Daniel Büchele
2019-06-10 10:31:42 -07:00
committed by Facebook Github Bot
parent 844cabd5d3
commit 79414aa3e1
16 changed files with 382 additions and 169 deletions

View File

@@ -127,7 +127,7 @@ export function setupMenuBar(
}
function appendMenuItem(
template: Array<MenuItem>,
template: Array<MenuItemConstructorOptions>,
actionHandler: (action: string) => void,
item: ?KeyboardAction,
) {
@@ -185,7 +185,7 @@ function getTemplate(
app: Object,
shell: Object,
store: Store,
): Array<MenuItem> {
): Array<MenuItemConstructorOptions> {
const exportSubmenu = [
{
label: 'File...',

View File

@@ -62,7 +62,7 @@ exports[`Empty app state matches snapshot 1`] = `
className="css-1swhxtd"
onClick={[Function]}
>
4.0.8-dev
5.0.2-dev
</span>
<div
className="css-1cecbfb"

View File

@@ -57,7 +57,7 @@ class UserAccount extends PureComponent<UserAccountProps> {
};
showDetails = () => {
const menuTemplate = [
const menuTemplate: Array<MenuItemConstructorOptions> = [
{
label: 'Sign Out',
click: this.props.logout,

View File

@@ -190,7 +190,7 @@ type Props = {
/**
* Dropdown menu template shown on click.
*/
dropdown?: Array<Electron$MenuItemOptions>,
dropdown?: Array<MenuItemConstructorOptions>,
/**
* Name of the icon dispalyed next to the text
*/

View File

@@ -9,7 +9,7 @@ import * as React from 'react';
import FlexColumn from './FlexColumn.js';
import PropTypes from 'prop-types';
export type MenuTemplate = Array<Electron$MenuItemOptions>;
export type MenuTemplate = Array<MenuItemConstructorOptions>;
type Props = {
/** List of items in the context menu. Used for static menus. */

View File

@@ -11,7 +11,7 @@ import electron from 'electron';
const PropTypes = require('prop-types');
type MenuTemplate = Array<Electron$MenuItemOptions>;
type MenuTemplate = Array<MenuItemConstructorOptions>;
const Container = styled('div')({
display: 'contents',

View File

@@ -178,17 +178,17 @@ const defaultValueExtractor: DataValueExtractor = (value: any) => {
const rootContextMenuCache: WeakMap<
Object,
Array<Electron$MenuItemOptions>,
Array<MenuItemConstructorOptions>,
> = new WeakMap();
function getRootContextMenu(data: Object): Array<Electron$MenuItemOptions> {
function getRootContextMenu(data: Object): Array<MenuItemConstructorOptions> {
const cached = rootContextMenuCache.get(data);
if (cached != null) {
return cached;
}
const stringValue = JSON.stringify(data, null, 2);
const menu: Array<Electron$MenuItemOptions> = [
const menu: Array<MenuItemConstructorOptions> = [
{
label: 'Copy entire tree',
click: () => clipboard.writeText(stringValue),

View File

@@ -221,7 +221,7 @@ class ElementsRow extends PureComponent<ElementsRowProps, ElementsRowState> {
interaction: (name: string, data: any) => void;
getContextMenu = (): Array<Electron$MenuItemOptions> => {
getContextMenu = (): Array<MenuItemConstructorOptions> => {
const {props} = this;
const items = [
{

View File

@@ -105,7 +105,7 @@ export default class FilterToken extends PureComponent<Props> {
};
showDetails = () => {
const menuTemplate = [];
const menuTemplate: Array<MenuItemConstructorOptions> = [];
if (this.props.filter.type === 'enum') {
menuTemplate.push(

View File

@@ -469,7 +469,7 @@ class ManagedTable extends React.Component<
clipboard.writeText(cellText);
};
buildContextMenuItems: () => Array<Electron$MenuItemOptions> = () => {
buildContextMenuItems: () => Array<MenuItemConstructorOptions> = () => {
const {highlightedRows} = this.state;
if (highlightedRows.size === 0) {
return [];

View File

@@ -25,7 +25,7 @@ import FlexRow from '../FlexRow.js';
const invariant = require('invariant');
type MenuTemplate = Array<Electron$MenuItemOptions>;
type MenuTemplate = Array<MenuItemConstructorOptions>;
const TableHeaderArrow = styled('span')({
float: 'right',