Merge branch 'master' into prototype-common-sync

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/**

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

@@ -44,7 +44,7 @@
     "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: {

packages/app/package.json

@@ -12,6 +12,9 @@
     "build": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\"   node scripts/build.js",
     "build:stats": "cross-env NODE_ENV=production NODE_OPTIONS=\"--max-old-space-size=4096\"   webpack --env production --config config/webpack.prod.js --json --profile --progress > stats.json && node scripts/stats",
     "build:clean": "rimraf www",
+    "graphql:replace-schema": "sed -i'' 's/RootQueryType/RootQuery/g' ./src/app/graphql/schema.graphql && sed -i'' 's/RootMutationType/RootMutation/g' ./src/app/graphql/schema.graphql",
+    "generate:graphql": "graphql get-schema --project app && yarn graphql:replace-schema && graphql-codegen --config ./scripts/codegen.js",
+    "generate:graphql:staging": "graphql get-schema -e staging --project app && yarn graphql:replace-schema && graphql-codegen --config ./scripts/codegen.js --staging",
     "build:embed": "cross-env NODE_ENV=production webpack --config config/webpack.embed.js",
     "build:sandbox": "cross-env NODE_ENV=production SANDBOX_ONLY=true node scripts/build.js && yarn copy-assets",
     "build:sandpack-sandbox": "cross-env NODE_ENV=production SANDPACK=true SANDBOX_ONLY=true node scripts/build.js && cross-env SANDBOX_ONLY=true yarn copy-assets",
@@ -67,11 +70,11 @@
     ]
   },
   "dependencies": {
-    "@apollo/react-hooks": "^0.1.0-beta.2",
+    "@apollo/react-hooks": "^3.0.1",
     "@babel/plugin-transform-destructuring": "^7.5.0",
     "@babel/preset-env": "^7.5.5",
     "@codesandbox/executors": "^0.1.0",
-    "@codesandbox/template-icons": "^1.0.1",
+    "@codesandbox/template-icons": "^1.0.2",
     "@emmetio/codemirror-plugin": "^0.3.5",
     "@sentry/webpack-plugin": "^1.8.0",
     "@styled-system/css": "^5.0.23",
@@ -117,7 +120,7 @@
     "fuse.js": "^3.2.1",
     "geniejs": "^0.5.1",
     "glamor": "^2.20.25",
-    "graphql": "^14.1.1",
+    "graphql": "^14.5.8",
     "graphql-tag": "^2.10.1",
     "gsap": "^1.20.3",
     "gulp": "^3.9.1",
@@ -143,7 +146,6 @@
     "lodash-es": "^4.17.2",
     "lru-cache": "^4.1.3",
     "match-sorter": "^1.8.1",
-    "memoize-one": "^4.0.0",
     "minimatch": "^3.0.4",
     "mobx": "^5.11.0",
     "mobx-react": "^6.1.1",
@@ -173,6 +175,7 @@
     "react-addons-css-transition-group": "^15.6.0",
     "react-apollo": "^2.5.6",
     "react-color": "^2.17.3",
+    "react-content-loader": "^4.2.2",
     "react-day-picker": "^7.2.4",
     "react-devtools-inline": "^4.0.0",
     "react-dnd": "^7.0.2",
@@ -183,7 +186,7 @@
     "react-icons": "^2.2.7",
     "react-input-autosize": "^2.2.1",
     "react-inspector": "^2.2.0",
-    "react-instantsearch": "^5.3.2",
+    "react-instantsearch": "^5.7.0",
     "react-loadable": "^3.3.1",
     "react-media": "^1.9.2",
     "react-modal": "^3.6.1",
@@ -236,13 +239,15 @@
     "@types/codemirror": "^0.0.72",
     "@types/debug": "^4.1.1",
     "@types/gsap": "^1.20.1",
+    "@types/jest": "24.0.13",
     "@types/lodash-es": "^4.17.2",
     "@types/phoenix": "^1.4.0",
     "@types/prop-types": "^15.7.0",
     "@types/react": "^16.8.12",
     "@types/react-dom": "^16.8.3",
     "@types/react-helmet": "^5.0.11",
     "@types/react-icons": "2.2.7",
+    "@types/react-instantsearch": "^5.2.3",
     "@types/react-router-dom": "^4.3.1",
     "@types/react-stripe-elements": "^1.3.2",
     "@types/resolve": "^0.0.8",
@@ -261,6 +266,7 @@
     "buffer-loader": "^0.0.1",
     "case-sensitive-paths-webpack-plugin": "^2.0.0",
     "chalk": "1.1.3",
+    "codesandbox": "^2.1.10",
     "codesandbox-deps": "^0.1.1",
     "connect-history-api-fallback": "1.3.0",
     "copy-webpack-plugin": "^5.0.3",
@@ -273,16 +279,17 @@
     "file-loader": "^1.1.11",
     "filesize": "^3.5.6",
     "fs-extra": "^8.0.1",
+    "graphql-cli": "^3.0.14",
     "gulp-replace": "^0.5.4",
     "gzip-size": "3.0.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^4.0.0-beta.1",
     "http-proxy-middleware": "^0.17.3",
     "imagemin-webpack-plugin": "^2.4.2",
-    "jest": "^24.8.0",
+    "jest": "^24.9.0",
     "jest-image-snapshot": "^1.0.1",
     "jest-junit": "^3.4.1",
-    "jest-styled-components": "6.3.3",
+    "jest-styled-components": "6.3.4",
     "mini-css-extract-plugin": "^0.8.0",
     "object-assign": "^4.1.1",
     "opn": "4.0.2",