Merge branch 'master' into vscodeeffect

Author: CompuIves

.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

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.18.2",
     "pretty-quick": "^1.10.0",
-    "typescript": "3.6.3",
+    "typescript": "3.7.1-rc",
     "username": "^5.1.0"
   },
   "husky": {

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

@@ -311,7 +311,7 @@
     "terser": "^4.1.4",
     "terser-webpack-plugin": "^1.4.1",
     "thread-loader": "^2.1.2",
-    "typescript": "3.6.3",
+    "typescript": "3.7.1-rc",
     "url-loader": "1.0.1",
     "webpack": "^4.36.1",
     "webpack-bundle-analyzer": "^2.13.1",

packages/app/scripts/deploy.js

@@ -0,0 +1,31 @@
+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) {
+      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

@@ -12,7 +12,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) {

packages/app/src/app/index.js

@@ -17,7 +17,6 @@ import {
   notificationState,
 } from '@codesandbox/common/lib/utils/notifications';
 import { isSafari } from '@codesandbox/common/lib/utils/platform';
-import { NotificationStatus } from '@codesandbox/notifications';
 import { client } from 'app/graphql/client';
 import history from 'app/utils/history';
 import { createOvermind } from 'overmind';
@@ -98,23 +97,8 @@ overmind.initialized.then(() => {
     registerServiceWorker('/service-worker.js', {
       onUpdated: () => {
         debug('Updated SW');
-        window.getSignal('setUpdateStatus')({ status: 'available' });
 
-        notificationState.addNotification({
-          title: 'CodeSandbox Update Available',
-          message:
-            'We just installed a new version of CodeSandbox, refresh to update!',
-          status: NotificationStatus.SUCCESS,
-          sticky: true,
-          actions: {
-            primary: [
-              {
-                run: () => document.location.reload(),
-                label: 'Reload Page',
-              },
-            ],
-          },
-        });
+        window.getSignal('setUpdateStatus')({ status: 'available' });
       },
       onInstalled: () => {
         debug('Installed SW');

packages/app/src/app/overmind/actions.ts

@@ -157,7 +157,7 @@ export const signInZeitClicked: AsyncAction = async ({
 };
 
 export const signOutZeitClicked: AsyncAction = async ({ state, effects }) => {
-  await effects.http.delete(`/users/current_user/integrations/zeit`);
+  await effects.api.signoutZeit();
   state.user.integrations.zeit = null;
 };
 

packages/app/src/app/overmind/effects/api/index.ts

@@ -432,6 +432,9 @@ export default {
   signoutGithubIntegration(): Promise<void> {
     return api.delete(`/users/current_user/integrations/github`);
   },
+  signoutZeit(): Promise<void> {
+    return api.delete(`/users/current_user/integrations/zeit`);
+  },
   preloadTemplates() {
     client.query({ query: LIST_TEMPLATES, variables: { showAll: true } });
   },

packages/app/src/app/pages/Dashboard/Content/CreateNewSandbox/NewSandboxModal/Imports/GitHubImport.tsx

@@ -54,6 +54,15 @@ export const GitHubImport = () => {
     }
   }, []);
 
+  const handleKey = useCallback(
+    ({ key }) => {
+      if (key === 'Enter' && !error) {
+        window.location.href = gitHubToSandboxUrl(url);
+      }
+    },
+    [error, url]
+  );
+
   return (
     <Section style={{ flex: 6 }}>
       <ImportHeader>
@@ -76,6 +85,7 @@ export const GitHubImport = () => {
         placeholder="GitHub Repository URL..."
         onChange={updateUrl}
         value={url}
+        onKeyDown={handleKey}
       />
 
       {transformedUrl ? (