Merge branch 'prototype-common-sync' into new-profiles

Author: Saeris

.circleci/config.yml

@@ -25,12 +25,12 @@ aliases:
 
   - &restore_deps_cache
     keys:
-      - v29-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - v29-dependency-cache-{{ .Branch }}
-      - v29-dependency-cache
+      - v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - v30-dependency-cache-{{ .Branch }}
+      - v30-dependency-cache
 
   - &save_deps_cache
-    key: v29-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
+    key: v30-dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
     paths:
       - node_modules
       - packages/app/node_modules
@@ -49,51 +49,51 @@ aliases:
 
   - &restore_standalone_deps_cache
     keys:
-      - v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      - v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
         "standalone-packages/codesandbox-browserfs/yarn.lock" }}
-      - v29-standalone-dependency-cache-{{ .Branch }}
-      - v29-standalone-dependency-cache
+      - v30-standalone-dependency-cache-{{ .Branch }}
+      - v30-standalone-dependency-cache
 
   - &save_standalone_deps_cache
     key:
-      v29-standalone-dependency-cache-{{ .Branch }}-{{ checksum
+      v30-standalone-dependency-cache-{{ .Branch }}-{{ checksum
       "standalone-packages/codesandbox-browserfs/yarn.lock" }}
     paths:
       - standalone-packages/codesandbox-browserfs/node_modules
 
   - &restore_prod_homepage_cache
-    key: v29-prod-homepage-build-cache-master
+    key: v30-prod-homepage-build-cache-master
 
   - &restore_prod_result
     key:
-      v29-prod-build-result-{{ .Environment.CIRCLE_BRANCH
+      v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
 
   - &save_prod_build_cache
     key:
-      v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
       }}-{{.Environment.CIRCLE_SHA1 }}
     paths:
       - packages/app/node_modules/.cache
 
   - &restore_prod_build_cache
     keys:
-      - v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
+      - v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH
         }}-{{.Environment.CIRCLE_SHA1 }}
-      - v29-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
-      - v29-prod-build-cache-master-
+      - v30-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-
+      - v30-prod-build-cache-master-
 
   # To persist the images built by sharp
   - &save_prod_homepage_cache
     key:
-      v29-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v30-prod-homepage-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./packages/homepage/public
 
   - &save_prod_result
     key:
-      v29-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
+      v30-prod-build-result-{{ .Environment.CIRCLE_BRANCH }}-{{
       .Environment.CIRCLE_SHA1 }}
     paths:
       - ./www
@@ -134,14 +134,14 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v29-source-cache-{{ .Branch }}-{{ .Revision }}
-            - v29-source-cache-{{ .Branch }}-
-            - v29-source-cache-
+            - v30-source-cache-{{ .Branch }}-{{ .Revision }}
+            - v30-source-cache-{{ .Branch }}-
+            - v30-source-cache-
 
       - checkout
 
       - save_cache:
-          key: v29-source-cache-{{ .Branch }}-{{ .Revision }}
+          key: v30-source-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - '.git'
   build_deps:
@@ -245,6 +245,9 @@ commands:
           command:
             '[ -n "<< parameters.user >>" ] && echo << parameters.password >> |
             docker login -u << parameters.user >> --password-stdin || true'
+      - run:
+          name: Create DockerIgnore
+          command: echo '**\n!www' > .dockerignore
       - run:
           name: Create Image
           command:

.dockerignore

@@ -1,2 +1,30 @@
-*
-!www
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+# we use yarn
+package-lock.json
+
+/integration-tests/**/__diff_output__
+
+# testing
+coverage
+
+# production
+build
+www
+.deliver
+
+# misc
+.DS_Store
+npm-debug.log
+yarn-error.log
+.idea
+jest
+
+lerna-debug.log
+
+standalone-packages/monaco-editor-core
+
+.next
+.cache-loader

.graphqlconfig.yml

@@ -0,0 +1,8 @@
+projects:
+  app:
+    schemaPath: packages/app/src/app/graphql/schema.graphql
+    extensions:
+      endpoints:
+        default: 'https://codesandbox.io/api/graphql'
+        staging: 'https://codesandbox.stream/api/graphql'
+        dev: 'http://localhost:4000/api/graphql'

.yarnclean

@@ -45,3 +45,10 @@ wercker.yml
 
 @types/react-native
 packages/app/node_modules/styled-components
+
+# Prevent duplicate graphql. This doesn't seem to break anything
+@divyenduz/ts-graphql-plugin/node_modules/**
+graphql-config/node_modules/**
+
+# Issue with jest conflicting with jest-styled-components
+jest-styled-components/typings/**

README.md

@@ -14,7 +14,10 @@
 [![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/)
 
-An instantly ready, full-featured online IDE for web development on any device with a browser. Enabling you to start new projects quickly and prototype rapidly. With CodeSandbox, you can create web apps, experiment with code, test ideas, and share creations easily.
+An instantly ready, full-featured online IDE for web development on any device
+with a browser. Enabling you to start new projects quickly and prototype
+rapidly. With CodeSandbox, you can create web apps, experiment with code, test
+ideas, and share creations easily.
 
 ## Other CodeSandbox repositories
 

docker/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:10
 LABEL maintainer "Ives van Hoorne"
 
-RUN mkdir /usr/src/app
+RUN mkdir /workspace
+COPY * /workspace/
 
-WORKDIR /usr/src/app
+WORKDIR /workspace

package.json

@@ -37,14 +37,14 @@
     "build:embed": "lerna run build:embed --scope app --stream && gulp",
     "build:prod": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" lerna run build  --scope homepage --stream && lerna run build --scope app --stream && lerna run copy-assets --scope app --stream",
     "commit": "concurrently \"yarn typecheck\" \"yarn lint\" && git commit -m",
-    "postinstall": "yarn lerna run install-dependencies --stream --concurrency 1 && opencollective postinstall",
+    "postinstall": "yarn lerna run install-dependencies --stream --concurrency 1 --ignore smooshpack --ignore react-smooshpack && opencollective postinstall",
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate",
     "lint": "lerna run lint --stream",
     "now-build": "yarn build:deps && lerna run build:storybook --scope @codesandbox/common",
     "start": "yarn build:deps && lerna run start --scope @codesandbox/common --scope app --parallel",
     "start:common": "lerna run start --scope @codesandbox/common --stream",
-    "start:dev_api": "lerna run start:dev_api --scope app --stream",
+    "start:dev_api": "concurrently --raw \"cd packages/app && yarn start:dev_api\" \"cd packages/common && yarn start\"",
     "start:dynamic": "lerna run dev --scope dynamic-pages --stream",
     "start:fast": "concurrently --raw \"cd packages/app && yarn start\" \"cd packages/common && yarn start\"",
     "start:home": "yarn build:deps && yarn start:home:fast",

packages/app/config/build.js

@@ -3,11 +3,11 @@ const { SANDBOX_ONLY } = process.env;
 const staticAssets = [
   !SANDBOX_ONLY && {
     from: 'standalone-packages/vscode-editor/release/min/vs',
-    to: 'public/vscode25/vs',
+    to: 'public/vscode26/vs',
   },
   !SANDBOX_ONLY && {
     from: 'standalone-packages/vscode-extensions/out',
-    to: 'public/vscode-extensions/v11',
+    to: 'public/vscode-extensions/v12',
   },
   !SANDBOX_ONLY && {
     from: 'node_modules/onigasm/lib/onigasm.wasm',

packages/app/config/webpack.common.js

@@ -162,6 +162,11 @@ module.exports = {
 
   module: {
     rules: [
+      {
+        test: /\.(graphql|gql)$/,
+        exclude: /node_modules/,
+        loader: `graphql-tag/loader`,
+      },
       {
         test: /\.wasm$/,
         loader: 'file-loader',

packages/app/config/webpack.prod.js

@@ -180,7 +180,7 @@ module.exports = merge(commonConfig, {
           },
         },
         {
-          urlPattern: /\/vscode25/,
+          urlPattern: /\/vscode26/,
           handler: 'cacheFirst',
           options: {
             cache: {