Skip to content

Commit 98350ec

Browse files
authored
Merge pull request #1 from codesandbox/master
Up to date
2 parents 4be4a4c + 43c77d2 commit 98350ec

File tree

84 files changed

+10717
-1003
lines changed

Some content is hidden

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

84 files changed

+10717
-1003
lines changed

packages/app/integration-tests/tests/sandboxes.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const SANDBOXES = [
1818
'lp5rjr0z4z',
1919
'nOymMxyY',
2020
'y26rj99yov', // react transition
21-
'6w66jzw3mn', // material-design & preact
21+
// '6w66jzw3mn', // material-design & preact
2222
'4j7m47vlm4', // material-ui
2323
'cssinjs-egghead-templates-and-variables', // postcss egghead
2424
'xp5qy8r93q', // babel example

packages/app/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"lint:sandbox": "cross-env LINT=1 eslint --ext .js,.ts,.tsx src/sandbox",
2828
"start": "cross-env LOCAL_SERVER=1 LOCAL_DEV=1 NODE_OPTIONS=\"--max-old-space-size=4096\" node scripts/start.js",
2929
"start:dev_api": "node scripts/start.js",
30+
"start:app": "cross-env APP_ONLY=true LOCAL_SERVER=1 node scripts/start.js",
3031
"start:sandbox": "cross-env SANDBOX_ONLY=true LOCAL_SERVER=1 node scripts/start.js",
3132
"start:sandpack-sandbox": "cross-env SANDPACK=true LOCAL_SERVER=1 SANDBOX_ONLY=true node scripts/start.js",
3233
"start:test": "cross-env LOCAL_SERVER=1 SANDBOX_ONLY=true node scripts/start.js",
@@ -166,9 +167,9 @@
166167
"normalizr": "^3.2.3",
167168
"onigasm": "^2.2.1",
168169
"ot": "^0.0.15",
169-
"overmind": "^24.0.0-1591450008009",
170-
"overmind-graphql": "^4.0.0-1591450008009",
171-
"overmind-react": "^25.0.0-1591450008009",
170+
"overmind": "^25.0.2-1597735445050",
171+
"overmind-graphql": "^5.0.2-1597735445050",
172+
"overmind-react": "^26.0.2-1597735445050",
172173
"phoenix": "^1.5.3",
173174
"postcss": "^7.0.26",
174175
"postcss-selector-parser": "^2.2.3",
@@ -309,6 +310,7 @@
309310
"fs-extra": "^8.0.1",
310311
"graphql-cli": "^4.0.0",
311312
"gulp-replace": "^0.5.4",
313+
"gzip-js": "^0.3.2",
312314
"gzip-size": "3.0.0",
313315
"html-loader": "^0.5.5",
314316
"html-webpack-plugin": "^4.0.0-beta.1",
@@ -318,6 +320,7 @@
318320
"jest-image-snapshot": "^1.0.1",
319321
"jest-junit": "^3.4.1",
320322
"jest-styled-components": "7.0.2",
323+
"js-untar": "^2.0.0",
321324
"mini-css-extract-plugin": "^0.8.0",
322325
"object-assign": "^4.1.1",
323326
"opn": "4.0.2",
-2.36 KB
Loading

packages/app/public/csb-ios.svg

Lines changed: 6 additions & 56 deletions
Loading

packages/app/src/app/components/Markdown/Link.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
import { Button, Link } from '@codesandbox/components';
1+
import { Button, Link, Text } from '@codesandbox/components';
22
import css from '@styled-system/css';
33
import { useOvermind } from 'app/overmind';
44
import React from 'react';
55

66
export const LinkElement = ({ href, children, ...props }) => {
7+
let commentId = null;
78
const { state, actions } = useOvermind();
89
const { id, alias } = state.editor.currentSandbox;
9-
const commentId = new URLSearchParams(new URL(href).search).get('comment');
10+
11+
try {
12+
commentId = new URLSearchParams(new URL(href).search).get('comment');
13+
} catch {
14+
commentId = null;
15+
}
16+
17+
if (!children.length) {
18+
return <Text {...props}>{href}</Text>;
19+
}
1020

1121
if (href.startsWith('user://')) {
1222
return (

0 commit comments

Comments
 (0)