Skip to content

Commit 468801f

Browse files
authored
Merge branch 'master' into refactor/editor-files
2 parents c3dd2d7 + 6764a2d commit 468801f

File tree

222 files changed

+6604
-2142
lines changed

Some content is hidden

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

222 files changed

+6604
-2142
lines changed

.all-contributorsrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,43 @@
14121412
"contributions": [
14131413
"code"
14141414
]
1415+
},
1416+
{
1417+
"login": "armujahid",
1418+
"name": "Abdul Rauf",
1419+
"avatar_url": "https://avatars1.githubusercontent.com/u/3725386?v=4",
1420+
"profile": "https://armujahid.me",
1421+
"contributions": [
1422+
"code",
1423+
"doc"
1424+
]
1425+
},
1426+
{
1427+
"login": "milap1296",
1428+
"name": "milap1296",
1429+
"avatar_url": "https://avatars2.githubusercontent.com/u/19545730?v=4",
1430+
"profile": "https://github.com/milap1296",
1431+
"contributions": [
1432+
"code"
1433+
]
1434+
},
1435+
{
1436+
"login": "yevhenorlov",
1437+
"name": "yevhen orlov",
1438+
"avatar_url": "https://avatars2.githubusercontent.com/u/17388747?v=4",
1439+
"profile": "http://yevhenorlov.com",
1440+
"contributions": [
1441+
"code"
1442+
]
1443+
},
1444+
{
1445+
"login": "NileshPatel17",
1446+
"name": "Nilesh Patel",
1447+
"avatar_url": "https://avatars2.githubusercontent.com/u/27020381?v=4",
1448+
"profile": "https://github.com/NileshPatel17",
1449+
"contributions": [
1450+
"code"
1451+
]
14151452
}
14161453
],
14171454
"contributorsPerLine": 7,

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
- build_prod
280280
test-integrations:
281281
executor: node-with-puppeteer
282+
parallelism: 2
282283
steps:
283284
- checkout_with_cache
284285
- test_integrations

.drone.yml

Lines changed: 84 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
kind: pipeline
3-
name: default
3+
name: pull_request
44

55
steps:
66
- name: restore node_modules cache
@@ -10,9 +10,6 @@ steps:
1010
volumes:
1111
- name: node_modules-cache
1212
path: /cache
13-
when:
14-
event:
15-
- pull_request
1613

1714
- name: install packages
1815
image: node:10.16.3-jessie
@@ -21,41 +18,29 @@ steps:
2118
path: /usr/local/share/.cache/yarn/v4
2219
commands:
2320
- yarn
24-
when:
25-
event:
26-
- pull_request
2721

2822
- name: build
2923
image: node:10.16.3-jessie
3024
commands:
3125
- export STAGING_BRANCH=pr$DRONE_PULL_REQUEST
3226
- yarn build
33-
when:
34-
event:
35-
- pull_request
3627

3728
- name: deploy
38-
image: lbogdan/codesandbox-deploy-plugin:1
29+
image: lbogdan/codesandbox-deploy-plugin:2
3930
settings:
4031
domain: &domain build.csb.dev
4132
volumes:
4233
- name: docker_sock
4334
path: /var/run/docker.sock
4435
- name: deployments
4536
path: /root/docker/deployments
46-
when:
47-
event:
48-
- pull_request
4937

5038
- name: create github deployment
5139
image: lbogdan/github-deployment-plugin:1
5240
settings:
5341
domain: *domain
5442
github_token:
5543
from_secret: github_token
56-
when:
57-
event:
58-
- pull_request
5944

6045
- name: slack notification
6146
image: plugins/slack
@@ -70,8 +55,6 @@ steps:
7055
👎 {{repo.owner}}/{{repo.name}} pull request #{{build.pull}} building failed. See what happened <{{build.link}}|here>.
7156
{{/success}}
7257
when:
73-
event:
74-
- pull_request
7558
status:
7659
- success
7760
- failure
@@ -85,8 +68,6 @@ steps:
8568
template: |
8669
Build for latest commit https://github.com/{{owner}}/{{repo}}/pull/{{pr}}/commits/{{commitSha}} {{#success}}is at https://pr{{pr}}.{{buildDomain}}/s/new{{/success}}{{^success}}failed{{/success}}.
8770
when:
88-
event:
89-
- pull_request
9071
status:
9172
- success
9273
- failure
@@ -98,9 +79,84 @@ steps:
9879
volumes:
9980
- name: node_modules-cache
10081
path: /cache
82+
83+
volumes:
84+
- name: yarn-cache
85+
host:
86+
path: /var/lib/docker/volumes/yarn-cache/_data
87+
- name: node_modules-cache
88+
host:
89+
path: /var/lib/docker/volumes/node_modules-cache/_data
90+
- name: docker_sock
91+
host:
92+
path: /var/run/docker.sock
93+
- name: deployments
94+
host:
95+
path: /root/docker/deployments
96+
97+
trigger:
98+
event: pull_request
99+
---
100+
kind: pipeline
101+
name: branch
102+
103+
steps:
104+
- name: restore node_modules cache
105+
image: lbogdan/codesandbox-cache-plugin:1
106+
settings:
107+
restore: true
108+
volumes:
109+
- name: node_modules-cache
110+
path: /cache
111+
112+
- name: install packages
113+
image: node:10.16.3-jessie
114+
volumes:
115+
- name: yarn-cache
116+
path: /usr/local/share/.cache/yarn/v4
117+
commands:
118+
- yarn
119+
120+
- name: build
121+
image: node:10.16.3-jessie
122+
commands:
123+
- export STAGING_BRANCH=$DRONE_BRANCH
124+
- yarn build
125+
126+
- name: deploy
127+
image: lbogdan/codesandbox-deploy-plugin:2
128+
settings:
129+
domain: &domain build.csb.dev
130+
volumes:
131+
- name: docker_sock
132+
path: /var/run/docker.sock
133+
- name: deployments
134+
path: /root/docker/deployments
135+
136+
- name: slack notification
137+
image: plugins/slack
138+
settings:
139+
webhook:
140+
from_secret: slack_webhook
141+
channel: infra
142+
template: >
143+
{{#success build.status}}
144+
👍 {{repo.owner}}/{{repo.name}} branch {{build.branch}} successfully built. Access it at https://{{build.branch}}.build.csb.dev/ and see the build logs <{{build.link}}|here>.
145+
{{else}}
146+
👎 {{repo.owner}}/{{repo.name}} branch {{build.branch}} building failed. See what happened <{{build.link}}|here>.
147+
{{/success}}
101148
when:
102-
event:
103-
- pull_request
149+
status:
150+
- success
151+
- failure
152+
153+
- name: rebuild node_modules cache
154+
image: lbogdan/codesandbox-cache-plugin:1
155+
settings:
156+
rebuild: true
157+
volumes:
158+
- name: node_modules-cache
159+
path: /cache
104160

105161
volumes:
106162
- name: yarn-cache
@@ -115,8 +171,12 @@ volumes:
115171
- name: deployments
116172
host:
117173
path: /root/docker/deployments
174+
175+
trigger:
176+
event: push
177+
branch: master
118178
---
119179
kind: signature
120-
hmac: c3f983c3f9243b3da5fd33f2d22435338c96486e27d5fb569455c05e55353a51
180+
hmac: 015a8ddaa2fa145808e3c30ad05da71d03e3b8653b6bddb41547f13611397070
121181

122182
...

.yarnclean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ docs
99
doc
1010
website
1111
images
12-
assets
1312

1413
# examples
1514
example

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [CodeSandbox](https://codesandbox.io) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/codesandbox) [![All Contributors](https://img.shields.io/badge/all_contributors-149-orange.svg?style=flat-square)](#contributors-) [![CircleCI](https://circleci.com/gh/codesandbox/codesandbox-client.svg?style=svg)](https://circleci.com/gh/codesandbox/codesandbox-client) [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf)](https://www.browserstack.com/automate/public-build/cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
1+
# [CodeSandbox](https://codesandbox.io) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/codesandbox) [![All Contributors](https://img.shields.io/badge/all_contributors-153-orange.svg?style=flat-square)](#contributors-) [![CircleCI](https://circleci.com/gh/codesandbox/codesandbox-client.svg?style=svg)](https://circleci.com/gh/codesandbox/codesandbox-client) [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf)](https://www.browserstack.com/automate/public-build/cVJuczlJWUtqWXhIbFN1ZjVQekF4NzNsd3phNEZRaGlWU0pHYVVkdGRFWT0tLXFtTVhaOWRySmN0ZG5QVDNDQ0g5Z0E9PQ==--79fe3eae4f149a400d396c9b12d3988f685785cf) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
22

33
[![Backers on Open Collective](https://opencollective.com/codesandbox/backers/badge.svg)](#backers)
44
[![Sponsors on Open Collective](https://opencollective.com/codesandbox/sponsors/badge.svg)](#sponsors)
@@ -238,11 +238,16 @@ Thanks goes to these wonderful people
238238
<td align="center"><a href="https://twitter.com/ivandevp"><img src="https://avatars3.githubusercontent.com/u/9284690?v=4" width="100px;" alt="Ivan Medina"/><br /><sub><b>Ivan Medina</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=ivandevp" title="Code">💻</a></td>
239239
<td align="center"><a href="https://github.com/milap1296"><img src="https://avatars2.githubusercontent.com/u/19545730?v=4" width="100px;" alt="milap1296"/><br /><sub><b>milap1296</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=milap1296" title="Code">💻</a></td>
240240
<td align="center"><a href="https://github.com/Gobinath-Manokaran"><img src="https://avatars2.githubusercontent.com/u/6711914?v=4" width="100px;" alt="Gobinath-Manokaran"/><br /><sub><b>Gobinath-Manokaran</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=Gobinath-Manokaran" title="Code">💻</a></td>
241+
<td align="center"><a href="https://armujahid.me"><img src="https://avatars1.githubusercontent.com/u/3725386?v=4" width="100px;" alt="Abdul Rauf"/><br /><sub><b>Abdul Rauf</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=armujahid" title="Code">💻</a> <a href="https://github.com/codesandbox/codesandbox-client/commits?author=armujahid" title="Documentation">📖</a></td>
242+
<td align="center"><a href="https://github.com/milap1296"><img src="https://avatars2.githubusercontent.com/u/19545730?v=4" width="100px;" alt="milap1296"/><br /><sub><b>milap1296</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=milap1296" title="Code">💻</a></td>
243+
<td align="center"><a href="http://yevhenorlov.com"><img src="https://avatars2.githubusercontent.com/u/17388747?v=4" width="100px;" alt="yevhen orlov"/><br /><sub><b>yevhen orlov</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=yevhenorlov" title="Code">💻</a></td>
244+
<td align="center"><a href="https://github.com/NileshPatel17"><img src="https://avatars2.githubusercontent.com/u/27020381?v=4" width="100px;" alt="Nilesh Patel"/><br /><sub><b>Nilesh Patel</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=NileshPatel17" title="Code">💻</a></td>
241245
</tr>
242246
</table>
243247

244248
<!-- markdownlint-enable -->
245249
<!-- prettier-ignore-end -->
250+
246251
<!-- ALL-CONTRIBUTORS-LIST:END -->
247252

248253
## Backers

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
"test:ci": "lerna run test --ignore codesandbox-browserfs -- --ci --testResultsProcessor=\"jest-junit\" ",
6161
"test:integrations": "lerna exec --scope app --stream -- yarn test:integrations",
6262
"test:jest-lite": "lerna exec --scope app --stream -- yarn run test jest-lite --watch --coverage",
63-
"typecheck": "lerna run typecheck --scope app"
63+
"typecheck": "lerna run typecheck"
6464
},
6565
"dependencies": {
6666
"@typescript-eslint/eslint-plugin": "^1.13.0",
6767
"@typescript-eslint/parser": "^1.13.0",
6868
"opencollective": "^1.0.3"
6969
},
7070
"devDependencies": {
71-
"all-contributors-cli": "^6.9.1",
71+
"all-contributors-cli": "^6.9.2",
7272
"babel-eslint": "^10.0.2",
7373
"concurrently": "^4.1.0",
7474
"cross-env": "^6.0.0",

packages/app/config/build.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ const isDev = process.env.NODE_ENV === 'development';
22
const staticAssets = [
33
{
44
from: 'standalone-packages/vscode-editor/release/min/vs',
5-
to: 'public/vscode23/vs',
5+
to: 'public/vscode24/vs',
66
},
77
{
88
from: 'standalone-packages/vscode-extensions/out',
9-
to: 'public/vscode-extensions/v9',
9+
to: 'public/vscode-extensions/v10',
1010
},
1111
{
1212
from: 'node_modules/onigasm/lib/onigasm.wasm',
@@ -42,6 +42,13 @@ const staticAssets = [
4242
: 'standalone-packages/codesandbox-browserfs/dist',
4343
to: 'static/browserfs4',
4444
},
45+
// For Monaco
46+
{
47+
from: isDev
48+
? 'standalone-packages/codesandbox-browserfs/build'
49+
: 'standalone-packages/codesandbox-browserfs/dist',
50+
to: 'static/browserfs3',
51+
},
4552
];
4653

4754
module.exports = {

packages/app/config/webpack.prod.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ const webpack = require('webpack');
66
const ImageminPlugin = require('imagemin-webpack-plugin').default;
77
const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
88
const TerserJSPlugin = require('terser-webpack-plugin');
9-
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
10-
.BundleAnalyzerPlugin;
11-
const normalizeName = require('webpack/lib/optimize/SplitChunksPlugin')
12-
.normalizeName;
9+
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
10+
const { normalizeName } = require('webpack/lib/optimize/SplitChunksPlugin');
1311
const ManifestPlugin = require('webpack-manifest-plugin');
1412
const CopyWebpackPlugin = require('copy-webpack-plugin');
1513
const VERSION = require('@codesandbox/common/lib/version').default;
@@ -182,7 +180,7 @@ module.exports = merge(commonConfig, {
182180
},
183181
},
184182
{
185-
urlPattern: /\/vscode23/,
183+
urlPattern: /\/vscode24/,
186184
handler: 'cacheFirst',
187185
options: {
188186
cache: {

0 commit comments

Comments
 (0)