Skip to content

Security update 2021-10 #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chreman merged 5 commits into from
Oct 14, 2021
Merged

Security update 2021-10 #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5411475
updated webpack to v5
Oct 5, 2021
3a07a8a
removed unsupported params
Oct 5, 2021
41cc4b9
removed fontawesome package - used files instead
Oct 6, 2021
7ffa462
removed redundant hypher import
Oct 6, 2021
826b317
fixed font-awesome in viper
Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions examples/local_files/css/font-awesome.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added examples/local_files/fonts/FontAwesome.otf
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_files/fonts/fontawesome-webfont.eot
View file
Open in desktop
Binary file not shown.
2,671 changes: 2,671 additions & 0 deletions examples/local_files/fonts/fontawesome-webfont.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/local_files/fonts/fontawesome-webfont.ttf
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_files/fonts/fontawesome-webfont.woff
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_files/fonts/fontawesome-webfont.woff2
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_files/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_files/fonts/glyphicons-halflings-regular.woff2
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions examples/local_files/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<link type="text/css" rel="stylesheet" href="../../dist/headstart.css">
</link>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/font-awesome.min.css" >
</link>
<script type="text/javascript">
headstart.start();
Expand Down
4 changes: 4 additions & 0 deletions examples/local_streamgraph/css/font-awesome.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added examples/local_streamgraph/fonts/FontAwesome.otf
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_streamgraph/fonts/fontawesome-webfont.eot
View file
Open in desktop
Binary file not shown.
2,671 changes: 2,671 additions & 0 deletions examples/local_streamgraph/fonts/fontawesome-webfont.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/local_streamgraph/fonts/fontawesome-webfont.ttf
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_streamgraph/fonts/fontawesome-webfont.woff
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_streamgraph/fonts/fontawesome-webfont.woff2
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_streamgraph/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added examples/local_streamgraph/fonts/glyphicons-halflings-regular.woff2
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions examples/local_streamgraph/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
<link type="text/css" rel="stylesheet" href="./menu/menu.css">
<link href="https://fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:600" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
<link rel="stylesheet" href="css/font-awesome.min.css" >
<script type="text/javascript" src="./menu/menu.js "></script>
</head>

Expand Down
1 change: 1 addition & 0 deletions examples/viper/project.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<link type="text/css" rel="stylesheet" href="./css/openaire.css"></link>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700' rel='stylesheet' type='text/css'></link>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<link rel="stylesheet" href="./lib/font-awesome.min.css" >
</head>

<body style="margin:0px; padding:0px; max-width:1600px; margin: 0px auto;">
Expand Down
27,801 changes: 11,604 additions & 16,197 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 18 additions & 23 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
},
"scripts": {
"test": "jest",
"dev": "webpack --progress --colors --watch --mode=development",
"prod": "webpack --progress --colors",
"start": "webpack-dev-server -d --progress --mode=development",
"dev": "webpack --progress --watch --mode=development",
"prod": "webpack --progress",
"start": "webpack serve --progress --mode=development",
"lint": "eslint \"./vis/js/**/*.js?(x)\""
},
"repository": {
Expand All @@ -30,7 +30,6 @@
"d3-selection": "^2.0.0",
"d3-transition": "^2.0.0",
"dateformat": "^2.0.0",
"font-awesome": "*",
"hyphenation.en-us": "*",
"hypher": "^0.2.4",
"iso-639-1": "^2.1.9",
Expand All @@ -48,22 +47,19 @@
"shave": "^2.5.7"
},
"devDependencies": {
"@babel/core": "^7.7.2",
"@babel/preset-env": "^7.10.4",
"@babel/preset-react": "^7.10.4",
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.6",
"@babel/preset-react": "^7.14.5",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"babel-core": "^6.11.4",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.0.6",
"babel-plugin-transform-object-assign": "*",
"babel-loader": "^8.2.2",
"babel-preset-es2015": "^6.9.0",
"babel-preset-jest": "^26.6.2",
"bootstrap-sass": "^3.3.6",
"clean-webpack-plugin": "^1.0.1",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "3.3.0",
"css-loader": "^6.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
Expand All @@ -73,22 +69,21 @@
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^2.5.1",
"exports-loader": "^0.6.3",
"file-loader": "^4.3.0",
"imports-loader": "^0.6.5",
"exports-loader": "^3.0.0",
"file-loader": "^6.2.0",
"imports-loader": "^3.0.0",
"jest": "^26.6.3",
"mini-css-extract-plugin": "^0.8.0",
"php-loader": "^0.2.0",
"mini-css-extract-plugin": "^2.3.0",
"react-test-renderer": "^16.13.1",
"redux-mock-store": "^1.5.4",
"resolve": "^1.7.1",
"sass": "^1.23.7",
"sass-loader": "^8.0.0",
"style-loader": "0.19.1",
"url-loader": "^2.3.0",
"webpack": "^4.41.2",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.11.0"
"sass-loader": "^12.1.0",
"style-loader": "^3.3.0",
"url-loader": "^4.1.1",
"webpack": "^5.56.1",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.3.1"
},
"jest": {
"moduleNameMapper": {
Expand Down
1 change: 0 additions & 1 deletion vis/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* Load stylesheets and bootstrap */
import 'styles/main.scss';
require('font-awesome/scss/font-awesome.scss');

/* Import headstart module to initiliase HeadstartFSM */
/* Notice 'import * as hs' -> hs.headstart is not read-only */
Expand Down
3 changes: 1 addition & 2 deletions vis/js/headstart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import $ from "jquery";
import config from 'config';
import { mediator } from 'mediator';

import 'hypher';
import 'lib/en.js';

import BrowserDetect from "exports-loader?BrowserDetect!../lib/browser_detect.js";
import { BrowserDetect } from "exports-loader?exports=BrowserDetect!../lib/browser_detect.js";

export var HeadstartFSM = function(json_direct_data) {
this.VERSION = 4.0;
Expand Down
40 changes: 28 additions & 12 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require('path');
const webpack = require('webpack');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');

const TARGET = process.env.npm_lifecycle_event;
//const TARGET = process.env.npm_lifecycle_event;

const common = {
devtool: 'eval-source-map',
Expand All @@ -19,11 +19,10 @@ const common = {
},

devServer: {
contentBase: path.join( __dirname ),
compress: true,
disableHostCheck: true,
host: '0.0.0.0',
publicPath: '/dist/'
static: { directory: path.join( __dirname ) },
allowedHosts: "all",
host: "0.0.0.0",
devMiddleware: { publicPath: '/dist/' }
},

resolve: {
Expand All @@ -50,6 +49,9 @@ const common = {
'chart': 'Chart'
},
plugins: [
new webpack.ProvidePlugin({
process: 'process/browser',
}),
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// all options are optional
Expand All @@ -65,12 +67,28 @@ const common = {
{
test: require.resolve("hypher/dist/jquery.hypher.js"),
use: [
{ loader: "imports-loader?$=jquery,jQuery=jquery" }
{
loader: "imports-loader",
options: {
imports: [
"default jquery $",
"default jquery jQuery"
]
}
}
]
}, {
test: /lib\/*.js/,
use: [
{ loader: "imports-loader?$=jquery" }
{
loader: "imports-loader",
options: {
imports: [
"default jquery $",
"default jquery jQuery"
]
}
}
]
}, {
test: /.jsx?$/,
Expand Down Expand Up @@ -108,15 +126,13 @@ const common = {
loader: 'style-loader',
}, {
loader: MiniCssExtractPlugin.loader,
options: {
hmr: process.env.NODE_ENV === 'development',
},
options: { esModule: false },
}, {
loader: 'css-loader',
}, {
loader: 'sass-loader',
options: {
prependData: `
additionalData: `
$skin: "${config.skin}";
`,
sassOptions: {
Expand Down