Merge branch 'master' of github.com:codesandbox/codesandbox-client into notifications-a11y

Author: SaraVieira

.all-contributorsrc

@@ -1359,6 +1359,15 @@
         "code"
       ]
     },
+    {
+      "login": "HTMLGhozt",
+      "name": "Thomas Dillard",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/12449668?v=4",
+      "profile": "http://ThomasDillard.com",
+      "contributions": [
+        "code"
+      ]
+     },
     {
       "login": "chinmay17",
       "name": "Chinmay Chaudhary",
@@ -1376,8 +1385,117 @@
       "contributions": [
         "code"
       ]
+    },
+    {      "login": "NabeelahY",
+      "name": "Nabeelah",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/35764602?v=4",
+      "profile": "https://github.com/NabeelahY",
+            "contributions": [
+        "code"
+      ]
+      },
+    {
+      "login": "vanya829",
+      "name": "vanya829",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1397979?v=4",
+      "profile": "https://github.com/vanya829",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tanem",
+      "name": "Tane Morgan",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/464864?v=4",
+      "profile": "https://github.com/tanem",
+       "contributions": [
+        "code"
+       ]
+     },
+    {
+      "login": "hetpatel33",
+      "name": "Het Patel",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13877514?v=4",
+      "profile": "http://hetpatel33.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+    "login": "ivandevp",
+      "name": "Ivan Medina",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/9284690?v=4",
+      "profile": "https://twitter.com/ivandevp",
+            "contributions": [
+        "code"
+      ]
+      },
+    {
+      "login": "Gobinath-Manokaran",
+      "name": "Gobinath-Manokaran",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6711914?v=4",
+      "profile": "https://github.com/Gobinath-Manokaran",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "armujahid",
+      "name": "Abdul Rauf",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3725386?v=4",
+      "profile": "https://armujahid.me",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "milap1296",
+      "name": "milap1296",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/19545730?v=4",
+      "profile": "https://github.com/milap1296",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yevhenorlov",
+      "name": "yevhen orlov",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/17388747?v=4",
+      "profile": "http://yevhenorlov.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NileshPatel17",
+      "name": "Nilesh Patel",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/27020381?v=4",
+      "profile": "https://github.com/NileshPatel17",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "22PoojaGaur",
+      "name": "Pooja Gaur",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/43316760?v=4",
+      "profile": "https://github.com/22PoojaGaur",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sajadhsm",
+      "name": "Sajad Hashemian",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/20022818?v=4",
+      "profile": "https://github.com/sajadhsm",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
-  "commitConvention": "none"
+  "commitConvention": "none",
+  "skipCi": true
 }

.circleci/config.yml

@@ -25,12 +25,12 @@ aliases:
 
   - &restore_deps_cache
     keys:
-      - v28-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - v28-dependency-cache-{{ .Branch }}
-      - v28-dependency-cache
+      - v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - v30-dependency-cache-{{ .Branch }}
+      - v30-dependency-cache
 
   - &save_deps_cache
-    key: v28-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+    key: v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
     paths:
       - node_modules
       - packages/app/node_modules
@@ -49,51 +49,51 @@ aliases:
 
   - &restore_standalone_deps_cache
     keys:
-      - v28-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      - v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
         "standalone-packages/codesandbox-browserfs/yarn.lock" }}
-      - v28-standalone-dependency-cache-{{ .Branch }}
-      - v28-standalone-dependency-cache
+      - v30-standalone-dependency-cache-{{ .Branch }}
+      - v30-standalone-dependency-cache
 
   - &save_standalone_deps_cache
     key:
-      v28-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
       "standalone-packages/codesandbox-browserfs/yarn.lock" }}
     paths:
       - standalone-packages/codesandbox-browserfs/node_modules
 
   - &restore_prod_homepage_cache
-    key: v28-prod-homepage-build-cache-master
+    key: v30-prod-homepage-build-cache-master
 
   - &restore_prod_result
     key:
-      v28-prod-build-result-{{ .Environment.CIRCLE_BRANCH
+      v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
 
   - &save_prod_build_cache
     key:
-      v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
     paths:
       - packages/app/node_modules/.cache
 
   - &restore_prod_build_cache
     keys:
-      - v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      - v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
         }}-{{.Environment.CIRCLE_SHA1 }}
-      - v28-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
-      - v28-prod-build-cache-master-
+      - v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
+      - v30-prod-build-cache-master-
 
   # To persist the images built by sharp
   - &save_prod_homepage_cache
     key:
-      v28-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v30-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./packages/homepage/public
 
   - &save_prod_result
     key:
-      v28-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./www
@@ -134,14 +134,14 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v28-source-cache-{{ .Branch }}-{{ .Revision }}
-            - v28-source-cache-{{ .Branch }}-
-            - v28-source-cache-
+            - v30-source-cache-{{ .Branch }}-{{ .Revision }}
+            - v30-source-cache-{{ .Branch }}-
+            - v30-source-cache-
 
       - checkout
 
       - save_cache:
-          key: v28-source-cache-{{ .Branch }}-{{ .Revision }}
+          key: v30-source-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - '.git'
   build_deps:
@@ -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:
@@ -251,6 +245,9 @@ commands:
           command:
             '[ -n "<< parameters.user >>" ] && echo << parameters.password >> |
             docker login -u << parameters.user >> --password-stdin || true'
+      - run:
+          name: Create DockerIgnore
+          command: echo '**\n!www' > .dockerignore
       - run:
           name: Create Image
           command:
@@ -279,6 +276,7 @@ jobs:
       - build_prod
   test-integrations:
     executor: node-with-puppeteer
+    parallelism: 2
     steps:
       - checkout_with_cache
       - test_integrations
@@ -301,6 +299,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
@@ -333,3 +359,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

.dockerignore

@@ -1,2 +1,30 @@
-*
-!www
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+# we use yarn
+package-lock.json
+
+/integration-tests/**/__diff_output__
+
+# testing
+coverage
+
+# production
+build
+www
+.deliver
+
+# misc
+.DS_Store
+npm-debug.log
+yarn-error.log
+.idea
+jest
+
+lerna-debug.log
+
+standalone-packages/monaco-editor-core
+
+.next
+.cache-loader