Merge pull request #4779 from wallabag/dependabot/npm_and_yarn/webpack-manifest-plugin-3.0.0

Bump webpack-manifest-plugin from 3.0.0-rc.0 to 3.0.0

.github/workflows/coding-standards.yml

@@ -28,19 +28,10 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php }}-composer-locked-"
-
       - name: "Install dependencies with Composer"
-        run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
 
       - name: "Run PHP CS Fixer"
         run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"

.github/workflows/continuous-integration.yml

@@ -67,19 +67,10 @@ jobs:
           createdb -h localhost -p 5432 -U wallabag wallabag_test
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
-      - name: Get composer cache directory
+      - name: "Install dependencies with Composer"
-        id: composer-cache
+        uses: "ramsey/composer-install@v1"
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          composer-options: "--optimize-autoloader --prefer-dist"
-          key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php }}-composer-locked-"
-
-      - name: "Install dependencies with composer"
-        run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist"
 
       - name: "Prepare database"
         run: "make prepare DB=${{ matrix.database }}"

.github/workflows/translations.yml

@@ -33,19 +33,10 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php }}-composer-locked-"
-
       - name: "Install dependencies with Composer"
-        run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
 
       - name: "Validate Core translations"
         run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"

app/config/webpack/prod.js

@@ -1,7 +1,7 @@
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
+const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 
 const commonConfig = require('./common.js');
@@ -33,7 +33,7 @@ module.exports = merge(commonConfig, {
         NODE_ENV: JSON.stringify('production'),
       },
     }),
-    new ManifestPlugin({
+    new WebpackManifestPlugin({
       fileName: 'manifest.json',
     }),
   ],

package.json

@@ -63,7 +63,7 @@
     "webpack": "^5.9.0",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0",
-    "webpack-manifest-plugin": "^3.0.0-rc.0",
+    "webpack-manifest-plugin": "^3.0.0",
     "webpack-merge": "^5.3.0"
   },
   "dependencies": {

web/wallassets/manifest.json

@@ -1,10 +1,17 @@
 {
   "material.css": "material.css",
   "material.js": "material.js",
+  "material.png": "img/annotator-glyph-sprite.png",
+  "material.css.map": "material.css.map",
+  "material.js.map": "material.js.map",
   "baggy.css": "baggy.css",
   "baggy.js": "baggy.js",
+  "baggy.png": "img/annotator-glyph-sprite.png",
+  "baggy.css.map": "baggy.css.map",
+  "baggy.js.map": "baggy.js.map",
   "public.css": "public.css",
   "public.js": "public.js",
+  "public.css.map": "public.css.map",
   "fonts/lato-normal-italic.woff": "fonts/lato-normal-italic.woff",
   "fonts/lato-semibold-italic.woff": "fonts/lato-semibold-italic.woff",
   "fonts/lato-medium-italic.woff": "fonts/lato-medium-italic.woff",

yarn.lock

@@ -4178,7 +4178,7 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash@^4, lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@~4.17.10:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6478,11 +6478,6 @@ table@^6.0.3:
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
 
-tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
 tapable@^2.0.0, tapable@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.1.1.tgz#b01cc1902d42a7bb30514e320ce21c456f72fd3f"
@@ -6983,14 +6978,13 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-manifest-plugin@^3.0.0-rc.0:
+webpack-manifest-plugin@^3.0.0:
-  version "3.0.0-rc.0"
+  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-3.0.0-rc.0.tgz#d488cc34d9509aa4ffcf98eee8559d9106195e2a"
+  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-3.0.0.tgz#426644300e5dc41a75a9c996c4d4f876eb3c2b5b"
-  integrity sha512-KL4W5wh/ZnYF1pIzK/beFSgPPINbqD/oQeVS/5YwiZX486wcyZ+ZfeQZ1/8LfxHFG/s27G2hGcwkQ/H/amQCfQ==
+  integrity sha512-nbORTdky2HxD8XSaaT+zrsHb30AAgyWAWgCLWaAeQO21VGCScGb52ipqlHA/njix1Z8OW8IOlo4+XK0OKr1fkw==
   dependencies:
-    fs-extra "^8.1.0"
+    tapable "^2.0.0"
-    lodash "^4"
+    webpack-sources "^2.2.0"
-    tapable "^1.1.3"
 
 webpack-merge@^4.2.2:
   version "4.2.2"
@@ -7015,7 +7009,7 @@ webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^2.1.1:
+webpack-sources@^2.1.1, webpack-sources@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
   integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==