Update mini-css-extract-plugin, css-minimizer-webpack-plugin packages, replace node-sass with sass

pull/5226/head
Viktor Baranov 3 years ago
parent 45fd728374
commit 483da57066
  1. 4
      .circleci/config.yml
  2. 9
      .github/workflows/config.yml
  3. 1
      CHANGELOG.md
  4. 2
      apps/block_scout_web/assets/css/theme/custom_contracts/_dark-forest-theme.scss
  5. 1046
      apps/block_scout_web/assets/package-lock.json
  6. 6
      apps/block_scout_web/assets/package.json
  7. 0
      apps/block_scout_web/assets/static/images/custom-themes/dark-forest/dark_forest_logo.svg

@ -63,10 +63,6 @@ jobs:
command: npm install
working_directory: "apps/block_scout_web/assets"
- run:
command: npm rebuild node-sass
working_directory: "apps/block_scout_web/assets"
- save_cache:
key: v8-npm-install-{{ .Branch }}-{{ checksum "apps/block_scout_web/assets/package-lock.json" }}
paths: "apps/block_scout_web/assets/node_modules"

@ -261,9 +261,6 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
- run: npm rebuild node-sass
working-directory: apps/block_scout_web/assets
- name: Build assets
run: node node_modules/webpack/bin/webpack.js --mode development
working-directory: "apps/block_scout_web/assets"
@ -301,9 +298,6 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
- run: npm rebuild node-sass
working-directory: apps/block_scout_web/assets
- name: Build assets
run: node node_modules/webpack/bin/webpack.js --mode development
working-directory: "apps/block_scout_web/assets"
@ -557,9 +551,6 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-blockscoutweb-npm-
- run: npm rebuild node-sass
working-directory: apps/block_scout_web/assets
- name: Build assets
run: node node_modules/webpack/bin/webpack.js --mode development
working-directory: "apps/block_scout_web/assets"

@ -23,6 +23,7 @@
- [#4862](https://github.com/blockscout/blockscout/pull/4862) - Fix internal transactions pagination
### Chore
- [#5226](https://github.com/blockscout/blockscout/pull/5226) - Update mini-css-extract-plugin, css-minimizer-webpack-plugin packages
- [#5224](https://github.com/blockscout/blockscout/pull/5224) - Webpack config refactoring
- [#5223](https://github.com/blockscout/blockscout/pull/5223) - Migrate fontawesome 5 -> 6
- [#5202](https://github.com/blockscout/blockscout/pull/5202) - Docker setup Makefile release/publish tasks

@ -949,7 +949,7 @@ $dark-primary-alternate: $dark-primary;
}
.custom-address-icon {
content: url(/images/custom-themes/dark-forest/dark_forrest_logo.svg);
content: url(/images/custom-themes/dark-forest/dark_forest_logo.svg);
@media screen and (max-width: 768px) {
margin-bottom: 20px;

File diff suppressed because it is too large Load Diff

@ -83,7 +83,7 @@
"babel-loader": "^8.2.3",
"copy-webpack-plugin": "^10.2.1",
"css-loader": "^3.6.0",
"css-minimizer-webpack-plugin": "^3.0.2",
"css-minimizer-webpack-plugin": "^3.4.1",
"eslint": "^8.7.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.4",
@ -92,10 +92,10 @@
"eslint-plugin-standard": "^5.0.0",
"file-loader": "^6.2.0",
"jest": "^27.4.7",
"mini-css-extract-plugin": "^1.6.2",
"node-sass": "^7.0.1",
"mini-css-extract-plugin": "^2.5.3",
"postcss": "^8.4.6",
"postcss-loader": "^6.2.1",
"sass": "^1.49.8",
"sass-loader": "^12.6.0",
"style-loader": "^3.3.1",
"webpack": "^5.69.1",

Loading…
Cancel
Save