Fix a variety of issues on Edge.

babel.config.js

@@ -4,7 +4,7 @@ module.exports = function(api) {
     presets: [
       ['@babel/preset-env', {
         useBuiltIns: 'usage',
-        corejs: 2,
+        corejs: 3,
       }],
       '@babel/preset-react',
     ],

package.json

@@ -25,7 +25,6 @@
     "cheerio": "^1.0.0-rc.3",
     "connect-flash": "^0.1.1",
     "connect-mongodb-session": "^2.2.0",
-    "core-js": "^2.6.9",
     "csurf": "^1.10.0",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.5",
@@ -61,6 +60,7 @@
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.6",
     "chart.js": "^2.9.2",
+    "core-js": "^3.6.3",
     "eslint": "^6.1.0",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-config-prettier": "^6.5.0",

routes/cube_routes.js

@@ -789,8 +789,10 @@ router.get('/list/:id', async function(req, res) {
       }
     }
 
+    console.log('user', req.user ? req.user.id === cube.owner : false);
+
     const reactProps = {
-      canEdit: req.user && req.user.id === cube.owner,
+      canEdit: req.user ? req.user.id === cube.owner : false,
       cubeID: req.params.id,
       defaultTagColors: cube.tag_colors,
       defaultShowTagColors: !req.user || !req.user.hide_tag_colors,

webpack.common.js

@@ -3,12 +3,11 @@ const merge = require('webpack-merge');
 const nodeExternals = require('webpack-node-externals');
 
 const config = {
-  context: path.resolve(__dirname, 'src'),
   module: {
     rules: [
       {
         test: /\.jsx?$/,
-        exclude: /node_modules/,
+        exclude: /node_modules[\/\\](?!react-dnd|dnd-core)/,
         use: {
           loader: 'babel-loader',
           options: {
@@ -23,20 +22,20 @@ const config = {
 
 const clientConfig = merge(config, {
   entry: {
-    cube_analysis: './cube_analysis.js',
-    cube_blog: './cube_blog.js',
-    cube_compare: './cube_compare.js',
-    cube_deck: './cube_deck.js',
-    cube_deckbuilder: './cube_deckbuilder.js',
-    cube_draft: './cube_draft.js',
-    cube_list: './cube_list.js',
-    cube_overview: './cube_overview.js',
-    cube_playtest: './cube_playtest.js',
-    topcards: './topcards.js',
-    dashboard: './dashboard.js',
-    blogpost: './blogpost.js',
-    notifications: './notifications.js',
-    cardpage: './cardpage.js',
+    cube_analysis: './src/cube_analysis.js',
+    cube_blog: './src/cube_blog.js',
+    cube_compare: './src/cube_compare.js',
+    cube_deck: './src/cube_deck.js',
+    cube_deckbuilder: './src/cube_deckbuilder.js',
+    cube_draft: './src/cube_draft.js',
+    cube_list: './src/cube_list.js',
+    cube_overview: './src/cube_overview.js',
+    cube_playtest: './src/cube_playtest.js',
+    topcards: './src/topcards.js',
+    dashboard: './src/dashboard.js',
+    blogpost: './src/blogpost.js',
+    notifications: './src/notifications.js',
+    cardpage: './src/cardpage.js',
   },
   output: {
     filename: '[name].bundle.js',
@@ -52,16 +51,16 @@ const clientConfig = merge(config, {
 const serverConfig = merge(config, {
   target: 'node',
   entry: {
-    CubeListPage: './components/CubeListPage.js',
-    DashboardPage: './components/DashboardPage.js',
+    CubeListPage: './src/components/CubeListPage.js',
+    DashboardPage: './src/components/DashboardPage.js',
   },
   output: {
     filename: '[name].js',
     sourceMapFilename: '[name].js.map',
     path: path.resolve(__dirname, 'dist', 'components'),
     libraryTarget: 'commonjs2',
   },
-  externals: [nodeExternals({ whitelist: ['react-tag-input', 'react-dnd', 'dnd-core', 'react-dnd-html5-backend'] })],
+  externals: [nodeExternals({ whitelist: ['react-tag-input', 'react-dnd', 'dnd-core', 'react-dnd-html5-backend', 'react-dnd-touch-backend'] })],
 });
 
 module.exports = { clientConfig, serverConfig };