Merge branch 'master' of https://github.com/popcodeorg/popcode into add-title-to-classroom-export

Author: pwjablonski

.travis.yml

@@ -23,6 +23,7 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
+  chrome: stable
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.2
   - export PATH="$HOME/.yarn/bin:$PATH"

bower.json

@@ -33,6 +33,7 @@
     "lodash": "^4.11.2",
     "mustache.js": "mustache#^2.2.1",
     "normalize-css": "normalize.css#^4.1.1",
+    "p5js": "^0.5.13",
     "react": "^15.0.1",
     "roboto-webfont-bower": "roboto-webfont#^0.1.1",
     "underscore": "^1.8.3"

karma.conf.js

@@ -77,6 +77,14 @@ module.exports = function(config) {
       reporters: ['dots', 'BrowserStack'],
     });
   } else if (isCi) {
-    config.set({browsers: ['ChromeHeadless']});
+    config.set({
+      browsers: ['ChromeHeadlessNoSandbox'],
+      customLaunchers: {
+        ChromeHeadlessNoSandbox: {
+          base: 'ChromeHeadless',
+          flags: ['--no-sandbox'],
+        },
+      },
+    });
   }
 };

src/actions/clients.js

@@ -4,7 +4,10 @@ export const createSnapshot = createAction('CREATE_SNAPSHOT');
 export const snapshotCreated = createAction('SNAPSHOT_CREATED');
 export const snapshotExportError = createAction('SNAPSHOT_EXPORT_ERROR');
 export const snapshotNotFound = createAction('SNAPSHOT_NOT_FOUND');
-export const snapshotImported = createAction('SNAPSHOT_IMPORTED');
+export const snapshotImported = createAction(
+  'SNAPSHOT_IMPORTED',
+  (projectKey, project) => ({projectKey, project}),
+);
 export const snapshotImportError = createAction('SNAPSHOT_IMPORT_ERROR');
 export const projectRestoredFromLastSession =
   createAction('PROJECT_RESTORED_FROM_LAST_SESSION');

src/components/PreviewFrame.jsx

@@ -6,6 +6,7 @@ import Bowser from 'bowser';
 import bindAll from 'lodash/bindAll';
 import {t} from 'i18next';
 import normalizeError from '../util/normalizeError';
+import retryingFailedImports from '../util/retryingFailedImports';
 import {sourceDelimiter} from '../util/compileProject';
 import {CompiledProject as CompiledProjectRecord} from '../records';
 
@@ -41,15 +42,21 @@ class PreviewFrame extends React.Component {
     return false;
   }
 
-  _evaluateConsoleExpression(key, expression) {
+  async _evaluateConsoleExpression(key, expression) {
+    const {hasExpressionStatement} = await retryingFailedImports(
+      () => import(
+        /* webpackChunkName: 'mainAsync' */
+        '../util/javascript',
+      ),
+    );
     // eslint-disable-next-line prefer-reflect
     this._channel.call({
       method: 'evaluateExpression',
       params: expression,
       success: (printedResult) => {
         this.props.onConsoleValue(
           key,
-          printedResult,
+          hasExpressionStatement(expression) ? printedResult : null,
           this.props.compiledProject.compiledProjectKey,
         );
       },