Merge branch 'master' into improve/sandbox-load-time

Author: CompuIves

.circleci/config.yml

@@ -26,12 +26,12 @@ aliases:
 
   - &restore_deps_cache
     keys:
-      - v33-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - v33-dependency-cache-{{ .Branch }}
-      - v33-dependency-cache
+      - v34-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - v34-dependency-cache-{{ .Branch }}
+      - v34-dependency-cache
 
   - &save_deps_cache
-    key: v33-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+    key: v34-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
     paths:
       - node_modules
       - packages/app/node_modules
@@ -51,51 +51,51 @@ aliases:
 
   - &restore_standalone_deps_cache
     keys:
-      - v33-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      - v34-standalone-dependency-cache-{{ .Branch }}-{{ checksum
         "standalone-packages/codesandbox-browserfs/yarn.lock" }}
-      - v33-standalone-dependency-cache-{{ .Branch }}
-      - v33-standalone-dependency-cache
+      - v34-standalone-dependency-cache-{{ .Branch }}
+      - v34-standalone-dependency-cache
 
   - &save_standalone_deps_cache
     key:
-      v33-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      v34-standalone-dependency-cache-{{ .Branch }}-{{ checksum
       "standalone-packages/codesandbox-browserfs/yarn.lock" }}
     paths:
       - standalone-packages/codesandbox-browserfs/node_modules
 
   - &restore_prod_homepage_cache
-    key: v33-prod-homepage-build-cache-master
+    key: v34-prod-homepage-build-cache-master
 
   - &restore_prod_result
     key:
-      v33-prod-build-result-{{ .Environment.CIRCLE_BRANCH
+      v34-prod-build-result-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
 
   - &save_prod_build_cache
     key:
-      v33-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      v34-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
     paths:
       - packages/app/node_modules/.cache
 
   - &restore_prod_build_cache
     keys:
-      - v33-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      - v34-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
         }}-{{.Environment.CIRCLE_SHA1 }}
-      - v33-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
-      - v33-prod-build-cache-master-
+      - v34-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
+      - v34-prod-build-cache-master-
 
   # To persist the images built by sharp
   - &save_prod_homepage_cache
     key:
-      v33-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v34-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./packages/homepage/public
 
   - &save_prod_result
     key:
-      v33-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v34-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./www
@@ -136,14 +136,14 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v33-source-cache-{{ .Branch }}-{{ .Revision }}
-            - v33-source-cache-{{ .Branch }}-
-            - v33-source-cache-
+            - v34-source-cache-{{ .Branch }}-{{ .Revision }}
+            - v34-source-cache-{{ .Branch }}-
+            - v34-source-cache-
 
       - checkout
 
       - save_cache:
-          key: v33-source-cache-{{ .Branch }}-{{ .Revision }}
+          key: v34-source-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - '.git'
   build_deps:

.drone.yml

@@ -26,7 +26,7 @@ steps:
       - yarn build
 
   - name: deploy
-    image: lbogdan/codesandbox-deploy-plugin:3
+    image: lbogdan/codesandbox-deploy-plugin:4
     settings:
       domain: &domain build.csb.dev
     volumes:
@@ -124,7 +124,7 @@ steps:
       - yarn build
 
   - name: deploy
-    image: lbogdan/codesandbox-deploy-plugin:2
+    image: lbogdan/codesandbox-deploy-plugin:4
     settings:
       domain: &domain build.csb.dev
     volumes:
@@ -177,6 +177,6 @@ trigger:
   branch: master
 ---
 kind: signature
-hmac: e625eaf2e469b9b6763641d4cc1f089900ef8d8c41db32c6f6aacb27bee8c19c
+hmac: a229340365980b689bbe4c5f92d721cf3b6ce176670293a925f329501a054fe4
 
 ...

.vscode/settings.json

@@ -6,5 +6,9 @@
     "javascriptreact",
     { "language": "typescript", "autoFix": true },
     { "language": "typescriptreact", "autoFix": true }
-  ]
+  ],
+  "files.watcherExclude": {
+    "**/node_modules": true,
+    "**/node_modules/**": false
+  }
 }

packages/app/package.json

@@ -86,6 +86,7 @@
     "apollo-boost": "^0.4.4",
     "apollo-link-batch-http": "^1.2.12",
     "apollo-link-context": "^1.0.18",
+    "astring": "^1.4.3",
     "axios": "^0.19.0",
     "babel-code-frame": "^6.26.0",
     "babel-macros": "^2.0.0",
@@ -115,6 +116,7 @@
     "downshift": "^1.0.0-rc.14",
     "eslint-plugin-react-hooks": "1.6.0",
     "eslint-plugin-vue": "^4.2.2",
+    "estree-walker": "^1.0.1",
     "file-saver": "^1.3.3",
     "fontfaceobserver": "^2.0.13",
     "fuse.js": "^3.2.1",
@@ -146,6 +148,7 @@
     "lodash-es": "^4.17.2",
     "lru-cache": "^4.1.3",
     "match-sorter": "^1.8.1",
+    "meriyah": "^1.9.7",
     "minimatch": "^3.0.4",
     "mobx": "^5.11.0",
     "mobx-react": "^6.1.1",
@@ -158,9 +161,9 @@
     "normalizr": "^3.2.3",
     "onigasm": "^2.2.1",
     "ot": "^0.0.15",
-    "overmind": "^21.0.0-1576231149763",
+    "overmind": "^22.0.0-1579617484651",
     "overmind-devtools": "^19.0.0",
-    "overmind-react": "^22.0.0-1576231149763",
+    "overmind-react": "^23.0.0-1579617484651",
     "phoenix": "^1.4.11",
     "postcss": "^6.0.9",
     "postcss-selector-parser": "^2.2.3",
@@ -214,6 +217,7 @@
     "subworkers": "^1.0.1",
     "svg-react-loader": "^0.4.4",
     "tern": "^0.21.0",
+    "use-interval": "^1.2.1",
     "util": "0.11.1",
     "vue": "^2.5.2",
     "vue-eslint-parser": "^2.0.3",

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

@@ -46,12 +46,18 @@ export default {
 
     return response.token;
   },
-  createPatronSubscription(token: string, amount: number, coupon: string) {
+  createPatronSubscription(
+    token: string,
+    amount: number,
+    duration: 'monthly' | 'yearly',
+    coupon: string
+  ) {
     return api.post<CurrentUser>('/users/current_user/subscription', {
       subscription: {
         amount,
         coupon,
         token,
+        duration,
       },
     });
   },

packages/app/src/app/overmind/effects/flows.ts

@@ -0,0 +1,23 @@
+import { ResolveState } from 'overmind';
+import { Reaction, Config } from '..';
+
+export default (() => {
+  let _reaction: Reaction;
+
+  return {
+    initialize(reaction: Reaction) {
+      _reaction = reaction;
+    },
+    waitUntil(
+      test: (state: ResolveState<Config['state']>) => boolean
+    ): Promise<boolean> {
+      return new Promise(resolve => {
+        _reaction(test, bool => {
+          if (bool === true) {
+            resolve();
+          }
+        });
+      });
+    },
+  };
+})();

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

@@ -25,3 +25,4 @@ export { default as executor } from './executor';
 export { default as stripe } from './stripe';
 export { default as jwt } from './jwt';
 export { default as preview } from './preview';
+export { default as flows } from './flows';

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

@@ -195,6 +195,11 @@ export default {
       this.send('live:module_state', {});
     }
   },
+  sendExternalResourcesChanged(externalResources: string[]) {
+    return this.send('sandbox:external-resources', {
+      externalResources,
+    });
+  },
   sendUserCurrentModule(moduleShortid: string) {
     return this.send('user:current-module', {
       moduleShortid,

packages/app/src/app/overmind/effects/notificationToast.ts

@@ -10,7 +10,10 @@ import {
 export default {
   convertTypeToStatus,
   add(notification: NotificationMessage) {
-    notificationState.addNotification(notification);
+    return notificationState.addNotification(notification);
+  },
+  remove(id: string) {
+    notificationState.removeNotification(id);
   },
   error(message: string) {
     notificationState.addNotification({