diff --git a/package.json b/package.json index 0b9fb5b990a9..64f9631f70d9 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "@svgr/webpack": "^6.2.0", "autoprefixer": "^10.4.2", "babel-loader": "^8.2.3", - "copy-webpack-plugin": "^10.2.1", + "copy-webpack-plugin": "^10.2.2", "css-loader": "^6.5.1", "css-minimizer-webpack-plugin": "^3.4.1", "cypress": "^9.3.1", diff --git a/src/content/concepts/loaders.mdx b/src/content/concepts/loaders.mdx index f0b192469158..db238314199a 100644 --- a/src/content/concepts/loaders.mdx +++ b/src/content/concepts/loaders.mdx @@ -53,7 +53,13 @@ module.exports = { - [配置方式](#configuration)(推荐):在 **webpack.config.js** 文件中指定 loader。 - [内联方式](#inline):在每个 `import` 语句中显式指定 loader。 +<<<<<<< HEAD ### 配置方式 $#configuration$ +======= +Note that loaders can be used from CLI under webpack v4, but the feature was deprecated in webpack v5. + +### Configuration +>>>>>>> 6e0fed8b6ef2095d9a6ccf2b01155cf0a10406ce [`module.rules`](/configuration/module/#modulerules) 允许你在 webpack 配置中指定多个 loader。 这种方式是展示 loader 的一种简明方式,并且有助于使代码变得简洁和易于维护。同时让你对各个 loader 有个全局概览: diff --git a/yarn.lock b/yarn.lock index 1b5b4b902931..0ad862f4b959 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4301,10 +4301,10 @@ copy-to-clipboard@^3.3.1: dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz#115a41f913070ac236a1b576066204cbf35341a1" - integrity sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg== +copy-webpack-plugin@^10.2.2: + version "10.2.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.2.tgz#40a0475ea3921794bc4ea78a15c431a725ae3dee" + integrity sha512-hNdS4YM9NmbpW++GT2QevyXdeG9m2NZYFNDWN63MzZzFO1IFuH1KMtVJAoXX6yzTgsVz/x00exWcgdyX57ta9g== dependencies: fast-glob "^3.2.7" glob-parent "^6.0.1"