merge

Author: christianalfoni

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/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/graphql/schema.graphql

@@ -1,5 +1,5 @@
 # source: https://codesandbox.stream/api/graphql
-# timestamp: Thu Apr 16 2020 12:44:25 GMT+0200 (Central European Summer Time)
+# timestamp: Thu Apr 16 2020 14:09:56 GMT+0200 (Central European Summer Time)
 
 schema {
   query: RootQuery

packages/app/src/app/graphql/types.ts

@@ -1016,6 +1016,16 @@ export type CommentRemovedSubscription = {
   } & CommentFragment;
 };
 
+export type TeamsQueryVariables = {};
+
+export type TeamsQuery = { __typename?: 'RootQueryType' } & {
+  me: Maybe<
+    { __typename?: 'CurrentUser' } & {
+      teams: Array<{ __typename?: 'Team' } & Pick<Team, 'id' | 'name'>>;
+    }
+  >;
+};
+
 export type UnbookmarkTemplateFromDashboardMutationVariables = {
   template: Scalars['ID'];
   teamId: Maybe<Scalars['ID']>;

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

@@ -247,11 +247,10 @@ export const refetchSandboxInfo: AsyncAction = async ({
 export const acceptTeamInvitation: Action<{
   teamName: string;
   teamId: string;
-}> = ({ effects }, { teamName, teamId }) => {
+}> = ({ effects, actions }, { teamName }) => {
   effects.analytics.track('Team - Invitation Accepted', {});
 
-  effects.analytics.setGroup('teamName', teamName);
-  effects.analytics.setGroup('teamId', teamId);
+  actions.internal.trackCurrentTeams();
 
   effects.notificationToast.success(`Accepted invitation to ${teamName}`);
 };

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

@@ -6,6 +6,7 @@ import * as collaboratorsSubscriptions from './collaborators/subscriptions';
 import * as commentsMutations from './comments/mutations';
 import * as commentsQueries from './comments/queries';
 import * as commentSubscriptions from './comments/subscriptions';
+import * as teamsQueries from './teams/queries';
 
 export default graphql({
   subscriptions: {
@@ -15,6 +16,7 @@ export default graphql({
   queries: {
     ...collaboratorsQueries,
     ...commentsQueries,
+    ...teamsQueries,
   },
   mutations: {
     ...collaboratorsMutations,

packages/app/src/app/overmind/effects/gql/teams/queries.ts

@@ -0,0 +1,14 @@
+import { TeamsQuery, TeamsQueryVariables } from 'app/graphql/types';
+import gql from 'graphql-tag';
+import { Query } from 'overmind-graphql';
+
+export const teams: Query<TeamsQuery, TeamsQueryVariables> = gql`
+  query Teams {
+    me {
+      teams {
+        id
+        name
+      }
+    }
+  }
+`;

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

@@ -21,7 +21,7 @@ import { appendFile, mkdir, rename, rmdir, unlink, writeFile } from './utils';
 
 const global = getGlobal() as Window & { BrowserFS: any };
 
-const SERVICE_URL = 'https://ata-fetcher.cloud/api/v5/typings';
+const SERVICE_URL = 'https://ata.codesandbox.io/api/v8';
 
 declare global {
   interface Window {
@@ -395,7 +395,8 @@ class SandboxFsSync {
   }
 
   private async fetchDependencyTypingFiles(name: string, version: string) {
-    const fetchRequest = await fetch(`${SERVICE_URL}/${name}@${version}.json`);
+    const dependencyQuery = encodeURIComponent(`${name}@${version}`);
+    const fetchRequest = await fetch(`${SERVICE_URL}/${dependencyQuery}.json`);
 
     if (!fetchRequest.ok) {
       throw new Error('Fetch error');

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

@@ -1,6 +1,8 @@
 import JSON5 from 'json5';
 import codeSandboxTheme from '@codesandbox/common/lib/themes/codesandbox.json';
 import codeSandboxBlackTheme from '@codesandbox/common/lib/themes/codesandbox-black';
+import { notificationState } from '@codesandbox/common/lib/utils/notifications';
+import { NotificationStatus } from '@codesandbox/notifications';
 
 export function initializeThemeCache() {
   try {
@@ -174,7 +176,25 @@ export function initializeCustomTheme() {
   const customTheme = localStorage.getItem('settings.manualCustomVSCodeTheme');
 
   if (customTheme) {
-    installCustomTheme('custom', 'Custom Theme', customTheme);
+    try {
+      installCustomTheme('custom', 'Custom Theme', JSON.parse(customTheme));
+    } catch (e) {
+      notificationState.addNotification({
+        title: 'Something went wrong while installing the custom extension',
+        message: e.message,
+        status: NotificationStatus.ERROR,
+        actions: {
+          primary: [
+            {
+              label: 'Clear Custom Theme',
+              run: () => {
+                localStorage.removeItem('settings.manualCustomVSCodeTheme');
+              },
+            },
+          ],
+        },
+      });
+    }
   }
 }