Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(manager/electron): [WIP] adds esModuleInterop to fix app not fully loading #1450

Closed
wants to merge 2 commits into from
Closed

fix(manager/electron): [WIP] adds esModuleInterop to fix app not fully loading #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e88e396
progress: the app loads, but there are no messages
daniellacosse Nov 15, 2023
688e6a0
okay, can turn this back on
daniellacosse Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/server_manager/electron_app/digitalocean_oauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@

import * as crypto from 'crypto';
import * as electron from 'electron';
import * as express from 'express';
import express from 'express';
import * as http from 'http';
import {AddressInfo} from 'net';
import * as request from 'request';
import request from 'request';

const REGISTERED_REDIRECTS: Array<{clientId: string; port: number}> = [
{clientId: '7f84935771d49c2331e1cfb60c7827e20eaf128103435d82ad20b3c53253b721', port: 55189},
{clientId: '4af51205e8d0d8f4a5b84a6b5ca9ea7124f914a5621b6a731ce433c2c7db533b', port: 60434},
{clientId: '706928a1c91cbd646c4e0d744c8cbdfbf555a944b821ac7812a7314a4649683a', port: 61437},
];

const CALLBACK_SERVER_CLOSE_TIMEOUT = 30000; // 30 seconds
const CALLBACK_SERVER_CLOSE_TIMEOUT = 30000; // 30 seconds

function randomValueHex(len: number): string {
return crypto
Expand Down
2 changes: 1 addition & 1 deletion src/server_manager/electron_app/gcp_oauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

import * as electron from 'electron';
import * as express from 'express';
import express from 'express';
import {OAuth2Client} from 'google-auth-library';
import {AddressInfo} from 'net';

Expand Down
2 changes: 2 additions & 0 deletions src/server_manager/electron_app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"target": "es2021",
"removeComments": false,
"noImplicitAny": true,
"esModuleInterop": true,
"module": "commonjs",
"rootDir": "..",
"lib": ["dom", "es2021"]
Expand Down
2 changes: 1 addition & 1 deletion src/server_manager/web_app/management_urls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as jsonic from 'jsonic';
import jsonic from 'jsonic';

import {ManualServerConfig} from '../model/server';

Expand Down
2 changes: 2 additions & 0 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"target": "es2015",
"removeComments": false,
"noImplicitAny": true,
Expand Down
Loading