Skip to content

Commit e2724a6

Browse files
authored
Merge branch 'master' into refactor-modals-select-sandbox-modal
2 parents f9d1ac2 + 729d375 commit e2724a6

File tree

59 files changed

+1046
-948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1046
-948
lines changed

.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"js": "never"
6262
}
6363
],
64+
"import/default": "error",
6465
"no-param-reassign": ["error", { "props": false }],
6566
"camelcase": 0,
6667
"react-hooks/rules-of-hooks": "error",

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ Thanks goes to these wonderful people
232232
<td align="center"><a href="https://github.com/chinmay17"><img src="https://avatars2.githubusercontent.com/u/7131231?v=4" width="100px;" alt="Chinmay Chaudhary"/><br /><sub><b>Chinmay Chaudhary</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=chinmay17" title="Code">💻</a></td>
233233
<td align="center"><a href="https://github.com/Sakthivel"><img src="https://avatars3.githubusercontent.com/u/205201?v=4" width="100px;" alt="Sakthivel Sengodan Sapient"/><br /><sub><b>Sakthivel Sengodan Sapient</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=sakthivel" title="Code">💻</a></td>
234234
<td align="center"><a href="https://github.com/vanya829"><img src="https://avatars0.githubusercontent.com/u/1397979?v=4" width="100px;" alt="vanya829"/><br /><sub><b>vanya829</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=vanya829" title="Code">💻</a></td>
235+
<td align="center"><a href="https://github.com/lakhansamani"><img src="https://avatars3.githubusercontent.com/u/6964334?s=460&v=4" width="100px;" alt="lakhansamani"/><br /><sub><b>Lakhan Samani</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=lakhansamani" title="Code">💻</a></td>
235236
</tr>
236237
<tr>
237238
<td align="center"><a href="http://hetpatel33.github.io"><img src="https://avatars0.githubusercontent.com/u/13877514?v=4" width="100px;" alt="Het Patel"/><br /><sub><b>Het Patel</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=hetpatel33" title="Code">💻</a></td>
-15.4 MB
Binary file not shown.

packages/app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
"@types/prop-types": "^15.7.0",
238238
"@types/react": "^16.8.12",
239239
"@types/react-dom": "^16.8.3",
240+
"@types/react-helmet": "^5.0.11",
240241
"@types/react-icons": "2.2.7",
241242
"@types/react-stripe-elements": "^1.3.2",
242243
"@types/resolve": "^0.0.8",

packages/app/src/app/components/CodeEditor/Monaco/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import { getTextOperation } from '@codesandbox/common/lib/utils/diff';
1818

1919
import delay from '@codesandbox/common/lib/utils/delay';
2020

21-
/* eslint-disable import/no-webpack-loader-syntax */
21+
/* eslint-disable import/no-webpack-loader-syntax, import/default */
2222
import LinterWorker from 'worker-loader?publicPath=/&name=monaco-linter.[hash:8].worker.js!./workers/linter';
2323
import TypingsFetcherWorker from 'worker-loader?publicPath=/&name=monaco-typings-ata.[hash:8].worker.js!./workers/fetch-dependency-typings';
24-
/* eslint-enable import/no-webpack-loader-syntax */
24+
/* eslint-enable import/no-webpack-loader-syntax, import/default */
2525

2626
import eventToTransform from './event-to-transform';
2727
import MonacoEditorComponent from './MonacoReactComponent';

packages/app/src/app/components/CodeEditor/VSCode/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import {
2323
} from '@codesandbox/common/lib/types';
2424
import { getTextOperation } from '@codesandbox/common/lib/utils/diff';
2525

26-
/* eslint-disable import/no-webpack-loader-syntax */
26+
/* eslint-disable import/no-webpack-loader-syntax, import/default */
2727
// @ts-ignore
2828
import LinterWorker from 'worker-loader?publicPath=/&name=monaco-linter.[hash:8].worker.js!../Monaco/workers/linter';
29-
/* eslint-enable import/no-webpack-loader-syntax */
29+
/* eslint-enable import/no-webpack-loader-syntax, import/default */
3030
import { clone } from 'app/componentConnectors';
3131
import eventToTransform from '../Monaco/event-to-transform';
3232
import MonacoEditorComponent, { EditorAPI } from './MonacoReactComponent';

packages/app/src/app/components/CodeEditor/index.tsx

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
import React from 'react';
2-
import UIIcon from 'react-icons/lib/md/dvr';
3-
import QuestionIcon from 'react-icons/lib/go/question';
4-
import getUI from '@codesandbox/common/lib/templates/configuration/ui';
51
import Centered from '@codesandbox/common/lib/components/flex/Centered';
62
import Margin from '@codesandbox/common/lib/components/spacing/Margin';
7-
import isImage from '@codesandbox/common/lib/utils/is-image';
3+
import Tooltip from '@codesandbox/common/lib/components/Tooltip';
4+
import { getModulePath } from '@codesandbox/common/lib/sandbox/modules';
85
import getDefinition from '@codesandbox/common/lib/templates';
6+
import getUI from '@codesandbox/common/lib/templates/configuration/ui';
97
import { Sandbox } from '@codesandbox/common/lib/types';
10-
import { getModulePath } from '@codesandbox/common/lib/sandbox/modules';
11-
import Tooltip from '@codesandbox/common/lib/components/Tooltip';
12-
import { Title } from 'app/components/Title';
8+
import isImage from '@codesandbox/common/lib/utils/is-image';
139
import { SubTitle } from 'app/components/SubTitle';
10+
import { Title } from 'app/components/Title';
1411
import Loadable from 'app/utils/Loadable';
15-
import { ImageViewer } from './ImageViewer';
12+
import React from 'react';
13+
import QuestionIcon from 'react-icons/lib/go/question';
14+
import UIIcon from 'react-icons/lib/md/dvr';
15+
1616
import { Configuration } from './Configuration';
17-
import { VSCode } from './VSCode';
17+
import { Icon, Icons } from './elements';
18+
import { ImageViewer } from './ImageViewer';
1819
import MonacoDiff from './MonacoDiff';
1920
import { Props } from './types'; // eslint-disable-line
20-
import { Icons, Icon } from './elements';
21+
import { VSCode } from './VSCode';
2122

2223
const CodeMirror = Loadable(() =>
2324
import(/* webpackChunkName: 'codemirror-editor' */ './CodeMirror')
@@ -164,11 +165,13 @@ export class CodeEditor extends React.PureComponent<
164165
);
165166
}
166167

167-
let Editor: React.ComponentClass<Props> =
168-
settings.codeMirror && !props.isLive ? CodeMirror : Monaco;
168+
let Editor =
169+
settings.codeMirror && !props.isLive
170+
? ((CodeMirror as unknown) as React.ComponentClass<Props>)
171+
: ((Monaco as unknown) as React.ComponentClass<Props>);
169172

170173
if (settings.experimentVSCode) {
171-
Editor = VSCode;
174+
Editor = VSCode as React.ComponentClass<Props>;
172175
}
173176

174177
return (

packages/app/src/app/components/ConfirmLink.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
44
interface IConfirmLinkProps {
55
enabled: boolean;
66
message: string;
7+
to: string;
78
}
89

910
export const ConfirmLink: React.FC<IConfirmLinkProps> = ({

packages/app/src/app/components/ContextMenu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface ItemType {
1515
action: () => boolean | void;
1616
}
1717

18-
type Item = ItemType | ItemType[];
18+
export type Item = ItemType | ItemType[];
1919

2020
type ChildrenProps =
2121
| {

packages/app/src/app/index.d.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
declare global {
2+
interface Window {
3+
__isTouch: boolean;
4+
}
5+
}
6+
7+
export {};

0 commit comments

Comments
 (0)