merge and fix VIM

Author: christianalfoni

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
@@ -246,6 +258,7 @@ Thanks goes to these wonderful people
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## Backers

packages/app/package.json

@@ -126,6 +126,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",

packages/app/src/app/components/Preview/DevTools/Console/index.tsx

@@ -180,7 +180,11 @@ class ConsoleComponent extends React.Component<StyledProps> {
             method: 'log',
             data: [
               '%cConsole was cleared',
-              'font-style: italic; color: rgba(255, 255, 255, 0.3)',
+              `font-style: italic; color: ${
+                this.props.theme.vscodeTheme.type === 'light'
+                  ? 'rgba(0, 0, 0, 0.3)'
+                  : 'rgba(255, 255, 255, 0.3)'
+              }`,
             ],
           },
         ];

packages/app/src/app/components/Preview/DevTools/Tabs/Tab/UnreadDevToolsCount.tsx

@@ -14,10 +14,12 @@ const Container = styled.div<{ unread: number; status: StatusType }>`
   height: 16px;
   width: 16px;
   color: ${({ unread }) =>
-    unread === 0 ? `rgba(255, 255, 255, 0.4)` : 'white'};
+    unread === 0 ? 'rgba(255, 255, 255, 0.4)' : 'white'};
   background-color: ${({ status, unread, theme }) => {
     if (unread === 0) {
-      return 'rgba(255, 255, 255, 0.2)';
+      return theme.vscodeTheme.type === 'dark'
+        ? 'rgba(255, 255, 255, 0.2)'
+        : 'rgba(0, 0, 0, 0.2)';
     }
     if (status === 'info') {
       return theme.secondary();

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

@@ -1,5 +1,6 @@
 import track, {
   identify,
+  setAnonymousId,
   setUserId,
 } from '@codesandbox/common/lib/utils/analytics';
 
@@ -16,6 +17,7 @@ export default (() => {
       track(event, data);
     },
     identify,
+    setAnonymousId,
     setUserId,
   };
 })();

packages/app/src/app/overmind/effects/git/export-to-github.ts

@@ -9,7 +9,8 @@ export default async function deploy(sandbox: Sandbox) {
     sandbox,
     sandbox.modules,
     sandbox.directories,
-    false
+    false,
+    true
   );
 
   if (!zipFile) {

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

@@ -4,7 +4,6 @@ export { default as api } from './api';
 export { default as browser } from './browser';
 export { default as connection } from './connection';
 export { default as jsZip } from './jsZip';
-export { default as jwt } from './jwt';
 export { default as keybindingManager } from './keybindingManager';
 export { default as live } from './live';
 export { default as moduleRecover } from './moduleRecover';
@@ -24,4 +23,4 @@ export { default as codesandboxApi } from './codesandboxApi';
 export { default as themes } from './themes';
 export { default as executor } from './executor';
 export { default as stripe } from './stripe';
-export { default as chameleon } from './chameleon';
+export { default as jwt } from './jwt';

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

@@ -120,15 +120,25 @@ export class VSCodeEffect {
     // It will only load the editor once. We should probably call this
     const container = this.elements.editor;
 
-    this.initialized = Promise.all([
-      new FontFaceObserver('dm').load(),
-      new Promise(resolve => {
-        loadScript(true, ['vs/editor/codesandbox.editor.main'])(resolve);
-      }),
-      sandboxFsSync.initialize({
+    this.initialized = sandboxFsSync
+      .initialize({
         getSandboxFs: options.getSandboxFs,
-      }),
-    ]).then(() => this.loadEditor(window.monaco, container));
+      })
+      .then(() => {
+        // We want to initialize before VSCode, but after browserFS is configured
+        // For first-timers initialize a theme in the cache so it doesn't jump colors
+        initializeExtensionsFolder();
+        initializeCustomTheme();
+        initializeThemeCache();
+        initializeSettings();
+
+        return Promise.all([
+          new FontFaceObserver('dm').load(),
+          new Promise(resolve => {
+            loadScript(true, ['vs/editor/codesandbox.editor.main'])(resolve);
+          }),
+        ]).then(() => this.loadEditor(window.monaco, container));
+      });
 
     return this.initialized;
   }
@@ -396,12 +406,6 @@ export class VSCodeEffect {
     this.monaco = monaco;
     this.workbench = new Workbench(monaco, this.controller, this.runCommand);
 
-    // For first-timers initialize a theme in the cache so it doesn't jump colors
-    initializeExtensionsFolder();
-    initializeCustomTheme();
-    initializeThemeCache();
-    initializeSettings();
-
     if (localStorage.getItem('settings.vimmode') === 'true') {
       this.enableExtension(VIM_EXTENSION_ID);
     }

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

@@ -45,7 +45,6 @@ export default function createZip(
     await Promise.all(
       modules
         .filter(x => x.directoryShortid == null)
-        .filter(x => x.title !== 'yarn.lock' && x.title !== 'package-lock.json')
         .map(x => {
           if (x.title === 'package.json' && x.directoryShortid == null) {
             return createFile(alterPackageJSON(x), src);