Merge remote-tracking branch 'upstream/master' into editor-modules

Author: CompuIves

.all-contributorsrc

@@ -252,7 +252,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/13774309?v=4",
       "profile": "https://github.com/arthurdenner",
       "contributions": [
-        "code"
+        "code",
+        "doc"
       ]
     },
     {
@@ -603,6 +604,35 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "melanieseltzer",
+      "name": "Melanie Seltzer",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/17421347?v=4",
+      "profile": "https://www.melanieseltzer.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ZYSzys",
+      "name": "ZYSzys",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/23313266?v=4",
+      "profile": "http://zyszys.top",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "SaraVieira",
+      "name": "Sara Vieira",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1051509?v=4",
+      "profile": "http://iamsaravieira.com",
+      "contributions": [
+        "code",
+        "design",
+        "ideas"
+      ]
     }
   ],
   "repoType": "github"

.babelrc

@@ -1,16 +1,20 @@
 {
   "env": {
     "test": {
-      "presets": ["env", "react"],
+      "presets": [
+        "@babel/preset-env",
+        "@babel/preset-flow",
+        "@babel/preset-react"
+      ],
       "plugins": [
-        "babel-plugin-transform-async-to-generator",
-        "babel-plugin-transform-object-rest-spread",
-        "babel-plugin-transform-class-properties",
-        "babel-plugin-transform-runtime",
-        "babel-plugin-syntax-dynamic-import",
+        "@babel/plugin-transform-async-to-generator",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-transform-runtime",
+        "@babel/plugin-syntax-dynamic-import",
         "babel-plugin-lodash",
         "babel-plugin-system-import-transformer",
-        "babel-macros"
+        "babel-plugin-macros"
       ]
     }
   }

.circleci/config.yml

@@ -77,15 +77,15 @@ jobs:
           background: true
       - run:
           name: Setup BrowserStack local environment
-          command: "[ -n \"$BROWSER_STACK_KEY\" ] && ./packages/app/integration-tests/BrowserStackLocal --key $BROWSER_STACK_KEY || true"
+          command: '[ -n "$BROWSER_STACK_KEY" ] && ./packages/app/integration-tests/BrowserStackLocal --key $BROWSER_STACK_KEY || true'
           background: true
       - run:
           name: Test Integrations
           command: |
             sleep 15
             yarn test:integrations --ci --testResultsProcessor="jest-junit"
           environment:
-            JEST_JUNIT_OUTPUT: "/tmp/test-results/js-test-results.xml"
+            JEST_JUNIT_OUTPUT: '/tmp/test-results/js-test-results.xml'
       - store_test_results:
           path: /tmp/test-results
       - store_artifacts:
@@ -103,7 +103,7 @@ jobs:
           name: Test
           command: yarn test --ci --testResultsProcessor="jest-junit"
           environment:
-            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+            JEST_JUNIT_OUTPUT: 'reports/junit/js-test-results.xml'
 
   lint:
     docker:
@@ -125,13 +125,13 @@ jobs:
           key: v12-prod-build-cache-{{ .Environment.CIRCLE_BRANCH }}-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Docker Sign In
-          command: "[ -n \"$DOCKER_USER\" ] && echo $DOCKER_PWD | docker login -u $DOCKER_USER --password-stdin || true"
+          command: '[ -n "$DOCKER_USER" ] && echo $DOCKER_PWD | docker login -u $DOCKER_USER --password-stdin || true'
       - run:
           name: Create Image
-          command: "[ -n \"$DOCKER_USER\" ] && docker build -t codesandbox/client:${CIRCLE_SHA1:0:7} . || true"
+          command: '[ -n "$DOCKER_USER" ] && docker build -t codesandbox/client:${CIRCLE_SHA1:0:7} . || true'
       - deploy:
           name: Push Image
-          command: "[ -n \"$DOCKER_USER\" ] && docker push codesandbox/client:${CIRCLE_SHA1:0:7} || true"
+          command: '[ -n "$DOCKER_USER" ] && docker push codesandbox/client:${CIRCLE_SHA1:0:7} || true'
 
 workflows:
   version: 2
@@ -154,4 +154,5 @@ workflows:
           requires:
             - build-prod
             - lint
+            # - test-integrations
             - test-jest

.eslintrc

@@ -10,7 +10,8 @@
   "globals": {
     "Raven": true,
     "VERSION": true,
-    "$PropertyType": true
+    "$PropertyType": true,
+    "TimeoutID": true
   },
   "rules": {
     "react/jsx-filename-extension": 0,

CONTRIBUTING.md

@@ -1,5 +1,12 @@
 # Contributing to CodeSandbox Client
 
+## Table of Contents
+
+* [Code Organization](#code-organization)
+* [Setting Up the project locally](#setting-up-the-project-locally)
+* [Submitting a Pull Request](#submitting-a-pull-request)
+* [Add yourself as a contributor](#add-yourself-as-a-contributor)
+
 ## Code Organization
 
 The CodeSandbox client is currently divided in to 5 parts. We use `lerna` to share dependencies between these parts.
@@ -53,10 +60,11 @@ To install the project you need to have `yarn` and `node`
 
 Please go through existing issues and pull requests to check if somebody else is already working on it, we use `someone working on it` label to mark such issues.
 
-Also, make sure to run the tests before you commit your changes.
+Also, make sure to run the tests and lint the code before you commit your changes.
 
 ```
 yarn test
+yarn lint
 ```
 
 ## Add yourself as a contributor

README.md

@@ -4,7 +4,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "build": "yarn build:deps && yarn build:prod",
+    "build": "NODE_OPTIONS=\"--max-old-space-size=4096\" yarn build:deps && yarn build:prod",
     "build:prod": "lerna run build  --scope homepage --stream && lerna run build --scope app --stream && gulp",
     "build:clean": "lerna run build:clean --scope app --scope homepage && rimraf www",
     "build:deps": "lerna run build:dev --scope codesandbox-api --scope codesandbox-browserfs",
@@ -21,7 +21,7 @@
     "add-contributor": "all-contributors add",
     "generate": "all-contributors generate",
     "precommit": "lint-staged",
-    "postinstall": "rimraf packages/app/node_modules/styled-components && yarn lerna run install-dependencies --scope codesandbox-browserfs --stream"
+    "postinstall": "rimraf packages/app/node_modules/styled-components && yarn lerna run install-dependencies --scope codesandbox-browserfs --scope sse-loading-screen --stream"
   },
   "lint-staged": {
     "*.{js,css,json}": [
@@ -37,15 +37,20 @@
       "packages/sandpack",
       "packages/react-sandpack",
       "packages/homepage",
-      "packages/node-services"
+      "packages/node-services",
+      "packages/sandbox-hooks",
+      "packages/sse-hooks"
     ],
-    "nohoist": ["**/gatsby", "**/gatsby/**"]
-},
+    "nohoist": [
+      "**/gatsby",
+      "**/gatsby/**"
+    ]
+  },
   "resolutions": {
     "uglify-es": "npm:terser"
   },
   "devDependencies": {
-    "all-contributors-cli": "^4.3.0",
+    "all-contributors-cli": "^5.4.0",
     "babel-eslint": "^8.2.1",
     "eslint": "CompuIves/eslint#add/define-parser",
     "eslint-config-airbnb": "^15.0.1",

package.json

@@ -0,0 +1,22 @@
+module.exports = {
+  env: {
+    test: {
+      presets: [
+        '@babel/preset-env',
+        '@babel/preset-flow',
+        '@babel/preset-react',
+      ],
+      plugins: [
+        '@babel/plugin-transform-destructuring',
+        '@babel/plugin-transform-async-to-generator',
+        '@babel/plugin-proposal-object-rest-spread',
+        '@babel/plugin-proposal-class-properties',
+        '@babel/plugin-transform-runtime',
+        '@babel/plugin-syntax-dynamic-import',
+        'babel-plugin-lodash',
+        'babel-plugin-system-import-transformer',
+        'babel-plugin-macros',
+      ],
+    },
+  },
+};

packages/app/babel.config.js

@@ -6,37 +6,33 @@ module.exports = {
   cacheDirectory: true,
   presets: [
     // Latest stable ECMAScript features
+    require.resolve('@babel/preset-flow'),
     [
-      'env',
+      require.resolve('@babel/preset-env'),
       {
         targets: {
           chrome: 67,
           // We currently minify with uglify
           // Remove after https://github.com/mishoo/UglifyJS2/issues/448
-          uglify: true,
         },
         // Disable polyfill transforms
         useBuiltIns: false,
         modules: false,
+        forceAllTransforms: true,
       },
     ],
     // JSX, Flow
-    'react',
+    require.resolve('@babel/preset-react'),
   ],
   plugins: [
-    require.resolve('babel-plugin-transform-object-rest-spread'),
-    require.resolve('babel-plugin-transform-class-properties'),
-    require.resolve('babel-plugin-transform-runtime'),
+    require.resolve('@babel/plugin-transform-template-literals'),
+    require.resolve('@babel/plugin-transform-destructuring'),
+    require.resolve('@babel/plugin-proposal-object-rest-spread'),
+    require.resolve('@babel/plugin-proposal-class-properties'),
+    require.resolve('@babel/plugin-transform-runtime'),
     require.resolve('babel-plugin-lodash'),
-    require.resolve('babel-plugin-syntax-dynamic-import'),
+    require.resolve('@babel/plugin-syntax-dynamic-import'),
     require.resolve('babel-plugin-styled-components'),
-    require.resolve('babel-macros'),
-    [
-      require.resolve('react-loadable/babel'),
-      {
-        server: true,
-        webpack: true,
-      },
-    ],
+    require.resolve('babel-plugin-macros'),
   ],
 };

packages/app/config/babel.dev.js

@@ -4,45 +4,60 @@ module.exports = {
   // Don't try to find .babelrc because we want to force this configuration.
   babelrc: false,
   presets: [
+    require.resolve('@babel/preset-flow'),
     // Latest stable ECMAScript features
     [
-      'env',
+      require.resolve('@babel/preset-env'),
       {
         targets: {
           ie: 11,
-          // We currently minify with uglify
-          // Remove after https://github.com/mishoo/UglifyJS2/issues/448
-          uglify: true,
         },
         // Disable polyfill transforms
         useBuiltIns: false,
         modules: false,
+        forceAllTransforms: true,
       },
     ],
     // JSX, Flow
-    'react',
+    require.resolve('@babel/preset-react'),
   ],
   plugins: [
-    require.resolve('babel-plugin-transform-async-to-generator'),
-    require.resolve('babel-plugin-transform-object-rest-spread'),
-    require.resolve('babel-plugin-transform-class-properties'),
-    require.resolve('babel-plugin-transform-runtime'),
+    require.resolve('@babel/plugin-transform-template-literals'),
+    require.resolve('@babel/plugin-transform-destructuring'),
+    require.resolve('@babel/plugin-transform-async-to-generator'),
+    require.resolve('@babel/plugin-proposal-object-rest-spread'),
+    require.resolve('@babel/plugin-proposal-class-properties'),
+    require.resolve('@babel/plugin-transform-runtime'),
     require.resolve('babel-plugin-lodash'),
-    require.resolve('babel-plugin-syntax-dynamic-import'),
+    require.resolve('@babel/plugin-syntax-dynamic-import'),
     require.resolve('babel-plugin-styled-components'),
-    require.resolve('babel-macros'),
-    [
-      require.resolve('react-loadable/babel'),
-      {
-        server: true,
-        webpack: true,
-      },
-    ],
+    require.resolve('babel-plugin-macros'),
     // Optimization: hoist JSX that never changes out of render()
     // Disabled because of issues:
     // * https://github.com/facebookincubator/create-react-app/issues/525
     // * https://phabricator.babeljs.io/search/query/pCNlnC2xzwzx/
     // TODO: Enable again when these issues are resolved.
     // require.resolve('babel-plugin-transform-react-constant-elements')
   ],
+  overrides: [
+    {
+      test: ['../src/sandbox'],
+      presets: [
+        require.resolve('@babel/preset-flow'),
+        // Latest stable ECMAScript features
+        [
+          require.resolve('@babel/preset-env'),
+          {
+            targets: {
+              ie: 11,
+            },
+            // Disable polyfill transforms
+            useBuiltIns: false,
+            modules: false,
+            forceAllTransforms: true,
+          },
+        ],
+      ],
+    },
+  ],
 };