Skip to content

Commit 0f0f685

Browse files
committed
Merge branch 'master' of github.com:codesandbox/codesandbox-client into fix-fonts
2 parents 8bc40e5 + 4255c53 commit 0f0f685

File tree

4 files changed

+30
-22
lines changed

4 files changed

+30
-22
lines changed

.circleci/config.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ aliases:
2525

2626
- &restore_deps_cache
2727
keys:
28-
- v28-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
29-
- v28-dependency-cache-{{ .Branch }}
30-
- v28-dependency-cache
28+
- v29-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
29+
- v29-dependency-cache-{{ .Branch }}
30+
- v29-dependency-cache
3131

3232
- &save_deps_cache
33-
key: v28-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
33+
key: v29-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
3434
paths:
3535
- node_modules
3636
- packages/app/node_modules
@@ -49,51 +49,51 @@ aliases:
4949

5050
- &restore_standalone_deps_cache
5151
keys:
52-
- v28-standalone-dependency-cache-{{ .Branch }}-{{ checksum
52+
- v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
5353
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
54-
- v28-standalone-dependency-cache-{{ .Branch }}
55-
- v28-standalone-dependency-cache
54+
- v29-standalone-dependency-cache-{{ .Branch }}
55+
- v29-standalone-dependency-cache
5656

5757
- &save_standalone_deps_cache
5858
key:
59-
v28-standalone-dependency-cache-{{ .Branch }}-{{ checksum
59+
v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
6060
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
6161
paths:
6262
- standalone-packages/codesandbox-browserfs/node_modules
6363

6464
- &restore_prod_homepage_cache
65-
key: v28-prod-homepage-build-cache-master
65+
key: v29-prod-homepage-build-cache-master
6666

6767
- &restore_prod_result
6868
key:
69-
v28-prod-build-result-{{ .Environment.CIRCLE_BRANCH
69+
v29-prod-build-result-{{ .Environment.CIRCLE_BRANCH
7070
}}-{{.Environment.CIRCLE_SHA1 }}
7171

7272
- &save_prod_build_cache
7373
key:
74-
v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
74+
v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
7575
}}-{{.Environment.CIRCLE_SHA1 }}
7676
paths:
7777
- packages/app/node_modules/.cache
7878

7979
- &restore_prod_build_cache
8080
keys:
81-
- v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
81+
- v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
8282
}}-{{.Environment.CIRCLE_SHA1 }}
83-
- v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
84-
- v28-prod-build-cache-master-
83+
- v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
84+
- v29-prod-build-cache-master-
8585

8686
# To persist the images built by sharp
8787
- &save_prod_homepage_cache
8888
key:
89-
v28-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
89+
v29-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
9090
.Environment.CIRCLE_SHA1 }}
9191
paths:
9292
- ./packages/homepage/public
9393

9494
- &save_prod_result
9595
key:
96-
v28-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
96+
v29-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
9797
.Environment.CIRCLE_SHA1 }}
9898
paths:
9999
- ./www
@@ -134,14 +134,14 @@ commands:
134134
steps:
135135
- restore_cache:
136136
keys:
137-
- v28-source-cache-{{ .Branch }}-{{ .Revision }}
138-
- v28-source-cache-{{ .Branch }}-
139-
- v28-source-cache-
137+
- v29-source-cache-{{ .Branch }}-{{ .Revision }}
138+
- v29-source-cache-{{ .Branch }}-
139+
- v29-source-cache-
140140

141141
- checkout
142142

143143
- save_cache:
144-
key: v28-source-cache-{{ .Branch }}-{{ .Revision }}
144+
key: v29-source-cache-{{ .Branch }}-{{ .Revision }}
145145
paths:
146146
- '.git'
147147
build_deps:

packages/app/src/app/pages/Sandbox/Editor/Content/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,13 @@ class EditorPreview extends React.Component {
428428
? `Browser (${options.title || `:${options.port}`})`
429429
: `Browser`,
430430
Content: ({ hidden, options }) => (
431-
<Preview options={options} hidden={hidden} width="100%" height="100%" />
431+
<Preview
432+
runOnClick={store.preferences.runOnClick}
433+
options={options}
434+
hidden={hidden}
435+
width="100%"
436+
height="100%"
437+
/>
432438
),
433439
actions: [],
434440
};

packages/common/src/components/RunOnClick/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const RunOnClick = ({ onClick }) => (
2222
</div>
2323
<div className="play" />
2424
</div>
25-
<Text>Run on click</Text>
25+
<Text>Click to Run</Text>
2626
</Container>
2727
</Centered>
2828
</Fullscreen>

packages/common/src/utils/analytics/sentry.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export async function initialize(dsn: string) {
3131
/Cannot remove node \d* because no matching node was found in the Store\./,
3232
/Cannot add child \d* to parent \d* because parent node was not found in the Store\./,
3333
/Children cannot be added or removed during a reorder operation\./,
34+
35+
"undefined is not an object (evaluating 'window.__pad.performLoop')", // Only happens on Safari, but spams our servers. Doesn't break anything
3436
],
3537
whitelistUrls: [/https?:\/\/((uploads|www)\.)?codesandbox\.io/],
3638
/**

0 commit comments

Comments
 (0)