From f96b36ffd7cacb9b5f4ca917bcd13b07e286e68b Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Thu, 12 May 2022 10:33:49 +0200 Subject: [PATCH 1/3] Revert "Revert "fix: ESLint typescript Template Literal Types (#6672)" (#6685)" This reverts commit 68dcbf0a1128ce1ea918510968915fd1124b5a5b. --- package.json | 2 +- packages/app/package.json | 2 +- packages/app/src/app/overmind/effects/live/index.ts | 3 ++- packages/app/src/app/overmind/effects/vscode/Linter.ts | 2 +- .../effects/vscode/extensionHostWorker/common/fs.ts | 2 +- .../effects/vscode/extensionHostWorker/common/global.ts | 2 +- .../app/pages/Dashboard/Components/Folder/CreateFolder.tsx | 2 +- packages/app/src/embed/components/Content/Monaco/mode.ts | 2 +- packages/app/src/sandbox/codesandbox-overlay/index.ts | 2 +- packages/app/src/sandbox/eval/tests/jest-lite.ts | 2 +- packages/codesandbox-api/package.json | 2 +- packages/common/package.json | 2 +- packages/components/package.json | 2 +- packages/executors/package.json | 2 +- packages/node-services/package.json | 2 +- packages/react-embed/package.json | 2 +- yarn.lock | 7 ++++++- 17 files changed, 23 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 29a6c6ded96..f1ab115c245 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "overmind-devtools": "^26.0.2", "prettier": "2.1.1", "pretty-quick": "^3.0.0", - "typescript": "4.0.3", + "typescript": "4.1.2", "username": "^5.1.0" }, "resolutions": { diff --git a/packages/app/package.json b/packages/app/package.json index b8f6b768cba..bd58f67839c 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -359,7 +359,7 @@ "terser": "^4.1.4", "terser-webpack-plugin": "^1.4.1", "thread-loader": "^2.1.2", - "typescript": "4.0.3", + "typescript": "4.1.2", "url-loader": "1.0.1", "webpack": "^4.36.1", "webpack-bundle-analyzer": "^2.13.1", diff --git a/packages/app/src/app/overmind/effects/live/index.ts b/packages/app/src/app/overmind/effects/live/index.ts index feee62d5e5a..f6803e8e43b 100755 --- a/packages/app/src/app/overmind/effects/live/index.ts +++ b/packages/app/src/app/overmind/effects/live/index.ts @@ -363,7 +363,8 @@ class Live { } else { // we might try to send messages even when not on live, just // ignore it - resolve(); + // @ts-ignore this is probably not safe but whatever + resolve(undefined); } }); } diff --git a/packages/app/src/app/overmind/effects/vscode/Linter.ts b/packages/app/src/app/overmind/effects/vscode/Linter.ts index 48100d794d8..2b4fdfd8205 100644 --- a/packages/app/src/app/overmind/effects/vscode/Linter.ts +++ b/packages/app/src/app/overmind/effects/vscode/Linter.ts @@ -7,7 +7,7 @@ import LinterWorker from 'worker-loader?publicPath=/&name=monaco-linter.[hash:8] import { getCurrentModelPath } from './utils'; const requireAMDModule = paths => - new Promise(resolve => (window as any).require(paths, () => resolve())); + new Promise(resolve => (window as any).require(paths, () => resolve())); export class Linter { private worker: LinterWorker; diff --git a/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts b/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts index dc83d0d4428..d64689154b0 100644 --- a/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts +++ b/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts @@ -67,7 +67,7 @@ export async function initializeBrowserFS({ }; } = {}; - return new Promise(resolve => { + return new Promise(resolve => { const config = { ...BROWSER_FS_CONFIG }; let currentSandboxFs = {}; diff --git a/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts b/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts index 0677a79e515..a63ff58e378 100644 --- a/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts +++ b/packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/global.ts @@ -40,7 +40,7 @@ export const initializeGlobals = () => { export function initializeAll() { // eslint-disable-next-line no-async-promise-executor - return new Promise(async resolve => { + return new Promise(async resolve => { await initializePolyfills(); loadBrowserFS(); initializeGlobals(); diff --git a/packages/app/src/app/pages/Dashboard/Components/Folder/CreateFolder.tsx b/packages/app/src/app/pages/Dashboard/Components/Folder/CreateFolder.tsx index c84bf24548c..dd45a9e1972 100644 --- a/packages/app/src/app/pages/Dashboard/Components/Folder/CreateFolder.tsx +++ b/packages/app/src/app/pages/Dashboard/Components/Folder/CreateFolder.tsx @@ -58,7 +58,7 @@ export const CreateFolder = ({ basePath, setCreating }: DashboardNewFolder) => { }; const folderProps = { - name, + name: '', path: basePath, isDrafts: false, numberOfSandboxes: 0, diff --git a/packages/app/src/embed/components/Content/Monaco/mode.ts b/packages/app/src/embed/components/Content/Monaco/mode.ts index c00921031fc..da51c9cc601 100644 --- a/packages/app/src/embed/components/Content/Monaco/mode.ts +++ b/packages/app/src/embed/components/Content/Monaco/mode.ts @@ -1,5 +1,5 @@ const requireAMDModule = paths => - new Promise(resolve => (window as any).require(paths, () => resolve())); + new Promise(resolve => (window as any).require(paths, () => resolve())); export default async (title: string, monaco) => { if (title == null) return 'javascript'; diff --git a/packages/app/src/sandbox/codesandbox-overlay/index.ts b/packages/app/src/sandbox/codesandbox-overlay/index.ts index 830ed955112..c9383090276 100644 --- a/packages/app/src/sandbox/codesandbox-overlay/index.ts +++ b/packages/app/src/sandbox/codesandbox-overlay/index.ts @@ -14,7 +14,7 @@ export default function createOverlay(modules) { const parameters = getParameters({ files: normalized }); - return new Promise(resolve => { + return new Promise(resolve => { const iframe = document.createElement('iframe'); iframe.setAttribute( diff --git a/packages/app/src/sandbox/eval/tests/jest-lite.ts b/packages/app/src/sandbox/eval/tests/jest-lite.ts index 132a93c10f7..cc485568bd6 100644 --- a/packages/app/src/sandbox/eval/tests/jest-lite.ts +++ b/packages/app/src/sandbox/eval/tests/jest-lite.ts @@ -40,7 +40,7 @@ expect.extend({ expect.addSnapshotSerializer = addSerializer; function addScript(src: string) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { const s = document.createElement('script'); s.setAttribute('src', src); document.body.appendChild(s); diff --git a/packages/codesandbox-api/package.json b/packages/codesandbox-api/package.json index b7bc2ca5df7..db947444504 100644 --- a/packages/codesandbox-api/package.json +++ b/packages/codesandbox-api/package.json @@ -95,7 +95,7 @@ "tslint-config-prettier": "^1.1.0", "tslint-config-standard": "^6.0.0", "typedoc": "^0.7.1", - "typescript": "4.0.3", + "typescript": "4.1.2", "uuid": "^3.3.2", "validate-commit-msg": "^2.12.2" }, diff --git a/packages/common/package.json b/packages/common/package.json index ce7d15d52c4..77612875514 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -116,7 +116,7 @@ "jest-styled-components": "^7.0.2", "jest-svg-transformer": "^1.0.0", "rimraf": "^2.6.3", - "typescript": "4.0.3", + "typescript": "4.1.2", "yarn": "^1.17.3" } } diff --git a/packages/components/package.json b/packages/components/package.json index 16b9049bc2f..8833184f316 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -73,7 +73,7 @@ "rimraf": "^3.0.0", "simple-git": "^2.17.0", "storybook-addon-styled-component-theme": "^1.3.0", - "typescript": "4.0.3" + "typescript": "4.1.2" }, "peerDependencies": { "react": "^16.9.0", diff --git a/packages/executors/package.json b/packages/executors/package.json index 37cc18e570a..8e6e605a85c 100644 --- a/packages/executors/package.json +++ b/packages/executors/package.json @@ -30,6 +30,6 @@ "@types/socket.io-client": "^1.4.32", "tsdx": "^0.6.1", "tslib": "^1.9.3", - "typescript": "4.0.3" + "typescript": "4.1.2" } } diff --git a/packages/node-services/package.json b/packages/node-services/package.json index f8b43b0d881..6b945fa16da 100644 --- a/packages/node-services/package.json +++ b/packages/node-services/package.json @@ -27,6 +27,6 @@ "@types/node": "^11.10.5", "@types/resolve": "^0.0.8", "@types/ws": "^6.0.1", - "typescript": "4.0.3" + "typescript": "4.1.2" } } diff --git a/packages/react-embed/package.json b/packages/react-embed/package.json index 0828b775f86..253fe0a142c 100644 --- a/packages/react-embed/package.json +++ b/packages/react-embed/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@types/react": "^16.9.17", "rimraf": "^2.6.2", - "typescript": "4.0.3" + "typescript": "4.1.2" }, "peerDependencies": { "react": "^15.0.0 | ^16.0.0" diff --git a/yarn.lock b/yarn.lock index 7706dcc9d91..af26b0cf0d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32759,7 +32759,7 @@ typescript-template-language-service-decorator@^1.2.0: resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-1.7.1.tgz#60f825b6b2bab725c9a73eaff65cb598e81a1bc8" integrity sha512-Gk0WBNe73T87lpiSj37Xmwzvt5zkKaHT1chY5+v2KP4uhpHktqIcV1hMpxmzAong38EIEhGZWeKtxjxGmTMbqg== -typescript@*, typescript@4.0.3, typescript@^4.0.3: +typescript@*, typescript@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== @@ -32769,6 +32769,11 @@ typescript@2.3.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42" integrity sha1-PTgyGCgjHkNPKHUUlZw3qCtin0I= +typescript@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" + integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== + typescript@^3.4.5: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" From b383241e5eb681fd0a374ec7f662d37f114eb4ee Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Thu, 12 May 2022 11:19:38 +0200 Subject: [PATCH 2/3] revert some ts updates --- package.json | 2 +- packages/codesandbox-api/package.json | 2 +- packages/common/package.json | 2 +- packages/components/package.json | 2 +- packages/executors/package.json | 2 +- packages/node-services/package.json | 2 +- packages/react-embed/package.json | 2 +- yarn.lock | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index f1ab115c245..29a6c6ded96 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "overmind-devtools": "^26.0.2", "prettier": "2.1.1", "pretty-quick": "^3.0.0", - "typescript": "4.1.2", + "typescript": "4.0.3", "username": "^5.1.0" }, "resolutions": { diff --git a/packages/codesandbox-api/package.json b/packages/codesandbox-api/package.json index db947444504..b7bc2ca5df7 100644 --- a/packages/codesandbox-api/package.json +++ b/packages/codesandbox-api/package.json @@ -95,7 +95,7 @@ "tslint-config-prettier": "^1.1.0", "tslint-config-standard": "^6.0.0", "typedoc": "^0.7.1", - "typescript": "4.1.2", + "typescript": "4.0.3", "uuid": "^3.3.2", "validate-commit-msg": "^2.12.2" }, diff --git a/packages/common/package.json b/packages/common/package.json index 77612875514..ce7d15d52c4 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -116,7 +116,7 @@ "jest-styled-components": "^7.0.2", "jest-svg-transformer": "^1.0.0", "rimraf": "^2.6.3", - "typescript": "4.1.2", + "typescript": "4.0.3", "yarn": "^1.17.3" } } diff --git a/packages/components/package.json b/packages/components/package.json index 8833184f316..16b9049bc2f 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -73,7 +73,7 @@ "rimraf": "^3.0.0", "simple-git": "^2.17.0", "storybook-addon-styled-component-theme": "^1.3.0", - "typescript": "4.1.2" + "typescript": "4.0.3" }, "peerDependencies": { "react": "^16.9.0", diff --git a/packages/executors/package.json b/packages/executors/package.json index 8e6e605a85c..37cc18e570a 100644 --- a/packages/executors/package.json +++ b/packages/executors/package.json @@ -30,6 +30,6 @@ "@types/socket.io-client": "^1.4.32", "tsdx": "^0.6.1", "tslib": "^1.9.3", - "typescript": "4.1.2" + "typescript": "4.0.3" } } diff --git a/packages/node-services/package.json b/packages/node-services/package.json index 6b945fa16da..f8b43b0d881 100644 --- a/packages/node-services/package.json +++ b/packages/node-services/package.json @@ -27,6 +27,6 @@ "@types/node": "^11.10.5", "@types/resolve": "^0.0.8", "@types/ws": "^6.0.1", - "typescript": "4.1.2" + "typescript": "4.0.3" } } diff --git a/packages/react-embed/package.json b/packages/react-embed/package.json index 253fe0a142c..0828b775f86 100644 --- a/packages/react-embed/package.json +++ b/packages/react-embed/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@types/react": "^16.9.17", "rimraf": "^2.6.2", - "typescript": "4.1.2" + "typescript": "4.0.3" }, "peerDependencies": { "react": "^15.0.0 | ^16.0.0" diff --git a/yarn.lock b/yarn.lock index af26b0cf0d0..0d8f69112ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32759,7 +32759,7 @@ typescript-template-language-service-decorator@^1.2.0: resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-1.7.1.tgz#60f825b6b2bab725c9a73eaff65cb598e81a1bc8" integrity sha512-Gk0WBNe73T87lpiSj37Xmwzvt5zkKaHT1chY5+v2KP4uhpHktqIcV1hMpxmzAong38EIEhGZWeKtxjxGmTMbqg== -typescript@*, typescript@^4.0.3: +typescript@*, typescript@4.0.3, typescript@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== From 2e50e6691ae1bc9a9c61f085d8345a613cc5476f Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Thu, 12 May 2022 20:37:33 +0200 Subject: [PATCH 3/3] Revert "revert some ts updates" This reverts commit b383241e5eb681fd0a374ec7f662d37f114eb4ee. --- package.json | 2 +- packages/codesandbox-api/package.json | 2 +- packages/common/package.json | 2 +- packages/components/package.json | 2 +- packages/executors/package.json | 2 +- packages/node-services/package.json | 2 +- packages/react-embed/package.json | 2 +- yarn.lock | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 29a6c6ded96..f1ab115c245 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "overmind-devtools": "^26.0.2", "prettier": "2.1.1", "pretty-quick": "^3.0.0", - "typescript": "4.0.3", + "typescript": "4.1.2", "username": "^5.1.0" }, "resolutions": { diff --git a/packages/codesandbox-api/package.json b/packages/codesandbox-api/package.json index b7bc2ca5df7..db947444504 100644 --- a/packages/codesandbox-api/package.json +++ b/packages/codesandbox-api/package.json @@ -95,7 +95,7 @@ "tslint-config-prettier": "^1.1.0", "tslint-config-standard": "^6.0.0", "typedoc": "^0.7.1", - "typescript": "4.0.3", + "typescript": "4.1.2", "uuid": "^3.3.2", "validate-commit-msg": "^2.12.2" }, diff --git a/packages/common/package.json b/packages/common/package.json index ce7d15d52c4..77612875514 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -116,7 +116,7 @@ "jest-styled-components": "^7.0.2", "jest-svg-transformer": "^1.0.0", "rimraf": "^2.6.3", - "typescript": "4.0.3", + "typescript": "4.1.2", "yarn": "^1.17.3" } } diff --git a/packages/components/package.json b/packages/components/package.json index 16b9049bc2f..8833184f316 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -73,7 +73,7 @@ "rimraf": "^3.0.0", "simple-git": "^2.17.0", "storybook-addon-styled-component-theme": "^1.3.0", - "typescript": "4.0.3" + "typescript": "4.1.2" }, "peerDependencies": { "react": "^16.9.0", diff --git a/packages/executors/package.json b/packages/executors/package.json index 37cc18e570a..8e6e605a85c 100644 --- a/packages/executors/package.json +++ b/packages/executors/package.json @@ -30,6 +30,6 @@ "@types/socket.io-client": "^1.4.32", "tsdx": "^0.6.1", "tslib": "^1.9.3", - "typescript": "4.0.3" + "typescript": "4.1.2" } } diff --git a/packages/node-services/package.json b/packages/node-services/package.json index f8b43b0d881..6b945fa16da 100644 --- a/packages/node-services/package.json +++ b/packages/node-services/package.json @@ -27,6 +27,6 @@ "@types/node": "^11.10.5", "@types/resolve": "^0.0.8", "@types/ws": "^6.0.1", - "typescript": "4.0.3" + "typescript": "4.1.2" } } diff --git a/packages/react-embed/package.json b/packages/react-embed/package.json index 0828b775f86..253fe0a142c 100644 --- a/packages/react-embed/package.json +++ b/packages/react-embed/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@types/react": "^16.9.17", "rimraf": "^2.6.2", - "typescript": "4.0.3" + "typescript": "4.1.2" }, "peerDependencies": { "react": "^15.0.0 | ^16.0.0" diff --git a/yarn.lock b/yarn.lock index 0d8f69112ef..af26b0cf0d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32759,7 +32759,7 @@ typescript-template-language-service-decorator@^1.2.0: resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-1.7.1.tgz#60f825b6b2bab725c9a73eaff65cb598e81a1bc8" integrity sha512-Gk0WBNe73T87lpiSj37Xmwzvt5zkKaHT1chY5+v2KP4uhpHktqIcV1hMpxmzAong38EIEhGZWeKtxjxGmTMbqg== -typescript@*, typescript@4.0.3, typescript@^4.0.3: +typescript@*, typescript@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==