From 2dd757203068e705b225ab36a350175245b35540 Mon Sep 17 00:00:00 2001 From: Patrick Hulin Date: Sat, 11 Jan 2020 13:44:51 -0500 Subject: [PATCH] Fix a variety of issues on Edge. --- babel.config.js | 2 +- package-lock.json | 22 +++++++++++++++++++--- package.json | 2 +- routes/cube_routes.js | 4 +++- webpack.common.js | 37 ++++++++++++++++++------------------- 5 files changed, 42 insertions(+), 25 deletions(-) diff --git a/babel.config.js b/babel.config.js index 9de0551f4..c7837a43e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -4,7 +4,7 @@ module.exports = function(api) { presets: [ ['@babel/preset-env', { useBuiltIns: 'usage', - corejs: 2, + corejs: 3, }], '@babel/preset-react', ], diff --git a/package-lock.json b/package-lock.json index 7a060bfb3..7988961de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3294,6 +3294,13 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + } } }, "babel-types": { @@ -4300,9 +4307,10 @@ "dev": true }, "core-js": { - "version": "2.6.10", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz", - "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.3.tgz", + "integrity": "sha512-DOO9b18YHR+Wk5kJ/c5YFbXuUETreD4TrvXb6edzqZE3aAEd0eJIAWghZ9HttMuiON8SVCnU3fqA4rPxRDD1HQ==", + "dev": true }, "core-js-compat": { "version": "3.4.0", @@ -10830,6 +10838,14 @@ "lodash": "~4.17.12", "memoize-one": "~5.0.1", "prop-types": "~15.7.0" + }, + "dependencies": { + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "dev": true + } } }, "react-transition-group": { diff --git a/package.json b/package.json index 6eb6574d6..2ab19848e 100644 --- a/package.json +++ b/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", diff --git a/routes/cube_routes.js b/routes/cube_routes.js index fe9474393..17da1edf0 100644 --- a/routes/cube_routes.js +++ b/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, diff --git a/webpack.common.js b/webpack.common.js index 22f93b34d..0f133b999 100644 --- a/webpack.common.js +++ b/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,8 +51,8 @@ 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', @@ -61,7 +60,7 @@ const serverConfig = merge(config, { 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 };