Skip to content

Commit e6e2929

Browse files
author
Ives van Hoorne
committed
Merge branch 'master' into playground
2 parents 970feb8 + d75cc6f commit e6e2929

File tree

1,308 files changed

+625799
-63729
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,308 files changed

+625799
-63729
lines changed

.all-contributorsrc

Lines changed: 231 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,237 @@
236236
"contributions": [
237237
"code"
238238
]
239+
},
240+
{
241+
"login": "JulianMayorga",
242+
"name": "El Juli",
243+
"avatar_url": "https://avatars3.githubusercontent.com/u/843342?v=4",
244+
"profile": "https://github.com/JulianMayorga",
245+
"contributions": [
246+
"code"
247+
]
248+
},
249+
{
250+
"login": "arthurdenner",
251+
"name": "Arthur Denner",
252+
"avatar_url": "https://avatars0.githubusercontent.com/u/13774309?v=4",
253+
"profile": "https://github.com/arthurdenner",
254+
"contributions": [
255+
"code"
256+
]
257+
},
258+
{
259+
"login": "radi-cho",
260+
"name": "Radi Cho",
261+
"avatar_url": "https://avatars3.githubusercontent.com/u/12954909?v=4",
262+
"profile": "https://github.com/RSG-Group",
263+
"contributions": [
264+
"bug",
265+
"code",
266+
"ideas"
267+
]
268+
},
269+
{
270+
"login": "xyc",
271+
"name": "Xiaoyi Chen",
272+
"avatar_url": "https://avatars3.githubusercontent.com/u/679275?v=4",
273+
"profile": "https://twitter.com/chxy",
274+
"contributions": [
275+
"code"
276+
]
277+
},
278+
{
279+
"login": "gautamarora",
280+
"name": "Gautam Arora",
281+
"avatar_url": "https://avatars3.githubusercontent.com/u/1215971?v=4",
282+
"profile": "https://twitter.com/gautam",
283+
"contributions": [
284+
"code",
285+
"ideas"
286+
]
287+
},
288+
{
289+
"login": "haroenv",
290+
"name": "Haroen Viaene",
291+
"avatar_url": "https://avatars3.githubusercontent.com/u/6270048?v=4",
292+
"profile": "https://twitter.com/haroenv",
293+
"contributions": [
294+
"code",
295+
"design"
296+
]
297+
},
298+
{
299+
"login": "nicknisi",
300+
"name": "Nick Nisi",
301+
"avatar_url": "https://avatars1.githubusercontent.com/u/293805?v=4",
302+
"profile": "https://nicknisi.com",
303+
"contributions": [
304+
"code"
305+
]
306+
},
307+
{
308+
"login": "Jakhotiya",
309+
"name": "Abhishek Jakhotiya",
310+
"avatar_url": "https://avatars2.githubusercontent.com/u/9327315?v=4",
311+
"profile": "https://github.com/Jakhotiya",
312+
"contributions": [
313+
"code",
314+
"bug"
315+
]
316+
},
317+
{
318+
"login": "tomkuehl",
319+
"name": "Tom Kühl",
320+
"avatar_url": "https://avatars2.githubusercontent.com/u/14299145?v=4",
321+
"profile": "http://twitter.com/tomkuehl_",
322+
"contributions": [
323+
"code"
324+
]
325+
},
326+
{
327+
"login": "br1anchen",
328+
"name": "br1anchen",
329+
"avatar_url": "https://avatars2.githubusercontent.com/u/1086461?v=4",
330+
"profile": "https://github.com/br1anchen",
331+
"contributions": [
332+
"code"
333+
]
334+
},
335+
{
336+
"login": "Arthelon",
337+
"name": "Daniel Hsing",
338+
"avatar_url": "https://avatars3.githubusercontent.com/u/11952174?v=4",
339+
"profile": "https://arthelon.github.io",
340+
"contributions": [
341+
"code"
342+
]
343+
},
344+
{
345+
"login": "maciej-ka",
346+
"name": "Maciej Kasprzyk",
347+
"avatar_url": "https://avatars2.githubusercontent.com/u/5403694?v=4",
348+
"profile": "https://twitter.com/_maciejka",
349+
"contributions": [
350+
"code"
351+
]
352+
},
353+
{
354+
"login": "robertheessels",
355+
"name": "Robert Heessels",
356+
"avatar_url": "https://avatars2.githubusercontent.com/u/596727?v=4",
357+
"profile": "https://github.com/robertheessels",
358+
"contributions": [
359+
"doc"
360+
]
361+
},
362+
{
363+
"login": "ryanpcmcquen",
364+
"name": "Ryan P. C. McQuen",
365+
"avatar_url": "https://avatars3.githubusercontent.com/u/772937?v=4",
366+
"profile": "https://ryanpcmcquen.org",
367+
"contributions": [
368+
"code"
369+
]
370+
},
371+
{
372+
"login": "ipatch",
373+
"name": "Chris",
374+
"avatar_url": "https://avatars3.githubusercontent.com/u/613805?v=4",
375+
"profile": "http://chrisrjones.com",
376+
"contributions": [
377+
"code"
378+
]
379+
},
380+
{
381+
"login": "drewsmith",
382+
"name": "Drew Smith",
383+
"avatar_url": "https://avatars3.githubusercontent.com/u/595469?v=4",
384+
"profile": "https://github.com/drewsmith",
385+
"contributions": [
386+
"code"
387+
]
388+
},
389+
{
390+
"login": "coderberry",
391+
"name": "Eric Berry",
392+
"avatar_url": "https://avatars2.githubusercontent.com/u/12481?v=4",
393+
"profile": "https://codesponsor.io",
394+
"contributions": [
395+
"code"
396+
]
397+
},
398+
{
399+
"login": "Hum4n01d",
400+
"name": "Hum4n01d",
401+
"avatar_url": "https://avatars1.githubusercontent.com/u/17228477?v=4",
402+
"profile": "https://www.hum4n01d.me",
403+
"contributions": [
404+
"code"
405+
]
406+
},
407+
{
408+
"login": "malwilley",
409+
"name": "Malachi Willey",
410+
"avatar_url": "https://avatars3.githubusercontent.com/u/10888943?v=4",
411+
"profile": "https://github.com/malwilley",
412+
"contributions": [
413+
"code"
414+
]
415+
},
416+
{
417+
"login": "mweststrate",
418+
"name": "Michel Weststrate",
419+
"avatar_url": "https://avatars0.githubusercontent.com/u/1820292?v=4",
420+
"profile": "https://twitter.com/mweststrate",
421+
"contributions": [
422+
"code"
423+
]
424+
},
425+
{
426+
"login": "kof",
427+
"name": "Oleg",
428+
"avatar_url": "https://avatars0.githubusercontent.com/u/52824?v=4",
429+
"profile": "https://kof.github.io",
430+
"contributions": [
431+
"code"
432+
]
433+
},
434+
{
435+
"login": "pshrmn",
436+
"name": "Paul Sherman",
437+
"avatar_url": "https://avatars0.githubusercontent.com/u/1127037?v=4",
438+
"profile": "https://www.pshrmn.com",
439+
"contributions": [
440+
"bug",
441+
"code"
442+
]
443+
},
444+
{
445+
"login": "ro-savage",
446+
"name": "Ro Savage",
447+
"avatar_url": "https://avatars2.githubusercontent.com/u/9244507?v=4",
448+
"profile": "https://github.com/ro-savage",
449+
"contributions": [
450+
"code"
451+
]
452+
},
453+
{
454+
"login": "samdenty99",
455+
"name": "Sam Denty",
456+
"avatar_url": "https://avatars3.githubusercontent.com/u/13242392?v=4",
457+
"profile": "https://samdd.me",
458+
"contributions": [
459+
"code"
460+
]
461+
},
462+
{
463+
"login": "zephraph",
464+
"name": "Zephraph",
465+
"avatar_url": "https://avatars1.githubusercontent.com/u/3087225?v=4",
466+
"profile": "https://github.com/zephraph",
467+
"contributions": [
468+
"code"
469+
]
239470
}
240471
]
241472
}

.babelrc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"env": {
33
"test": {
4-
"presets": [
5-
"env",
6-
"react"
7-
],
4+
"presets": ["env", "react"],
85
"plugins": [
96
"babel-plugin-transform-async-to-generator",
107
"babel-plugin-transform-object-rest-spread",
@@ -19,7 +16,8 @@
1916
"webpack": true
2017
}
2118
],
22-
"babel-plugin-system-import-transformer"
19+
"babel-plugin-system-import-transformer",
20+
"babel-macros"
2321
]
2422
}
2523
}

.circleci/config.yml

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,31 @@ jobs:
88
steps:
99
- checkout
1010
- restore_cache:
11-
key: v2-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
11+
keys:
12+
- v4-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
13+
- v4-dependency-cache-{{ .Branch }}
14+
- v4-dependency-cache
15+
- restore_cache:
16+
keys:
17+
- v4-standalone-dependency-cache-{{ .Branch }}-{{ checksum "standalone-packages/codesandbox-browserfs/yarn.lock" }}
18+
- v4-standalone-dependency-cache-{{ .Branch }}
19+
- v4-standalone-dependency-cache
1220
- run:
1321
name: Install Dependencies
1422
command: yarn install
1523
- save_cache:
16-
key: v2-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
24+
key: v4-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
25+
paths:
26+
- node_modules
27+
- save_cache:
28+
key: v4-standalone-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
1729
paths:
18-
- ./node_modules
19-
- ./packages/app/node_modules
20-
- ./packages/codesandbox-api/node_modules
21-
- ./packages/common/node_modules
22-
- ./packages/homepage/node_modules
23-
- ~/.yarn-cache
30+
- standalone-packages/codesandbox-browserfs/node_modules
2431
- run:
2532
name: Build
2633
command: yarn build:dependents
2734
- save_cache:
28-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
35+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
2936
paths:
3037
- ~/codesandbox-client
3138

@@ -35,19 +42,19 @@ jobs:
3542
working_directory: ~/codesandbox-client
3643
steps:
3744
- restore_cache:
38-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
45+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
3946
# We do this to compare sizes from these builds with master
4047
- restore_cache:
41-
key: v2-prod-app-build-cache-master
48+
key: v4-prod-app-build-cache-master
4249
- run:
4350
name: Build Application
4451
command: yarn build:prod
4552
- save_cache:
46-
key: v2-prod-app-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
53+
key: v4-prod-app-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
4754
paths:
4855
- ./packages/app/www
4956
- save_cache:
50-
key: v2-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
57+
key: v4-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
5158
paths:
5259
- ./www
5360
- store_artifacts:
@@ -60,7 +67,7 @@ jobs:
6067
working_directory: ~/codesandbox-client
6168
steps:
6269
- restore_cache:
63-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
70+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
6471
- run:
6572
name: Start Test Server
6673
command: yarn start:test
@@ -84,7 +91,7 @@ jobs:
8491
working_directory: ~/codesandbox-client
8592
steps:
8693
- restore_cache:
87-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
94+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
8895
- run:
8996
name: Test
9097
command: yarn test --ci --testResultsProcessor="jest-junit"
@@ -97,7 +104,7 @@ jobs:
97104
working_directory: ~/codesandbox-client
98105
steps:
99106
- restore_cache:
100-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
107+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
101108
- run:
102109
name: Lint
103110
command: yarn lint
@@ -108,9 +115,9 @@ jobs:
108115
working_directory: ~/codesandbox-client
109116
steps:
110117
- restore_cache:
111-
key: v2-repo-{{ .Environment.CIRCLE_SHA1 }}
118+
key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
112119
- restore_cache:
113-
key: v2-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
120+
key: v4-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
114121
- add_ssh_keys:
115122
fingerprints:
116123
- "f7:f1:e6:60:96:24:d9:cd:1b:8b:c0:34:e7:ee:fa:82"
@@ -153,6 +160,3 @@ workflows:
153160
only: master
154161
requires:
155162
- hold
156-
157-
158-

.eslintrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@
1616
"react/jsx-filename-extension": 0,
1717
"react/sort-comp": 0,
1818
"import/no-extraneous-dependencies": 0,
19+
"react/prop-types": 0,
1920
"arrow-parens": 0,
2021
"import/prefer-default-export": 0,
2122
"class-methods-use-this": 0,
2223
"no-console": ["error", { "allow": ["error"] }],
2324
"prefer-template": "off",
24-
"no-plusplus": 0
25+
"no-plusplus": 0,
26+
"no-underscore-dangle": "off",
27+
"no-nested-ternary": "warn",
28+
"react/require-default-props": "off"
2529
},
2630
"settings": {
2731
"import/resolver": "webpack"
File renamed without changes.

0 commit comments

Comments
 (0)