Add cors to previewServier, enable cors for Release

Author: catarak

client/utils/previewEntry.js

@@ -71,15 +71,19 @@ window.onerror = async function onError(
 ) {
   // maybe i can use error.stack sometime but i'm having a hard time triggering
   // this function
-
-  let data = `${error.name}: ${error.message}`;
-  const resolvedFileName = window.objectUrls[source];
-  let resolvedLineNo = lineNumber;
-  if (window.objectUrls[source] === 'index.html') {
-    resolvedLineNo = lineNumber - htmlOffset;
+  let data;
+  if (!error) {
+    data = msg;
+  } else {
+    data = `${error.name}: ${error.message}`;
+    const resolvedFileName = window.objectUrls[source];
+    let resolvedLineNo = lineNumber;
+    if (window.objectUrls[source] === 'index.html') {
+      resolvedLineNo = lineNumber - htmlOffset;
+    }
+    const line = `\n    at ${resolvedFileName}:${resolvedLineNo}:${columnNo}`;
+    data = data.concat(line);
   }
-  const line = `\n    at ${resolvedFileName}:${resolvedLineNo}:${columnNo}`;
-  data = data.concat(line);
   editor.postMessage(
     {
       source: 'sketch',

server/previewServer.js

@@ -2,6 +2,7 @@ import Express from 'express';
 import mongoose from 'mongoose';
 import path from 'path';
 import webpack from 'webpack';
+import cors from 'cors';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import config from '../webpack/config.dev';
@@ -28,6 +29,26 @@ mongoose.connection.on('error', () => {
   process.exit(1);
 });
 
+const allowedCorsOrigins = [
+  /p5js\.org$/,
+  process.env.EDITOR_URL,
+  process.env.PREVIEW_URL
+];
+
+// to allow client-only development
+if (process.env.CORS_ALLOW_LOCALHOST === 'true') {
+  allowedCorsOrigins.push(/localhost/);
+}
+
+// Enable Cross-Origin Resource Sharing (CORS)
+const corsMiddleware = cors({
+  credentials: true,
+  origin: allowedCorsOrigins
+});
+app.use(corsMiddleware);
+// Enable pre-flight OPTIONS route for all end-points
+app.options('*', corsMiddleware);
+
 // Run Webpack dev server in development mode
 if (process.env.NODE_ENV === 'development') {
   const compiler = webpack(config);

server/server.js

@@ -37,7 +37,11 @@ const MongoStore = connectMongo(session);
 
 app.get('/health', (req, res) => res.json({ success: true }));
 
-const allowedCorsOrigins = [/p5js\.org$/];
+const allowedCorsOrigins = [
+  /p5js\.org$/,
+  process.env.EDITOR_URL,
+  process.env.PREVIEW_URL
+];
 
 // to allow client-only development
 if (process.env.CORS_ALLOW_LOCALHOST === 'true') {