Skip to content

Commit f96b36f

Browse files
authored
Revert "Revert "fix: ESLint typescript Template Literal Types (#6672)" (#6685)"
This reverts commit 68dcbf0.
1 parent 68dcbf0 commit f96b36f

File tree

17 files changed

+23
-17
lines changed

17 files changed

+23
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"overmind-devtools": "^26.0.2",
107107
"prettier": "2.1.1",
108108
"pretty-quick": "^3.0.0",
109-
"typescript": "4.0.3",
109+
"typescript": "4.1.2",
110110
"username": "^5.1.0"
111111
},
112112
"resolutions": {

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
"terser": "^4.1.4",
360360
"terser-webpack-plugin": "^1.4.1",
361361
"thread-loader": "^2.1.2",
362-
"typescript": "4.0.3",
362+
"typescript": "4.1.2",
363363
"url-loader": "1.0.1",
364364
"webpack": "^4.36.1",
365365
"webpack-bundle-analyzer": "^2.13.1",

packages/app/src/app/overmind/effects/live/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,8 @@ class Live {
363363
} else {
364364
// we might try to send messages even when not on live, just
365365
// ignore it
366-
resolve();
366+
// @ts-ignore this is probably not safe but whatever
367+
resolve(undefined);
367368
}
368369
});
369370
}

packages/app/src/app/overmind/effects/vscode/Linter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import LinterWorker from 'worker-loader?publicPath=/&name=monaco-linter.[hash:8]
77
import { getCurrentModelPath } from './utils';
88

99
const requireAMDModule = paths =>
10-
new Promise(resolve => (window as any).require(paths, () => resolve()));
10+
new Promise<void>(resolve => (window as any).require(paths, () => resolve()));
1111

1212
export class Linter {
1313
private worker: LinterWorker;

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export async function initializeBrowserFS({
6767
};
6868
} = {};
6969

70-
return new Promise(resolve => {
70+
return new Promise<void>(resolve => {
7171
const config = { ...BROWSER_FS_CONFIG };
7272
let currentSandboxFs = {};
7373

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const initializeGlobals = () => {
4040

4141
export function initializeAll() {
4242
// eslint-disable-next-line no-async-promise-executor
43-
return new Promise(async resolve => {
43+
return new Promise<void>(async resolve => {
4444
await initializePolyfills();
4545
loadBrowserFS();
4646
initializeGlobals();

packages/app/src/app/pages/Dashboard/Components/Folder/CreateFolder.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const CreateFolder = ({ basePath, setCreating }: DashboardNewFolder) => {
5858
};
5959

6060
const folderProps = {
61-
name,
61+
name: '',
6262
path: basePath,
6363
isDrafts: false,
6464
numberOfSandboxes: 0,

packages/app/src/embed/components/Content/Monaco/mode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const requireAMDModule = paths =>
2-
new Promise(resolve => (window as any).require(paths, () => resolve()));
2+
new Promise<void>(resolve => (window as any).require(paths, () => resolve()));
33

44
export default async (title: string, monaco) => {
55
if (title == null) return 'javascript';

packages/app/src/sandbox/codesandbox-overlay/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default function createOverlay(modules) {
1414

1515
const parameters = getParameters({ files: normalized });
1616

17-
return new Promise(resolve => {
17+
return new Promise<void>(resolve => {
1818
const iframe = document.createElement('iframe');
1919

2020
iframe.setAttribute(

packages/app/src/sandbox/eval/tests/jest-lite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ expect.extend({
4040
expect.addSnapshotSerializer = addSerializer;
4141

4242
function addScript(src: string) {
43-
return new Promise((resolve, reject) => {
43+
return new Promise<void>((resolve, reject) => {
4444
const s = document.createElement('script');
4545
s.setAttribute('src', src);
4646
document.body.appendChild(s);

0 commit comments

Comments
 (0)