Merge pull request #164 from viktor44/feature/electron_14

.github/workflows/release.yml

@@ -14,20 +14,21 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
+          node-version: "18"
           cache: "yarn"
-      - name: Update node-gyp
-        run: |
-          npm install --global [email protected]
-          npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile && yarn run rebuild-all-native
       # See https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md
       # https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md
+      # - name: Update node-gyp
+      #   run: |
+      #     npm install --global [email protected]
+      #     npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile && yarn run rebuild-all-native
       - name: GQL Codegen
         run: yarn run gql-gen
       - name: Build and Release
         run: yarn run release
+
   MacOs:
     runs-on: macos-latest
     env:
@@ -42,14 +43,14 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
+          node-version: "18"
           cache: "yarn"
       - name: Install dependencies
         run: yarn install --frozen-lockfile && yarn run rebuild-all-native
-      - name: Update node-gyp
-        run: |
-          npm install --global [email protected]
-          npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
+      # - name: Update node-gyp
+      #   run: |
+      #     npm install --global [email protected]
+      #     npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
       - name: GQL Codegen
         run: yarn run gql-gen
       - name: Build and Release
@@ -67,14 +68,14 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
-          cache: "yarn"
-      - name: Update node-gyp
+          node-version: "18"
+      - name: Configure Node
+        shell: powershell
         run: |
-          npm install --global [email protected]
+          # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
+          npm install -g npm@8  
+          npm install -g node-gyp@latest
           npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
-      - name: Update registry URL
-        run: |
           npm config set registry "http://registry.npmjs.org"
           yarn config set registry "http://registry.npmjs.org"
           yarn config set network-timeout 300000

.github/workflows/tests.yml

@@ -19,12 +19,12 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
+          node-version: "18"
           cache: "yarn"
-      - name: Update node-gyp
-        run: |
-          npm install --global [email protected]
-          npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
+      # - name: Update node-gyp
+      #   run: |
+      #     npm install --global [email protected]
+      #     npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
       - name: Install dependencies
         run: yarn install --frozen-lockfile --prefer-offline && yarn run rebuild-all-native
       - name: GQL Codegen
@@ -33,6 +33,7 @@ jobs:
       #   run: yarn run lint:ci
       - name: Build
         run: yarn run build
+
   MacOs:
     runs-on: macos-latest
     env:
@@ -41,12 +42,12 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
+          node-version: "18"
           cache: "yarn"
-      - name: Update node-gyp
-        run: |
-          npm install --global [email protected]
-          npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
+      # - name: Update node-gyp
+      #   run: |
+      #     npm install --global [email protected]
+      #     npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
       - name: Install dependencies
         run: yarn install --frozen-lockfile --prefer-offline && yarn run rebuild-all-native
       - name: GQL Codegen
@@ -66,14 +67,14 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: "14"
-          cache: "yarn"
-      - name: Update node-gyp
+          node-version: "18"
+      - name: Configure Node
+        shell: powershell
         run: |
-          npm install --global [email protected]
+          # npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
+          npm install -g npm@8  
+          npm install -g node-gyp@latest
           npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
-      - name: Update registry URL
-        run: |
           npm config set registry "http://registry.npmjs.org"
           yarn config set registry "http://registry.npmjs.org"
           yarn config set network-timeout 300000

.npmrc

@@ -1,5 +1,5 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 13.6.9
+target = 24.4.0
 arch = x64
 #arch = arm64

.nvmrc

@@ -1 +1 @@
-14.21.3
+18.14.0

app/about-window/Presenter.js

@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import PropTypes from 'prop-types';
 import React from 'react';
 import injectSheet from 'react-jss';

app/app-store/sagas.ts

@@ -1,4 +1,4 @@
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import * as isBlank from 'is-blank';
 import * as _ from 'lodash';
 import { SagaIterator } from 'redux-saga';

app/app-worker.ts

@@ -2,7 +2,8 @@
 process.worker = true;
 // tslint:disable:no-import-side-effect
 import './dotenv';
-import { ipcRenderer, remote } from 'electron';
+import { ipcRenderer } from 'electron';
+import * as remote from '@electron/remote';
 import { InMemoryCache, NormalizedCacheObject } from 'apollo-cache-inmemory';
 import ApolloClient from 'apollo-client';
 import { join } from 'path';

app/applications/Application.tsx

@@ -6,7 +6,8 @@ import * as slack from 'slack';
 import { GradientType, withGradient } from '@getstation/theme';
 import ElectronWebview from 'app/common/components/ElectronWebview';
 import classNames from 'classnames';
-import { clipboard, remote } from 'electron';
+import { clipboard } from 'electron';
+import * as remote from '@electron/remote';
 // @ts-ignore no declaration file
 import { fetchFavicon, setFetchFaviconTimeout } from '@getstation/fetch-favicon';
 import Maybe from 'graphql/tsutils/Maybe';
@@ -381,7 +382,7 @@ class ApplicationImpl extends React.PureComponent {
     if (this.webView && this.webView.view) {
       const webview = this.webView.view;
 
-      webview.addEventListener('did-attach', () => {
+      webview.addEventListener('dom-ready', () => {
         const webContents = remote.webContents.fromId(webview.getWebContentsId());
 
         webview.addEventListener('did-navigate-in-page', (e: any) => this.handleDidNavigateInPage(e));
@@ -395,6 +396,7 @@ class ApplicationImpl extends React.PureComponent {
   render() {
     const { notUseNativeWindowOpen, tab } = this.props;
     const tabUrl = tab.get('url', '');
+    const nodeIntegrationEnabled = tabUrl.startsWith('station://')
 
     const {
       applicationId, applicationName, applicationIcon, themeColor, manifestURL,
@@ -446,7 +448,7 @@ class ApplicationImpl extends React.PureComponent {
           hidden={this.props.hidden}
           className="l-webview__content"
           preload={preloadUrl}
-          allowpopups="true"
+          allowpopups={true}
           loading={this.props.loading}
           webviewRef={this.setWebviewRef}
           onPageTitleUpdated={this.handleTitleUpdated}
@@ -456,7 +458,7 @@ class ApplicationImpl extends React.PureComponent {
           onDidFailLoad={this.handleDidFailLoad}
           onDomReady={this.handleDomReady}
           onCrashed={this.handleWebcontentsCrashed}
-          webpreferences={`allowDisplayingInsecureContent,nativeWindowOpen=${notUseNativeWindowOpen ? 'no' : 'yes'},contextIsolation=no`}
+          webpreferences={`allowRunningInsecureContent=true,nativeWindowOpen=${notUseNativeWindowOpen},contextIsolation=false,nodeIntegration=${nodeIntegrationEnabled}`}
         />
 
       </div>

app/applications/components/ConfirmResetApplication.tsx

@@ -1,5 +1,5 @@
 import { Modal } from '@getstation/theme';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import * as React from 'react';
 // @ts-ignore: no declaration file
 import injectSheet from 'react-jss';

app/auto-update/components/AutoUpdateSubdock.tsx

@@ -1,5 +1,5 @@
 import { Button, ThemeTypes as Theme } from '@getstation/theme';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import * as React from 'react';
 // @ts-ignore: no declaration file
 import injectSheet from 'react-jss';

app/bang/search/providers.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { LocalStorage } from 'node-localstorage';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import * as moment from 'moment';
 import { reverse } from 'ramda';
 import { SDK, activity } from '@getstation/sdk';

app/bang/search/searchEngine.ts

@@ -1,63 +1,103 @@
-import { applyTo, compose, identity, negate, pipe, filter, sortBy, take } from 'ramda';
+import {
+  applyTo,
+  compose,
+  identity,
+  negate,
+  pipe,
+  filter,
+  sortBy,
+  take
+} from 'ramda';
 
 import { Transformer } from '../../utils/fp';
-import createComputeScore, { Loggers, getFrecencyEnv, getTotalScore } from './score';
+import createComputeScore, {
+  Loggers,
+  getFrecencyEnv,
+  getTotalScore
+} from './score';
 import { FrecencyWeightOptions } from './score/frecency';
-import { WEIGHT_CONTEXTUAL_FRECENCY_RECENT_SELECTIONS_MATCH, WEIGHT_GLOBAL_FRECENCY_RECENT_SELECTIONS_MATCH } from './score/config';
+import {
+  WEIGHT_CONTEXTUAL_FRECENCY_RECENT_SELECTIONS_MATCH,
+  WEIGHT_GLOBAL_FRECENCY_RECENT_SELECTIONS_MATCH
+} from './score/config';
 
 import {
   ScoredItem,
   SearchFunction,
   SaveGlobalSelectionFunction,
   SaveContextualSelectionFunction,
   SearchEngine,
-  SearchEngineEnv,
+  SearchEngineEnv
 } from './types';
 
 const defaultLoggers: Loggers = {
   fuseLogger: identity,
   contextualFrecencyLogger: identity,
-  globalFrecencyLogger: identity,
+  globalFrecencyLogger: identity
 };
 
 const contextualFrecencyOptions: FrecencyWeightOptions = {
-  recentSelectionsMatchWeight: WEIGHT_CONTEXTUAL_FRECENCY_RECENT_SELECTIONS_MATCH,
+  recentSelectionsMatchWeight: WEIGHT_CONTEXTUAL_FRECENCY_RECENT_SELECTIONS_MATCH
 };
 
 const globalFrecencyOptions: FrecencyWeightOptions = {
-  recentSelectionsMatchWeight: WEIGHT_GLOBAL_FRECENCY_RECENT_SELECTIONS_MATCH,
+  recentSelectionsMatchWeight: WEIGHT_GLOBAL_FRECENCY_RECENT_SELECTIONS_MATCH
 };
 
-const hasPositiveScore = (scoredItem: ScoredItem) => getTotalScore(scoredItem) > 0;
+const hasPositiveScore = (scoredItem: ScoredItem) =>
+  getTotalScore(scoredItem) > 0;
 
 /**
  * This function create a SearchEngine, it needs a contextual FrecencyStorageProvider
  * and a global FrecencyStorageProvider in order to work.
  *
  * expose a search function and 2 methods to save selections (global or contextual)
  */
-export const createSearchEngine = (searchEngineEnv: SearchEngineEnv, loggers: Loggers = defaultLoggers): SearchEngine => {
-  const contextual = getFrecencyEnv(searchEngineEnv.contextualFrecencyStorageProvider, contextualFrecencyOptions);
-  const global = getFrecencyEnv(searchEngineEnv.globalFrecencyStorageProvider, globalFrecencyOptions);
+export const createSearchEngine = (
+  searchEngineEnv: SearchEngineEnv,
+  loggers: Loggers = defaultLoggers
+): SearchEngine => {
+  const contextual = getFrecencyEnv(
+    searchEngineEnv.contextualFrecencyStorageProvider,
+    contextualFrecencyOptions
+  );
+  const global = getFrecencyEnv(
+    searchEngineEnv.globalFrecencyStorageProvider,
+    globalFrecencyOptions
+  );
 
   const computeScore = createComputeScore({ contextual, global }, loggers);
 
   const searchFn: SearchFunction = (items, context, limit) => {
     const scoredItems: ScoredItem[] = computeScore(items, context);
 
-    return applyTo(scoredItems)(pipe(
-      sortBy(compose(negate, getTotalScore)), // negate scores in order to make a descending sort
-      filter(hasPositiveScore) as Transformer<ScoredItem[]>,
-      take(limit) as Transformer<ScoredItem[]>,
-    ));
+    return applyTo(scoredItems)(
+      pipe(
+        sortBy(
+          compose(
+            negate,
+            getTotalScore
+          )
+        ), // negate scores in order to make a descending sort
+        filter(hasPositiveScore) as Transformer<ScoredItem[]>,
+        take(limit) as Transformer<ScoredItem[]>
+      )
+    );
   };
 
-  const saveContextualSelection: SaveContextualSelectionFunction = (saveParams) => {
+  const saveContextualSelection: SaveContextualSelectionFunction = saveParams => {
     return contextual.frecencyEngine.save(saveParams);
   };
 
-  const saveGlobalSelection: SaveGlobalSelectionFunction = (selectedId, dateSelection) => {
-    return global.frecencyEngine.save({ searchQuery: '', selectedId, dateSelection });
+  const saveGlobalSelection: SaveGlobalSelectionFunction = (
+    selectedId,
+    dateSelection
+  ) => {
+    return global.frecencyEngine.save({
+      searchQuery: '',
+      selectedId,
+      dateSelection
+    });
   };
 
   return { search: searchFn, saveContextualSelection, saveGlobalSelection };

app/cli.ts

@@ -1,4 +1,5 @@
-import { ipcRenderer, remote } from 'electron';
+import { ipcRenderer } from 'electron';
+import * as remote from '@electron/remote';
 
 const exit = () => remote.app.exit(0);
 

app/common/components/ElectronWebview.tsx

@@ -8,7 +8,7 @@ import * as ReactDOM from 'react-dom';
 import { logger } from '../../api/logger';
 import { Omit } from '../../types';
 import { dissoc } from 'ramda';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 
 export interface ElectronWebviewProps extends Omit<Electron.WebviewTag, 'src'> {
   // webview `src` is updated by the webview itself, so we do not want to
@@ -265,7 +265,6 @@ class ElectronWebview extends React.Component<ElectronWebviewProps, {}> {
 
     this.view.addEventListener('did-attach', (...attachArgs: any[]) => {
       this.ready = true;
-      this.forwardKeyboardEvents();
       events.forEach((event) => {
         const propName = camelCase(`on-${event}`);
         if (this.props[propName]) {
@@ -276,6 +275,7 @@ class ElectronWebview extends React.Component<ElectronWebviewProps, {}> {
     });
 
     this.view.addEventListener('dom-ready', () => {
+      this.forwardKeyboardEvents();
       // Remove this once https://github.com/electron/electron/issues/14474 is fixed
       this.view.blur();
       this.view.focus();

app/containers/AppSub.js

@@ -1,6 +1,6 @@
 import { GradientType, withGradient } from '@getstation/theme';
 import classNames from 'classnames';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import PropTypes from 'prop-types';
 import React from 'react';
 import injectSheet from 'react-jss';