Merge pull request #1241 from City-of-Helsinki/TILA-1687

TILA-1687 dependency updates

Author: kieferbonk

CHANGELOG.md

@@ -1,6 +1,10 @@
-
+# 0.12.7
+  **MINOR CHANGES**
+  - Security updates; most notable changes below ([#1241](https://github.com/City-of-Helsinki/varaamo/pull/1241))
+    - Replace `lightbox-react` with `react-image-lightbox`
+    - Replace `node-sass` with `dart-sass`
 # 0.12.6
-**MINOR CHANGES**
+  **MINOR CHANGES**
   - Update deps
 # 0.12.1
   **MINOR CHANGES**

app/pages/resource/ResourcePage.js

@@ -9,9 +9,9 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
-import Lightbox from 'lightbox-react';
+import Lightbox from 'react-image-lightbox';
 import { decamelizeKeys } from 'humps';
-import 'lightbox-react/style.css';
+import 'react-image-lightbox/style.css';
 
 import { addNotification } from '../../actions/notificationsActions';
 import constants from '../../constants/AppConstants';

app/pages/resource/__tests__/ResourcePage.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Immutable from 'seamless-immutable';
 import simple from 'simple-mock';
-import Lightbox from 'lightbox-react';
+import Lightbox from 'react-image-lightbox';
 
 import NotFoundPage from '../../not-found/NotFoundPage';
 import PageWrapper from '../../PageWrapper';

config/webpack.development.js

@@ -49,7 +49,7 @@ module.exports = merge(common, {
           'style-loader',
           'css-loader',
           'resolve-url-loader',
-          { loader: 'sass-loader', options: { sourceMap: true, sourceMapContents: false } },
+          { loader: 'sass-loader', options: { sassOptions: { sourceMap: true, sourceMapContents: false } } },
           { loader: 'postcss-loader', options: { plugins: [autoprefixer({ browsers: ['last 2 version', 'ie 9'] })] } },
         ],
       },

config/webpack.production.js

@@ -34,7 +34,7 @@ module.exports = merge(common, {
           MiniCssExtractPlugin.loader,
           'css-loader',
           'resolve-url-loader',
-          { loader: 'sass-loader', options: { sourceMap: true, sourceMapContents: false } },
+          { loader: 'sass-loader', options: { sassOptions: { sourceMap: true, sourceMapContents: false } } },
           { loader: 'postcss-loader', options: { plugins: [autoprefixer({ browsers: ['last 2 version', 'ie 9'] })] } },
         ],
       },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "varaamo",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/City-of-Helsinki/varaamo"
@@ -40,7 +40,6 @@
     "isomorphic-fetch": "2.2.1",
     "jest-date-mock": "^1.0.7",
     "leaflet": "^1.4.0",
-    "lightbox-react": "0.3.7",
     "location-origin": "1.1.4",
     "lodash": "4.17.21",
     "mobile-detect": "1.4.0",
@@ -62,6 +61,7 @@
     "react-dom": "16.8.4",
     "react-helmet": "5.2.1",
     "react-html-parser": "^2.0.2",
+    "react-image-lightbox": "5.1.4",
     "react-intl": "2.8.0",
     "react-intl-redux": "2.1.0",
     "react-leaflet": "2.2.1",
@@ -87,13 +87,13 @@
   },
   "devDependencies": {
     "@babel/core": "7.15.8",
+    "@babel/eslint-parser": "7.15.8",
+    "@babel/eslint-plugin": "7.14.5",
     "@babel/plugin-proposal-class-properties": "7.3.0",
     "@babel/polyfill": "7.2.5",
     "@babel/preset-env": "7.3.1",
     "@babel/preset-react": "7.0.0",
     "@babel/register": "7.0.0",
-    "@babel/eslint-parser": "7.15.8",
-    "@babel/eslint-plugin": "7.14.5",
     "autoprefixer": "9.4.7",
     "babel-jest": "^24.1.0",
     "babel-loader": "8.0.5",
@@ -120,15 +120,15 @@
     "mini-css-extract-plugin": "0.5.0",
     "mockdate": "2.0.2",
     "morgan": "1.9.1",
-    "node-sass": "^4.12.0",
     "postcss-loader": "^3.0.0",
     "prop-types": "^15.7.2",
     "react-test-renderer": "^16.8.4",
     "react-transform-hmr": "1.0.4",
     "redux-devtools-extension": "2.13.8",
     "resolve-url-loader": "3.1.4",
     "rosie": "1.6.0",
-    "sass-loader": "7.1.0",
+    "sass": "^1.52.1",
+    "sass-loader": "9.0.3",
     "simple-mock": "0.8.0",
     "snakecase-keys": "^3.1.2",
     "style-loader": "0.23.1",
@@ -140,6 +140,16 @@
     "webpack-hot-middleware": "2.24.3",
     "webpack-merge": "4.2.1"
   },
+  "resolutions": {
+    "@firebase/util": "0.3.4",
+    "ansi-html": "0.0.8",
+    "ansi-regex": "^4.1.1",
+    "glob-parent": "5.1.2",
+    "minimist": "^1.2.6",
+    "node-fetch": "2.6.7",
+    "node-notifier": "8.0.1",
+    "protobufjs": "6.11.3"
+  },
   "scripts": {
     "build": "./node_modules/.bin/webpack --config config/webpack.production.js",
     "lint": "./node_modules/.bin/eslint .",

src/domain/footer/__tests__/__snapshots__/Footer.test.js.snap

@@ -56,7 +56,7 @@ exports[`domain/footer/Footer When there is no customization in use renders corr
           <span
             className="app-varaamo-version"
           >
-            v0.12.6
+            v0.12.7
           </span>
         </div>
       </Col>
@@ -121,7 +121,7 @@ exports[`domain/footer/Footer renders correctly 1`] = `
           <span
             className="app-varaamo-version"
           >
-            v0.12.6
+            v0.12.7
           </span>
         </div>
       </Col>