Skip to content

Commit 5f4835a

Browse files
committed
Merge branch 'master' into share-sheet
2 parents 39e5c73 + 74602f7 commit 5f4835a

File tree

904 files changed

+47331
-30150
lines changed

Some content is hidden

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

904 files changed

+47331
-30150
lines changed

.circleci/config.yml

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

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

3232
- &save_deps_cache
33-
key: v29-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
33+
key: v30-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-
- v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
52+
- v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
5353
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
54-
- v29-standalone-dependency-cache-{{ .Branch }}
55-
- v29-standalone-dependency-cache
54+
- v30-standalone-dependency-cache-{{ .Branch }}
55+
- v30-standalone-dependency-cache
5656

5757
- &save_standalone_deps_cache
5858
key:
59-
v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
59+
v30-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: v29-prod-homepage-build-cache-master
65+
key: v30-prod-homepage-build-cache-master
6666

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

7272
- &save_prod_build_cache
7373
key:
74-
v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
74+
v30-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-
- v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
81+
- v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
8282
}}-{{.Environment.CIRCLE_SHA1 }}
83-
- v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
84-
- v29-prod-build-cache-master-
83+
- v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
84+
- v30-prod-build-cache-master-
8585

8686
# To persist the images built by sharp
8787
- &save_prod_homepage_cache
8888
key:
89-
v29-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
89+
v30-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-
v29-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
96+
v30-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-
- v29-source-cache-{{ .Branch }}-{{ .Revision }}
138-
- v29-source-cache-{{ .Branch }}-
139-
- v29-source-cache-
137+
- v30-source-cache-{{ .Branch }}-{{ .Revision }}
138+
- v30-source-cache-{{ .Branch }}-
139+
- v30-source-cache-
140140

141141
- checkout
142142

143143
- save_cache:
144-
key: v29-source-cache-{{ .Branch }}-{{ .Revision }}
144+
key: v30-source-cache-{{ .Branch }}-{{ .Revision }}
145145
paths:
146146
- '.git'
147147
build_deps:
@@ -245,6 +245,9 @@ commands:
245245
command:
246246
'[ -n "<< parameters.user >>" ] && echo << parameters.password >> |
247247
docker login -u << parameters.user >> --password-stdin || true'
248+
- run:
249+
name: Create DockerIgnore
250+
command: echo '**\n!www' > .dockerignore
248251
- run:
249252
name: Create Image
250253
command:

.dockerignore

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,30 @@
1-
*
2-
!www
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# dependencies
4+
node_modules
5+
# we use yarn
6+
package-lock.json
7+
8+
/integration-tests/**/__diff_output__
9+
10+
# testing
11+
coverage
12+
13+
# production
14+
build
15+
www
16+
.deliver
17+
18+
# misc
19+
.DS_Store
20+
npm-debug.log
21+
yarn-error.log
22+
.idea
23+
jest
24+
25+
lerna-debug.log
26+
27+
standalone-packages/monaco-editor-core
28+
29+
.next
30+
.cache-loader

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ steps:
2626
- yarn build
2727

2828
- name: deploy
29-
image: lbogdan/codesandbox-deploy-plugin:2
29+
image: lbogdan/codesandbox-deploy-plugin:3
3030
settings:
3131
domain: &domain build.csb.dev
3232
volumes:
@@ -177,6 +177,6 @@ trigger:
177177
branch: master
178178
---
179179
kind: signature
180-
hmac: 015a8ddaa2fa145808e3c30ad05da71d03e3b8653b6bddb41547f13611397070
180+
hmac: e625eaf2e469b9b6763641d4cc1f089900ef8d8c41db32c6f6aacb27bee8c19c
181181

182182
...

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
**/cra-files/*.*
22
**/eslint-lint.js
3+
**/stories/*.*

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ npm-debug.log
2121
yarn-error.log
2222
.idea
2323
jest
24+
stats.json
2425

2526
lerna-debug.log
2627

.graphqlconfig.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
projects:
2+
app:
3+
schemaPath: packages/app/src/app/graphql/schema.graphql
4+
extensions:
5+
endpoints:
6+
default: 'https://codesandbox.io/api/graphql'
7+
staging: 'https://codesandbox.stream/api/graphql'
8+
dev: 'http://localhost:4000/api/graphql'

.yarnclean

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,10 @@ wercker.yml
4545

4646
@types/react-native
4747
packages/app/node_modules/styled-components
48+
49+
# Prevent duplicate graphql. This doesn't seem to break anything
50+
@divyenduz/ts-graphql-plugin/node_modules/**
51+
graphql-config/node_modules/**
52+
53+
# Issue with jest conflicting with jest-styled-components
54+
jest-styled-components/typings/**

README.md

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://codesandbox.io">
3-
<img src="https://user-images.githubusercontent.com/1863771/68405395-5020f400-0180-11ea-8818-8cb255d9fe71.png" height="200px">
3+
<img src="https://codesandbox.io/static/img/banner.png" height="200px">
44
</a>
55
</p>
66

@@ -14,25 +14,10 @@
1414
[![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/)
1515
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
1616

17-
[![Backers on Open Collective](https://opencollective.com/codesandbox/backers/badge.svg)](#backers)
18-
[![Sponsors on Open Collective](https://opencollective.com/codesandbox/sponsors/badge.svg)](#sponsors)
19-
20-
An online code editor tailored for web applications.
21-
22-
This project was bootstrapped with
23-
[Create React App](https://github.com/facebook/create-react-app).
24-
25-
The JavaScript community has sharing as its selling point. It has the biggest
26-
open source community and every day new ideas and proposals are shared on
27-
Twitter. This is great and a really strong point, but the side effect of this is
28-
that there are a lot of tools and configurations to consider before you can
29-
start building.
30-
31-
CodeSandbox aims to solve this by allowing developers to simply go to a URL in
32-
their browser to start building. This not only makes it easier to get started,
33-
it also makes it easier to share. You can just share your created work by
34-
sharing the URL, others can then (without downloading) further develop on these
35-
sandboxes.
17+
An instantly ready, full-featured online IDE for web development on any device
18+
with a browser. Enabling you to start new projects quickly and prototype
19+
rapidly. With CodeSandbox, you can create web apps, experiment with code, test
20+
ideas, and share creations easily.
3621

3722
## Other CodeSandbox repositories
3823

@@ -260,27 +245,3 @@ Thanks goes to these wonderful people
260245
<!-- prettier-ignore-end -->
261246

262247
<!-- ALL-CONTRIBUTORS-LIST:END -->
263-
264-
## Backers
265-
266-
Thank you to all our backers! 🙏
267-
[[Become a backer](https://opencollective.com/codesandbox#backer)]
268-
269-
<a href="https://opencollective.com/codesandbox#backers" target="_blank"><img src="https://opencollective.com/codesandbox/backers.svg?width=890"></a>
270-
271-
## Sponsors
272-
273-
Support this project by becoming a sponsor. Your logo will show up here with a
274-
link to your website.
275-
[[Become a sponsor](https://opencollective.com/codesandbox#sponsor)]
276-
277-
<a href="https://opencollective.com/codesandbox/sponsor/0/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/0/avatar.svg"></a>
278-
<a href="https://opencollective.com/codesandbox/sponsor/1/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/1/avatar.svg"></a>
279-
<a href="https://opencollective.com/codesandbox/sponsor/2/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/2/avatar.svg"></a>
280-
<a href="https://opencollective.com/codesandbox/sponsor/3/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/3/avatar.svg"></a>
281-
<a href="https://opencollective.com/codesandbox/sponsor/4/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/4/avatar.svg"></a>
282-
<a href="https://opencollective.com/codesandbox/sponsor/5/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/5/avatar.svg"></a>
283-
<a href="https://opencollective.com/codesandbox/sponsor/6/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/6/avatar.svg"></a>
284-
<a href="https://opencollective.com/codesandbox/sponsor/7/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/7/avatar.svg"></a>
285-
<a href="https://opencollective.com/codesandbox/sponsor/8/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/8/avatar.svg"></a>
286-
<a href="https://opencollective.com/codesandbox/sponsor/9/website" target="_blank"><img src="https://opencollective.com/codesandbox/sponsor/9/avatar.svg"></a>

docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM node:10
22
LABEL maintainer "Ives van Hoorne"
33

4-
RUN mkdir /usr/src/app
4+
RUN mkdir /workspace
5+
COPY * /workspace/
56

6-
WORKDIR /usr/src/app
7+
WORKDIR /workspace

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
"packages/homepage",
1414
"packages/common",
1515
"packages/codesandbox-api",
16-
"packages/sandpack",
17-
"packages/react-sandpack",
1816
"packages/node-services",
1917
"packages/sandbox-hooks",
2018
"packages/sse-hooks",
@@ -39,14 +37,14 @@
3937
"build:embed": "lerna run build:embed --scope app --stream && gulp",
4038
"build:prod": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" lerna run build --scope homepage --stream && lerna run build --scope app --stream && lerna run copy-assets --scope app --stream",
4139
"commit": "concurrently \"yarn typecheck\" \"yarn lint\" && git commit -m",
40+
"postinstall": "yarn lerna run install-dependencies --stream --concurrency 1 --ignore smooshpack --ignore react-smooshpack && opencollective postinstall",
4241
"contributors:add": "all-contributors add",
4342
"contributors:generate": "all-contributors generate",
44-
"postinstall": "yarn lerna run install-dependencies --scope vscode-textmate --scope codesandbox-browserfs --scope sse-loading-screen --stream && opencollective postinstall",
4543
"lint": "lerna run lint --stream",
4644
"now-build": "yarn build:deps && lerna run build:storybook --scope @codesandbox/common",
4745
"start": "yarn build:deps && lerna run start --scope @codesandbox/common --scope app --parallel",
4846
"start:common": "lerna run start --scope @codesandbox/common --stream",
49-
"start:dev_api": "lerna run start:dev_api --scope app --stream",
47+
"start:dev_api": "concurrently --raw \"cd packages/app && yarn start:dev_api\" \"cd packages/common && yarn start\"",
5048
"start:dynamic": "lerna run dev --scope dynamic-pages --stream",
5149
"start:fast": "concurrently --raw \"cd packages/app && yarn start\" \"cd packages/common && yarn start\"",
5250
"start:home": "yarn build:deps && yarn start:home:fast",

0 commit comments

Comments
 (0)