Merge pull request #115 from electron/updates-2

chore: Updates for everyone
electron · Nov 27, 2018 · c62041a · c62041a
2 parents 45e8e31 + ff3e931
commit c62041a
Show file tree

Hide file tree

Showing 17 changed files with 576 additions and 607 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
  "dependencies": {
  "@fortawesome/fontawesome": "^1.1.8",
  "@fortawesome/fontawesome-free-solid": "^5.0.13",
- "@fortawesome/fontawesome-svg-core": "^1.2.4",
- "@fortawesome/free-solid-svg-icons": "^5.3.1",
+ "@fortawesome/fontawesome-svg-core": "^1.2.8",
+ "@fortawesome/free-solid-svg-icons": "^5.5.0",
  "@fortawesome/react-fontawesome": "0.1.3",
  "@octokit/rest": "^15.12.1",
  "builtin-modules": "^3.0.0",
@@ -46,26 +46,26 @@
  "electron-squirrel-startup": "^1.0.0",
  "extract-zip": "^1.6.7",
  "fix-path": "^2.1.0",
- "fs-extra": "^7.0.0",
+ "fs-extra": "^7.0.1",
  "loader-utils": "^1.1.0",
- "mobx": "^5.5.0",
- "mobx-react": "^5.2.8",
+ "mobx": "^5.6.0",
+ "mobx-react": "^5.4.2",
  "monaco-loader": "^0.14.0",
  "namor": "^1.1.1",
- "react": "^16.5.2",
- "react-dom": "^16.5.2",
+ "react": "^16.6.3",
+ "react-dom": "^16.6.3",
  "react-mosaic-component": "^1.1.1",
- "semver": "^5.5.1",
+ "semver": "^5.6.0",
  "tmp": "0.0.33",
  "tslib": "^1.9.3",
  "update-electron-app": "^1.3.0"
  },
  "devDependencies": {
- "@electron-forge/cli": "^6.0.0-beta.28",
- "@electron-forge/maker-deb": "^6.0.0-beta.28",
- "@electron-forge/maker-rpm": "^6.0.0-beta.28",
- "@electron-forge/maker-squirrel": "^6.0.0-beta.28",
- "@electron-forge/maker-zip": "^6.0.0-beta.28",
+ "@electron-forge/cli": "^6.0.0-beta.30",
+ "@electron-forge/maker-deb": "^6.0.0-beta.30",
+ "@electron-forge/maker-rpm": "^6.0.0-beta.30",
+ "@electron-forge/maker-squirrel": "^6.0.0-beta.30",
+ "@electron-forge/maker-zip": "^6.0.0-beta.30",
  "@types/builtin-modules": "^2.0.0",
  "@types/enzyme": "^3.1.13",
  "@types/fs-extra": "^5.0.4",
@@ -77,28 +77,28 @@
  "@types/semver": "^5.5.0",
  "@types/tmp": "0.0.33",
  "chokidar": "^2.0.4",
- "electron": "3.0.4",
+ "electron": "3.0.10",
  "enzyme": "^3.6.0",
  "enzyme-adapter-react-16": "^1.5.0",
  "enzyme-to-json": "^3.3.4",
  "jest": "^23.6.0",
  "jest-fetch-mock": "^1.6.6",
  "less": "^3.8.1",
  "log-symbols": "^2.2.0",
- "monaco-editor": "^0.14.3",
- "node-abi": "^2.4.4",
- "node-fetch": "^2.1.2",
+ "monaco-editor": "^0.15.6",
+ "node-abi": "^2.5.0",
+ "node-fetch": "^2.3.0",
  "npm-run-all": "^4.1.3",
  "parcel-bundler": "^1.9.7",
  "react-test-renderer": "^16.4.2",
  "rimraf": "^2.6.2",
  "standard": "^12.0.1",
  "stylelint": "^9.6.0",
  "stylelint-config-standard": "^18.2.0",
- "ts-jest": "^23.10.2",
+ "ts-jest": "^23.10.5",
  "tslint": "^5.11.0",
  "tslint-microsoft-contrib": "^5.2.1",
  "tslint-react": "^3.6.0",
- "typescript": "^3.1.2"
+ "typescript": "^3.1.6"
  }
 }
diff --git a/src/less/dialogs.less b/src/less/dialogs.less
@@ -179,7 +179,7 @@
 }
 
 .error-text {
- margin: 0px;
+ margin: 0;
  font-size: 14px;
  color: #d73a49;
 }

diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
@@ -1,3 +1,16 @@
+import { library } from '@fortawesome/fontawesome-svg-core';
+import {
+ faClipboardList,
+ faCloudDownloadAlt,
+ faKey,
+ faSignInAlt,
+ faSignOutAlt,
+ faSpinner,
+ faTerminal,
+ faTimesCircle,
+ faTrash,
+ faUpload
+} from '@fortawesome/free-solid-svg-icons';
 import * as MonacoType from 'monaco-editor';
 
 import { EditorValues } from '../interfaces';
@@ -7,6 +20,19 @@ import { FileManager } from './file-manager';
 import { appState } from './state';
 import { getTheme } from './themes';
 
+library.add(
+ faClipboardList,
+ faCloudDownloadAlt,
+ faKey,
+ faSignInAlt,
+ faSignOutAlt,
+ faSpinner,
+ faTerminal,
+ faTimesCircle,
+ faTrash,
+ faUpload
+);
+
 /**
  * The top-level class controlling the whole app. This is *not* a React component,
  * but it does eventually render all components.

diff --git a/src/renderer/components/commands.tsx b/src/renderer/components/commands.tsx
@@ -1,4 +1,3 @@
-import { faTerminal } from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -39,7 +38,7 @@ export class Commands extends React.Component<CommandsProps, {}> {
  <AddressBar appState={appState} />
  <PublishButton appState={appState} />
  <button className='button' onClick={() => appState.toggleConsole()}>
- <FontAwesomeIcon icon={faTerminal} />
+ <FontAwesomeIcon icon='terminal' />
  </button>
  </div>
  </div>

diff --git a/src/renderer/components/publish-button.tsx b/src/renderer/components/publish-button.tsx
@@ -1,4 +1,3 @@
-import { faSpinner, faUpload } from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -120,7 +119,7 @@ export class PublishButton extends React.Component<PublishButtonProps, PublishBu
  public render() {
  const { isPublishing } = this.state;
  const className = classNames('button', 'button-publish', isPublishing);
- const icon = isPublishing ? faSpinner : faUpload;
+ const icon = isPublishing ? 'spinner' : 'upload';
  const text = isPublishing ? 'Publishing...' : 'Publish';
 
  return (

diff --git a/src/renderer/components/settings-electron.tsx b/src/renderer/components/settings-electron.tsx
@@ -1,10 +1,3 @@
-import {
- faClipboardList,
- faCloudDownloadAlt,
- faFile,
- faSpinner,
- faTrash
-} from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -152,11 +145,11 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
  const { isDownloadingAll, isDeletingAll } = this.state;
  const isWorking = isDownloadingAll || isDeletingAll;
  const downloadFontAwesomeIcon = isDownloadingAll
- ? <FontAwesomeIcon icon={faSpinner} spin={true} />
- : <FontAwesomeIcon icon={faCloudDownloadAlt} />;
+ ? <FontAwesomeIcon icon='spinner' spin={true} />
+ : <FontAwesomeIcon icon='cloud-download-alt' />;
  const deleteFontAwesomeIcon = isDeletingAll
- ? <FontAwesomeIcon icon={faSpinner} spin={true} />
- : <FontAwesomeIcon icon={faTrash} />;
+ ? <FontAwesomeIcon icon='spinner' spin={true} />
+ : <FontAwesomeIcon icon='trash' />;
 
  return (
  <div className='advanced-options-buttons'>
@@ -186,7 +179,7 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
  className='button btn-add-version'
  onClick={this.handleAddVersion}
  >
- <FontAwesomeIcon icon={faFile} /> Add Local Electron Build
+ <FontAwesomeIcon icon='file' /> Add Local Electron Build
  </button>
  </div>
  </div>
@@ -273,8 +266,8 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
  const { appState } = this.props;
  const { isUpdatingElectronVersions } = appState;
  const icon = isUpdatingElectronVersions
- ? <FontAwesomeIcon icon={faSpinner} spin={true}/>
- : <FontAwesomeIcon icon={faClipboardList} />;
+ ? <FontAwesomeIcon icon='spinner' spin={true}/>
+ : <FontAwesomeIcon icon='clipboard-list' />;
 
  return (
  <button
@@ -361,7 +354,7 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
 
  return (
  <button className='button' onClick={remove}>
- <FontAwesomeIcon icon={faTrash} /> {label}
+ <FontAwesomeIcon icon='trash' /> {label}
  </button>
  );
  }
@@ -370,7 +363,7 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
  if (state === 'downloading') {
  return (
  <button className='button' disabled={true}>
- <FontAwesomeIcon icon={faSpinner} spin={true}/> Downloading
+ <FontAwesomeIcon icon='spinner' spin={true}/> Downloading
  </button>
  );
  }
@@ -380,7 +373,7 @@ export class ElectronSettings extends React.Component<ElectronSettingsProps, Ele
 
  return (
  <button className='button' onClick={download}>
- <FontAwesomeIcon icon={faCloudDownloadAlt} /> Download
+ <FontAwesomeIcon icon='cloud-download-alt' /> Download
  </button>
  );
  }

diff --git a/src/renderer/components/settings-general-github.tsx b/src/renderer/components/settings-general-github.tsx
@@ -1,4 +1,3 @@
-import { faSignInAlt, faSignOutAlt } from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -36,7 +35,7 @@ export class GitHubSettings extends React.Component<GitHubSettingsProps, {}> {
  ),
  (
  <button className='button' key='sign-in-button' onClick={signIn}>
- <FontAwesomeIcon icon={faSignInAlt} /> Sign In
+ <FontAwesomeIcon icon='sign-in-alt' /> Sign In
  </button>
  )
  ];
@@ -60,7 +59,7 @@ export class GitHubSettings extends React.Component<GitHubSettingsProps, {}> {
  ),
  (
  <button className='button' key='sign-out-button' onClick={signOut}>
- <FontAwesomeIcon icon={faSignOutAlt} /> Remove Token & Sign Out
+ <FontAwesomeIcon icon='sign-out-alt' /> Remove Token & Sign Out
  </button>
  )
  ];

diff --git a/src/renderer/components/settings.tsx b/src/renderer/components/settings.tsx
@@ -1,4 +1,3 @@
-import { faTimesCircle } from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -102,7 +101,7 @@ export class Settings extends React.Component<SettingsProps, SettingsState> {
  </div>
  <div className='settings-content'>
  <div className='settings-close' onClick={appState.toggleSettings}>
- <FontAwesomeIcon icon={faTimesCircle} />
+ <FontAwesomeIcon icon='times-circle' />
  </div>
  {this.renderContent()}
  </div>

diff --git a/src/renderer/components/token-dialog.tsx b/src/renderer/components/token-dialog.tsx
@@ -1,4 +1,3 @@
-import { faKey, faSpinner } from '@fortawesome/fontawesome-free-solid';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { clipboard, shell } from 'electron';
 import { observer } from 'mobx-react';
@@ -148,7 +147,7 @@ export class TokenDialog extends React.Component<TokenDialogProps, TokenDialogSt
 
  return (
  <div className='tokenSpinner'>
- <FontAwesomeIcon icon={faSpinner} spin={true} />
+ <FontAwesomeIcon icon='spinner' spin={true} />
  </div>
  );
  }
@@ -188,7 +187,7 @@ export class TokenDialog extends React.Component<TokenDialogProps, TokenDialogSt
  >
  {this.spinner}
  <span className='generateTokenText'>
- <FontAwesomeIcon icon={faKey} />
+ <FontAwesomeIcon icon='key' />
  Generate a <a onClick={this.openGenerateTokenExternal}>GitHub Personal Access Token</a> and paste it here:
  </span>