Merge branch 'master' into A-B-Homepage

Author: DannyRuchtie

.all-contributorsrc

@@ -1531,6 +1531,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "johansenja",
+      "name": "johansenja",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/43235608?v=4",
+      "profile": "https://github.com/johansenja",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.circleci/config.yml

@@ -214,13 +214,13 @@ commands:
             JEST_JUNIT_OUTPUT: '/tmp/test-results/js-test-results.xml'
       - store_test_results: *store_test_results
       - store_artifacts: *store_artifacts
-  test_visual_regressions:
-    description: "Test Chromatic with 'yarn chromatic'"
-    steps:
-      - restore_cache: *restore_deps_cache
-      - attach_workspace: *attach_deps_workspace
-      - run:
-          command: yarn chromatic
+  # test_visual_regressions:
+  #   description: "Test Chromatic with 'yarn chromatic'"
+  #   steps:
+  #     - restore_cache: *restore_deps_cache
+  #     - attach_workspace: *attach_deps_workspace
+  #     - run:
+  #         command: yarn chromatic
   test_jest:
     description: 'Test with `yarn test`'
     steps:
@@ -298,11 +298,11 @@ jobs:
     steps:
       - checkout_with_cache
       - test_integrations
-  test-visual-regressions:
-    executor: node
-    steps:
-      - checkout_with_cache
-      - test_visual_regressions
+  # test-visual-regressions:
+  #   executor: node
+  #   steps:
+  #     - checkout_with_cache
+  #     - test_visual_regressions
   test-jest:
     executor: node
     steps:
@@ -363,9 +363,9 @@ workflows:
       - test-integrations:
           requires:
             - build-deps
-      - test-visual-regressions:
-          requires:
-            - build-deps
+      # - test-visual-regressions:
+      #     requires:
+      #       - build-deps
       - typecheck:
           requires:
             - build-deps
@@ -389,6 +389,7 @@ workflows:
             - typecheck
             - test-integrations
             - test-jest
+            # - test-visual-regressions
           filters:
             branches:
               only:

README.md

@@ -251,6 +251,7 @@ Thanks goes to these wonderful people
   <tr>
     <td align="center"><a href="http://mcmunder.de"><img src="https://avatars3.githubusercontent.com/u/5681686?v=4" width="100px;" alt=""/><br /><sub><b>Matthias Christoph Munder</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/issues?q=author%3Amcmunder" title="Bug reports">🐛</a> <a href="https://github.com/codesandbox/codesandbox-client/commits?author=mcmunder" title="Code">💻</a></td>
     <td align="center"><a href="http://anuraghazra.github.io"><img src="https://avatars3.githubusercontent.com/u/35374649?v=4" width="100px;" alt=""/><br /><sub><b>Anurag Hazra</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=anuraghazra" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/johansenja"><img src="https://avatars1.githubusercontent.com/u/43235608?v=4" width="100px;" alt=""/><br /><sub><b>johansenja</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=johansenja" title="Documentation">📖</a></td>
   </tr>
 </table>
 

contributor-docs/adding-template.md

@@ -148,7 +148,7 @@ preset.
 
 We call a template configuration for the bundler in CodeSandbox a 'Preset'. All
 currently installed presets are defined in the
-[index.ts](https://github.com/codesandbox/codesandbox-client/blob/master/packages/app/src/sandbox/eval/index.js)
+[index.ts](https://github.com/codesandbox/codesandbox-client/blob/master/packages/app/src/sandbox/eval/index.ts)
 file under `codesandbox-client/packages/app/src/sandbox/eval/presets`.
 
 In order to understand how this configuration works, we recommend you to take a

packages/app/config/webpack.common.js

@@ -138,6 +138,7 @@ module.exports = {
           path.join(paths.sandboxSrc, 'index.js'),
         ],
         'sandbox-startup': path.join(paths.sandboxSrc, 'startup.js'),
+        'watermark-button': path.join(paths.src, 'watermark-button.js'),
         embed: [
           require.resolve('./polyfills'),
           path.join(paths.embedSrc, 'index.js'),

packages/app/package.json

@@ -222,6 +222,7 @@
     "subworkers": "^1.0.1",
     "svg-react-loader": "^0.4.4",
     "tern": "^0.21.0",
+    "textextensions": "^3.3.0",
     "use-interval": "^1.2.1",
     "util": "0.11.1",
     "vue": "^2.5.2",

packages/app/public/manifest.json

@@ -49,7 +49,7 @@
     }
   ],
   "description": "An online editor tailored for web applications",
-  "start_url": "/s/?utm_source=homescreen",
+  "start_url": "/dashboard?utm_source=homescreen",
   "scope": "/s/",
   "display": "standalone",
   "background_color": "#1C2022",

packages/app/src/app/components/CodeEditor/VSCode/Configuration/index.tsx

@@ -1,4 +1,6 @@
 import { ConfigurationFile } from '@codesandbox/common/lib/templates/configuration/types';
+import { withTheme } from 'styled-components';
+import { ThemeProvider } from '@codesandbox/components';
 import getUI from '@codesandbox/common/lib/templates/configuration/ui';
 import theme from '@codesandbox/common/lib/theme';
 import { Module } from '@codesandbox/common/lib/types';
@@ -23,9 +25,10 @@ type Props = EditorProps & {
   onChangeVSCode: (val: string) => void;
   onDispose: (cb: () => void) => void;
   openText: () => void;
+  theme: any;
 };
 
-export class Configuration extends React.PureComponent<Props>
+export class ConfigurationComponent extends React.PureComponent<Props>
   implements Editor {
   disposeInitializer: Function;
   currentModule: Module;
@@ -147,13 +150,16 @@ export class Configuration extends React.PureComponent<Props>
             More info...
           </a>
         </Description>
-
-        <ConfigWizard
-          sandbox={sandbox}
-          updateFile={this.updateFile}
-          file={this.props.getCode()}
-        />
+        <ThemeProvider theme={this.props.theme.vscodeTheme}>
+          <ConfigWizard
+            sandbox={sandbox}
+            updateFile={this.updateFile}
+            file={this.props.getCode()}
+          />
+        </ThemeProvider>
       </Container>
     );
   }
 }
+
+export const Configuration = withTheme(ConfigurationComponent);

packages/app/src/app/components/CodeEditor/VSCode/workbench-theme.css

@@ -234,3 +234,8 @@
 .context-view.monaco-menu-container {
   font-size: 0.75rem;
 }
+
+/* Fixes https://github.com/codesandbox/codesandbox-client/issues/3882 */
+.monaco-editor .parameter-hints-widget {
+  overflow-y: scroll;
+}

packages/app/src/app/components/CreateNewSandbox/CreateSandbox/Create/PersonalTemplates/FilteredTemplates.tsx

@@ -25,8 +25,8 @@ export const FilteredTemplates = ({
           threshold: 0.3,
           distance: 10,
           keys: [
-            { name: 'sandbox.title', weight: 0.5 },
-            { name: 'sandbox.description', weight: 0.5 },
+            { name: 'sandbox.title', weight: 0.3 },
+            { name: 'sandbox.description', weight: 0.25 },
             { name: 'sandbox.alias', weight: 0.2 },
             { name: 'sandbox.source.template', weight: 0.2 },
             { name: 'sandbox.id', weight: 0.05 },