From a8a86bbf604544424f6a3ecd2bed6edf570d3765 Mon Sep 17 00:00:00 2001 From: Matthew Hailwood Date: Tue, 11 May 2021 11:01:28 +1200 Subject: [PATCH] Change friendly-errors-webpack-plugin to @nuxt/friendly-errors-webpack-plugin --- index.js | 4 +-- lib/plugins/asset-output-display.js | 2 +- lib/plugins/friendly-errors.js | 2 +- package.json | 2 +- test/plugins/friendly-errors.js | 2 +- yarn.lock | 41 ++++++++++++----------------- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/index.js b/index.js index 983f89691..d587f0e9c 100644 --- a/index.js +++ b/index.js @@ -124,8 +124,8 @@ class Encore { } /** - * Allows you to configure the options passed to the friendly-errors-webpack-plugin. - * A list of available options can be found at https://github.com/geowarin/friendly-errors-webpack-plugin + * Allows you to configure the options passed to the @nuxt/friendly-errors-webpack-plugin. + * A list of available options can be found at https://github.com/nuxt/friendly-errors-webpack-plugin * * For example: * diff --git a/lib/plugins/asset-output-display.js b/lib/plugins/asset-output-display.js index c774166b3..ca11717fe 100644 --- a/lib/plugins/asset-output-display.js +++ b/lib/plugins/asset-output-display.js @@ -10,7 +10,7 @@ 'use strict'; const WebpackConfig = require('../WebpackConfig'); //eslint-disable-line no-unused-vars -const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin'); //eslint-disable-line no-unused-vars +const FriendlyErrorsWebpackPlugin = require('@nuxt/friendly-errors-webpack-plugin'); //eslint-disable-line no-unused-vars const pathUtil = require('../config/path-util'); const AssetOutputDisplayPlugin = require('../friendly-errors/asset-output-display-plugin'); const PluginPriorities = require('./plugin-priorities'); diff --git a/lib/plugins/friendly-errors.js b/lib/plugins/friendly-errors.js index 00480ed31..a3b374add 100644 --- a/lib/plugins/friendly-errors.js +++ b/lib/plugins/friendly-errors.js @@ -10,7 +10,7 @@ 'use strict'; const WebpackConfig = require('../WebpackConfig'); //eslint-disable-line no-unused-vars -const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin'); +const FriendlyErrorsWebpackPlugin = require('@nuxt/friendly-errors-webpack-plugin'); const missingCssFileTransformer = require('../friendly-errors/transformers/missing-css-file'); const missingCssFileFormatter = require('../friendly-errors/formatters/missing-css-file'); const missingLoaderTransformerFactory = require('../friendly-errors/transformers/missing-loader'); diff --git a/package.json b/package.json index eaf264811..6697d156a 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@babel/core": "^7.7.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/preset-env": "^7.10.0", + "@nuxt/friendly-errors-webpack-plugin": "^2.5.1", "assets-webpack-plugin": "7.0.*", "babel-loader": "^8.2.2", "chalk": "^4.0.0", @@ -35,7 +36,6 @@ "css-loader": "^5.2.4", "css-minimizer-webpack-plugin": "^2.0.0", "fast-levenshtein": "^3.0.0", - "friendly-errors-webpack-plugin": "^2.0.0-beta.2", "loader-utils": "^2.0.0", "mini-css-extract-plugin": "^1.5.0", "pkg-up": "^3.1.0", diff --git a/test/plugins/friendly-errors.js b/test/plugins/friendly-errors.js index ec5cf4833..e3e264597 100644 --- a/test/plugins/friendly-errors.js +++ b/test/plugins/friendly-errors.js @@ -10,7 +10,7 @@ 'use strict'; const expect = require('chai').expect; -const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin'); +const FriendlyErrorsWebpackPlugin = require('@nuxt/friendly-errors-webpack-plugin'); const WebpackConfig = require('../../lib/WebpackConfig'); const RuntimeConfig = require('../../lib/config/RuntimeConfig'); const friendlyErrorsPluginUtil = require('../../lib/plugins/friendly-errors'); diff --git a/yarn.lock b/yarn.lock index 246f2740d..463b4b4be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -955,6 +955,16 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" +"@nuxt/friendly-errors-webpack-plugin@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.1.tgz#3ab815c31eb43859a239848a85481157aaf7b07e" + integrity sha512-mKN0Mbb1PjJYBzrswsyWvSEZw5Jxi0fQZPMA0ssrTmkz9lvtxtXq4luhX31OpULUvbc0jLaBu/SL0ExlxIbTlw== + dependencies: + chalk "^2.3.2" + consola "^2.6.0" + error-stack-parser "^2.0.0" + string-width "^2.0.0" + "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -1561,11 +1571,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -2034,7 +2039,7 @@ chai@^4.2.0: pathval "^1.1.1" type-detect "^4.0.5" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2216,6 +2221,11 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +consola@^2.6.0: + version "2.15.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== + consolidate@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16" @@ -2898,7 +2908,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.2: +error-stack-parser@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== @@ -3496,16 +3506,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -friendly-errors-webpack-plugin@^2.0.0-beta.2: - version "2.0.0-beta.2" - resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.0.0-beta.2.tgz#69987c67c2ed3e93847248f8ba1920f75f6ff45c" - integrity sha512-0x14cdjGx5q0yZc3Cy9sgAF/szWUFx1WxH/IX88UuKbM5Z+7FCk/Z/6hFbXMcz3qqK0mp7WrHKX3cxhUAL2aqQ== - dependencies: - chalk "^2.4.2" - error-stack-parser "^2.0.2" - string-width "^2.0.0" - strip-ansi "^5" - fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -6638,13 +6638,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"