Elixir 1.11.4, npm audit fix

pull/4253/head
Viktor Baranov 4 years ago
parent ce43084449
commit 1ac27efcd9
  1. 2
      .tool-versions
  2. 1
      CHANGELOG.md
  3. 2
      apps/block_scout_web/assets/.babelrc
  4. 2
      apps/block_scout_web/assets/js/lib/queue.js
  5. 26784
      apps/block_scout_web/assets/package-lock.json
  6. 2
      apps/block_scout_web/assets/package.json
  7. 8
      apps/block_scout_web/assets/webpack.config.js
  8. 2
      docker/Dockerfile

@ -1,3 +1,3 @@
elixir 1.11.3 elixir 1.11.4
erlang 23.3.4.1 erlang 23.3.4.1
nodejs 14.17.0 nodejs 14.17.0

@ -20,6 +20,7 @@
- [#3888](https://github.com/blockscout/blockscout/pull/3888) - EIP-1967 contract proxy pattern detection fix - [#3888](https://github.com/blockscout/blockscout/pull/3888) - EIP-1967 contract proxy pattern detection fix
### Chore ### Chore
- [#4253](https://github.com/blockscout/blockscout/pull/4253) - Elixir 1.11.4, npm audit fix
- [#4231](https://github.com/blockscout/blockscout/pull/4231) - Transactions stats: get min/max blocks in one query - [#4231](https://github.com/blockscout/blockscout/pull/4231) - Transactions stats: get min/max blocks in one query
- [#4157](https://github.com/blockscout/blockscout/pull/4157) - Fix internal docs generation - [#4157](https://github.com/blockscout/blockscout/pull/4157) - Fix internal docs generation
- [#4127](https://github.com/blockscout/blockscout/pull/4127) - Update ex_keccak package - [#4127](https://github.com/blockscout/blockscout/pull/4127) - Update ex_keccak package

@ -1,3 +1,3 @@
{ {
"presets": [["@babel/preset-env", { "useBuiltIns": "usage" }]] "presets": [["@babel/preset-env", { "useBuiltIns": "usage", "corejs": { "version": 2 } }]]
} }

@ -16,7 +16,7 @@ http://creativecommons.org/publicdomain/zero/1.0/legalcode
/* Creates a new queue. A queue is a first-in-first-out (FIFO) data structure - /* Creates a new queue. A queue is a first-in-first-out (FIFO) data structure -
* items are added to the end of the queue and removed from the front. * items are added to the end of the queue and removed from the front.
*/ */
module.exports = function Queue(){ export default function Queue(){
// initialise the queue and offset // initialise the queue and offset
var queue = []; var queue = [];

File diff suppressed because it is too large Load Diff

@ -61,6 +61,7 @@
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
"copy-webpack-plugin": "^6.0.3", "copy-webpack-plugin": "^6.0.3",
"css-loader": "^3.1.0", "css-loader": "^3.1.0",
"css-minimizer-webpack-plugin": "^3.0.1",
"eslint": "^6.6.0", "eslint": "^6.6.0",
"eslint-config-standard": "^14.1.0", "eslint-config-standard": "^14.1.0",
"eslint-plugin-import": "^2.18.2", "eslint-plugin-import": "^2.18.2",
@ -71,7 +72,6 @@
"jest": "^25.1.0", "jest": "^25.1.0",
"mini-css-extract-plugin": "^1.3.9", "mini-css-extract-plugin": "^1.3.9",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss": "^8.1.10", "postcss": "^8.1.10",
"postcss-loader": "^4.1.0", "postcss-loader": "^4.1.0",
"sass-loader": "^11.0.1", "sass-loader": "^11.0.1",

@ -1,7 +1,7 @@
const path = require('path') const path = require('path')
const TerserJSPlugin = require('terser-webpack-plugin') const TerserJSPlugin = require('terser-webpack-plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin') const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const { ContextReplacementPlugin } = require('webpack') const { ContextReplacementPlugin } = require('webpack')
const glob = require('glob') const glob = require('glob')
@ -48,7 +48,7 @@ const awesompleteJs = {
use: [ use: [
MiniCssExtractPlugin.loader, MiniCssExtractPlugin.loader,
{ {
loader: "css-loader", loader: 'css-loader',
} }
] ]
} }
@ -81,7 +81,7 @@ const dropzoneJs = {
use: [ use: [
MiniCssExtractPlugin.loader, MiniCssExtractPlugin.loader,
{ {
loader: "css-loader", loader: 'css-loader',
} }
] ]
} }
@ -131,7 +131,7 @@ const appJs =
path: path.resolve(__dirname, '../priv/static/js') path: path.resolve(__dirname, '../priv/static/js')
}, },
optimization: { optimization: {
minimizer: [new TerserJSPlugin(jsOptimizationParams), new OptimizeCSSAssetsPlugin({})], minimizer: [new TerserJSPlugin(jsOptimizationParams), new CssMinimizerPlugin()],
}, },
module: { module: {
rules: [ rules: [

@ -1,4 +1,4 @@
FROM bitwalker/alpine-elixir-phoenix:1.11.3 FROM bitwalker/alpine-elixir-phoenix:1.11.4
RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python3

Loading…
Cancel
Save