From 59fb0263fcf0fcceee2de190c3cd99837af67f50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 03:05:13 +0000 Subject: [PATCH 1/3] Bump webpack-manifest-plugin from 3.0.0-rc.0 to 3.0.0 Bumps [webpack-manifest-plugin](https://github.com/shellscape/webpack-manifest-plugin) from 3.0.0-rc.0 to 3.0.0. - [Release notes](https://github.com/shellscape/webpack-manifest-plugin/releases) - [Commits](https://github.com/shellscape/webpack-manifest-plugin/compare/v3.0.0-rc.0...v3.0.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index bf98c7098..b8fd6367e 100644 --- a/package.json +++ b/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": { diff --git a/yarn.lock b/yarn.lock index f9f55cf7e..1f8e97320 100644 --- a/yarn.lock +++ b/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: - version "3.0.0-rc.0" - resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-3.0.0-rc.0.tgz#d488cc34d9509aa4ffcf98eee8559d9106195e2a" - integrity sha512-KL4W5wh/ZnYF1pIzK/beFSgPPINbqD/oQeVS/5YwiZX486wcyZ+ZfeQZ1/8LfxHFG/s27G2hGcwkQ/H/amQCfQ== +webpack-manifest-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-3.0.0.tgz#426644300e5dc41a75a9c996c4d4f876eb3c2b5b" + integrity sha512-nbORTdky2HxD8XSaaT+zrsHb30AAgyWAWgCLWaAeQO21VGCScGb52ipqlHA/njix1Z8OW8IOlo4+XK0OKr1fkw== dependencies: - fs-extra "^8.1.0" - lodash "^4" - tapable "^1.1.3" + tapable "^2.0.0" + webpack-sources "^2.2.0" 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== From 92b14a3536bd0a6ee4501b00d6872aeb8628aae1 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 3 Dec 2020 10:15:21 +0100 Subject: [PATCH 2/3] Update for `webpack-manifest-plugin` --- app/config/webpack/prod.js | 4 ++-- web/wallassets/manifest.json | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index 056c617ab..80a5d2561 100644 --- a/app/config/webpack/prod.js +++ b/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', }), ], diff --git a/web/wallassets/manifest.json b/web/wallassets/manifest.json index 0e66a793f..4c2a345e0 100644 --- a/web/wallassets/manifest.json +++ b/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", From 189a9ef033d2a2a2ebaba0c0618aaf17c8f15fb3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 3 Dec 2020 10:16:03 +0100 Subject: [PATCH 3/3] Use `ramsey/composer-install` to handle composer install & cache --- .github/workflows/coding-standards.yml | 15 +++------------ .github/workflows/continuous-integration.yml | 15 +++------------ .github/workflows/translations.yml | 15 +++------------ 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 99f70db73..92ff64e52 100644 --- a/.github/workflows/coding-standards.yml +++ b/.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" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index db0702ce6..f7cf4a7a7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.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 - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" 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" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Prepare database" run: "make prepare DB=${{ matrix.database }}" diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 67cb74dc1..c7a9e0b59 100644 --- a/.github/workflows/translations.yml +++ b/.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"