Merge branch 'master' into use-overmind-modals

Author: christianalfoni

.all-contributorsrc

@@ -1440,6 +1440,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "22PoojaGaur",
+      "name": "Pooja Gaur",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/43316760?v=4",
+      "profile": "https://github.com/22PoojaGaur",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.circleci/config.yml

@@ -168,12 +168,6 @@ commands:
       - run:
           name: Build Application
           command: yarn build:prod
-      - run:
-          name: Mark Sentry release
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              node packages/app/scripts/sentry-create-release.js
-            fi
       - save_cache: *save_prod_build_cache
       - save_cache: *save_prod_result
       - run:
@@ -302,6 +296,34 @@ jobs:
     executor: docker_machine
     steps:
       - docker_cache
+  deploy-to-production:
+    executor: node
+    environment:
+      ENVIRONMENT: production
+    steps:
+      - checkout_with_cache
+      - restore_cache: *restore_deps_cache
+      - attach_workspace: *attach_deps_workspace
+      - run:
+          name: Mark Sentry release
+          command: node packages/app/scripts/sentry-create-release.js
+      - run:
+          name: Deploy Image
+          command: node packages/app/scripts/deploy.js
+      - run:
+          name: Deploy Sentry release
+          command: node packages/app/scripts/sentry-deploy-release.js
+  deploy-to-staging:
+    executor: node
+    environment:
+      ENVIRONMENT: staging
+    steps:
+      - checkout_with_cache
+      - restore_cache: *restore_deps_cache
+      - attach_workspace: *attach_deps_workspace
+      - run:
+          name: Deploy Image
+          command: node packages/app/scripts/deploy.js
 
 ################################
 # Workflows
@@ -334,3 +356,23 @@ workflows:
             - typecheck
             # - test-integrations
             - test-jest
+      - deploy-production-approval:
+          type: approval
+          filters:
+            branches:
+              only:
+                - master
+      - deploy-to-production:
+          requires:
+            - deploy-production-approval
+            - create-docker-image
+          filters:
+            branches:
+              only:
+                - master
+      - deploy-staging-approval:
+          type: approval
+      - deploy-to-staging:
+          requires:
+            - deploy-staging-approval
+            - create-docker-image

.eslintrc

@@ -27,19 +27,7 @@
     "import/no-cycle": "warn",
     "react/prop-types": 0,
     "arrow-parens": 0,
-    "prefer-destructuring": [
-      "error",
-      {
-        "VariableDeclarator": {
-          "array": false,
-          "object": true
-        },
-        "AssignmentExpression": {
-          "array": false,
-          "object": false
-        }
-      }
-    ],
+    "prefer-destructuring": 0,
     "no-async-promise-executor": "warn",
     "import/prefer-default-export": 0,
     "class-methods-use-this": 0,

README.md

@@ -1,10 +1,22 @@
-# [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/)
+<p align="center">
+  <a href="https://codesandbox.io">
+    <img src="https://user-images.githubusercontent.com/1863771/68405395-5020f400-0180-11ea-8818-8cb255d9fe71.png" height="200px">
+  </a>
+</p>
+
+&nbsp;
+
+[![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/)
 
 [![Backers on Open Collective](https://opencollective.com/codesandbox/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/codesandbox/sponsors/badge.svg)](#sponsors)
 
-![Banner](https://codesandbox.io/static/img/banner.png)
-
 An online code editor tailored for web applications.
 
 This project was bootstrapped with
@@ -240,6 +252,7 @@ Thanks goes to these wonderful people
     <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>
     <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>
     <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>
+    <td align="center"><a href="https://github.com/22PoojaGaur"><img src="https://avatars2.githubusercontent.com/u/43316760?v=4" width="100px;" alt="Pooja Gaur"/><br /><sub><b>Pooja Gaur</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=22PoojaGaur" title="Code">💻</a></td>
   </tr>
 </table>
 

package.json

@@ -85,9 +85,9 @@
     "husky": "^2.2.0",
     "lerna": "^3.16.4",
     "lint-staged": "^9.2.5",
-    "prettier": "1.17.0",
+    "prettier": "1.19.0",
     "pretty-quick": "^1.10.0",
-    "typescript": "3.6.3",
+    "typescript": "3.7.2",
     "username": "^5.1.0"
   },
   "husky": {

packages/app/config/build.js

@@ -29,6 +29,13 @@ const staticAssets = [
     from: 'packages/app/static',
     to: 'static',
   },
+  {
+    from: isDev
+      ? 'standalone-packages/codesandbox-browserfs/build'
+      : 'standalone-packages/codesandbox-browserfs/dist',
+    to: 'static/browserfs6',
+  },
+  // For caching purposes
   {
     from: isDev
       ? 'standalone-packages/codesandbox-browserfs/build'

packages/app/integration-tests/browser-tests/browsers.test.js

@@ -4,6 +4,13 @@ const hash = require('child_process')
   .execSync('git rev-parse --short HEAD')
   .toString();
 
+const delay = ms =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+
 function getCapabilities(browserInfo) {
   return {
     ...browserInfo,
@@ -77,8 +84,13 @@ usedDescribe('browser-tests', () => {
         os_version: '10',
         resolution: '1024x768',
       };
-
-      await testPageWitCapabilities(capabilities);
+      try {
+        await testPageWitCapabilities(capabilities);
+      } catch (e) {
+        await delay(10000);
+        // Retry
+        await testPageWitCapabilities(capabilities);
+      }
     }, 130000);
 
     test('safari', async () => {
@@ -90,8 +102,13 @@ usedDescribe('browser-tests', () => {
         os_version: 'High Sierra',
         resolution: '1024x768',
       };
-
-      await testPageWitCapabilities(capabilities);
+      try {
+        await testPageWitCapabilities(capabilities);
+      } catch (e) {
+        await delay(10000);
+        // Retry
+        await testPageWitCapabilities(capabilities);
+      }
     }, 130000);
 
     test.skip('android', async () => {

packages/app/package.json

@@ -129,6 +129,7 @@
     "http-browserify": "^1.7.0",
     "https-browserify": "^1.0.0",
     "humps": "CompuIves/humps",
+    "ignore": "^5.1.4",
     "immer": "^3.2.0",
     "immutability-helper": "^2.6.6",
     "instantsearch.css": "^7.1.0",
@@ -159,7 +160,7 @@
     "overmind": "^20.1.0-1572182984474",
     "overmind-devtools": "^19.0.0",
     "overmind-react": "^21.1.0-1572182984474",
-    "phoenix": "^1.3.0",
+    "phoenix": "^1.4.11",
     "postcss": "^6.0.9",
     "postcss-selector-parser": "^2.2.3",
     "posthtml": "^0.11.3",
@@ -311,7 +312,7 @@
     "terser": "^4.1.4",
     "terser-webpack-plugin": "^1.4.1",
     "thread-loader": "^2.1.2",
-    "typescript": "3.6.3",
+    "typescript": "3.7.2",
     "url-loader": "1.0.1",
     "webpack": "^4.36.1",
     "webpack-bundle-analyzer": "^2.13.1",

packages/app/scripts/deploy.js

@@ -0,0 +1,34 @@
+const fetch = require('cross-fetch');
+
+fetch('https://deployment-api.lbogdan.ro/image', {
+  method: 'POST',
+  headers: {
+    'Content-Type': 'application/json',
+    Authorization: `Bearer ${process.env.DEPLOY_TOKEN}`,
+  },
+  body: JSON.stringify({
+    env: process.env.ENVIRONMENT,
+    image: 'client',
+    tag: process.env.CIRCLE_SHA1.substr(0, 7),
+    deploy: true,
+  }),
+})
+  .then(x => {
+    if (!x.ok) {
+      return x.json().then(res => {
+        console.error(res);
+        throw new Error('Request failed');
+      });
+    }
+
+    return x.json();
+  })
+  .then(res => {
+    // eslint-disable-next-line
+    console.log(res);
+    process.exit(0);
+  })
+  .catch(e => {
+    console.error(e);
+    process.exit(1);
+  });

packages/app/scripts/sentry-create-release.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 const childProcess = require('child_process');
 const VERSION = require('@codesandbox/common/lib/version').default;
 
@@ -12,7 +13,7 @@ try {
     `yarn sentry-cli releases --org=codesandbox -p frontend new "${VERSION}"`
   );
   childProcess.execSync(
-    `yarn sentry-cli releases --org=codesandbox set-commits "${VERSION}" --commit "CompuIves/codesandbox-client@${COMMIT_HASH}"`
+    `yarn sentry-cli releases --org=codesandbox set-commits "${VERSION}" --commit "codesandbox/codesandbox-client@${COMMIT_HASH}"`
   );
   console.log('Marked release');
 } catch (e) {