Skip to content

Commit 850151b

Browse files
committed
Merge branch 'master' into fix/react-mounting
2 parents b925c6d + a03e01e commit 850151b

File tree

1,283 files changed

+67965
-45314
lines changed

Some content is hidden

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

1,283 files changed

+67965
-45314
lines changed

.all-contributorsrc

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,15 @@
13591359
"code"
13601360
]
13611361
},
1362+
{
1363+
"login": "HTMLGhozt",
1364+
"name": "Thomas Dillard",
1365+
"avatar_url": "https://avatars1.githubusercontent.com/u/12449668?v=4",
1366+
"profile": "http://ThomasDillard.com",
1367+
"contributions": [
1368+
"code"
1369+
]
1370+
},
13621371
{
13631372
"login": "chinmay17",
13641373
"name": "Chinmay Chaudhary",
@@ -1377,6 +1386,15 @@
13771386
"code"
13781387
]
13791388
},
1389+
{
1390+
"login": "NabeelahY",
1391+
"name": "Nabeelah",
1392+
"avatar_url": "https://avatars1.githubusercontent.com/u/35764602?v=4",
1393+
"profile": "https://github.com/NabeelahY",
1394+
"contributions": [
1395+
"code"
1396+
]
1397+
},
13801398
{
13811399
"login": "vanya829",
13821400
"name": "vanya829",
@@ -1386,6 +1404,15 @@
13861404
"code"
13871405
]
13881406
},
1407+
{
1408+
"login": "tanem",
1409+
"name": "Tane Morgan",
1410+
"avatar_url": "https://avatars3.githubusercontent.com/u/464864?v=4",
1411+
"profile": "https://github.com/tanem",
1412+
"contributions": [
1413+
"code"
1414+
]
1415+
},
13891416
{
13901417
"login": "hetpatel33",
13911418
"name": "Het Patel",
@@ -1395,6 +1422,15 @@
13951422
"code"
13961423
]
13971424
},
1425+
{
1426+
"login": "ivandevp",
1427+
"name": "Ivan Medina",
1428+
"avatar_url": "https://avatars3.githubusercontent.com/u/9284690?v=4",
1429+
"profile": "https://twitter.com/ivandevp",
1430+
"contributions": [
1431+
"code"
1432+
]
1433+
},
13981434
{
13991435
"login": "Gobinath-Manokaran",
14001436
"name": "Gobinath-Manokaran",
@@ -1449,8 +1485,27 @@
14491485
"contributions": [
14501486
"code"
14511487
]
1488+
},
1489+
{
1490+
"login": "sajadhsm",
1491+
"name": "Sajad Hashemian",
1492+
"avatar_url": "https://avatars3.githubusercontent.com/u/20022818?v=4",
1493+
"profile": "https://github.com/sajadhsm",
1494+
"contributions": [
1495+
"code"
1496+
]
1497+
},
1498+
{
1499+
"login": "carloslfu",
1500+
"name": "Carlos Galarza",
1501+
"avatar_url": "https://avatars3.githubusercontent.com/u/5993168?v=4",
1502+
"profile": "https://carloslfu.github.io",
1503+
"contributions": [
1504+
"doc"
1505+
]
14521506
}
14531507
],
14541508
"contributorsPerLine": 7,
1455-
"commitConvention": "none"
1509+
"commitConvention": "none",
1510+
"skipCi": true
14561511
}

.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-
- v28-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
29-
- v28-dependency-cache-{{ .Branch }}
30-
- v28-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: v28-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-
- v28-standalone-dependency-cache-{{ .Branch }}-{{ checksum
52+
- v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
5353
"standalone-packages/codesandbox-browserfs/yarn.lock" }}
54-
- v28-standalone-dependency-cache-{{ .Branch }}
55-
- v28-standalone-dependency-cache
54+
- v30-standalone-dependency-cache-{{ .Branch }}
55+
- v30-standalone-dependency-cache
5656

5757
- &save_standalone_deps_cache
5858
key:
59-
v28-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: v28-prod-homepage-build-cache-master
65+
key: v30-prod-homepage-build-cache-master
6666

6767
- &restore_prod_result
6868
key:
69-
v28-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-
v28-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-
- v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
81+
- v30-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+
- 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-
v28-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-
v28-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-
- v28-source-cache-{{ .Branch }}-{{ .Revision }}
138-
- v28-source-cache-{{ .Branch }}-
139-
- v28-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: v28-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/*.*

.eslintrc

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,7 @@
2727
"import/no-cycle": "warn",
2828
"react/prop-types": 0,
2929
"arrow-parens": 0,
30-
"prefer-destructuring": [
31-
"error",
32-
{
33-
"VariableDeclarator": {
34-
"array": false,
35-
"object": true
36-
},
37-
"AssignmentExpression": {
38-
"array": false,
39-
"object": false
40-
}
41-
}
42-
],
30+
"prefer-destructuring": 0,
4331
"no-async-promise-executor": "warn",
4432
"import/prefer-default-export": 0,
4533
"class-methods-use-this": 0,

.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+
prod: 'https://codesandbox.io/api/graphql'
7+
staging: 'https://codesandbox.stream/api/graphql'
8+
dev: 'http://localhost:4000/api/graphql'

.imgbotconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ignoredFiles": [
3+
"**/__image_snapshots__/**"
4+
]
5+
}

.prettierrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)