From 05223013d816465a8fd4b62e7607902bc05e3e71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 02:02:58 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump prettier from 2.3.0 to 2.3.1 Bumps [prettier](https://github.com/prettier/prettier) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.3.0...2.3.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bced1648ca6..5be137d9ee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5293,9 +5293,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.0.5, prettier@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" - integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== + version "2.3.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" + integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== pretty-format@^26.0.0, pretty-format@^26.3.0, pretty-format@^26.6.2: version "26.6.2" From 1edacddaa4deb3ffa50484cac6c227ed62d4cbe6 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 21 Jun 2021 11:18:23 +0200 Subject: [PATCH 2/2] prettier --- .prettierignore | 3 +++ types.d.ts | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.prettierignore b/.prettierignore index dceadd34a1f..bf425289bd9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,3 +9,6 @@ test/*.* # Ignore example fixtures examples/*.* !examples/**/webpack.config.js + +# Ignore generated files +*.check.js diff --git a/types.d.ts b/types.d.ts index f3913998a54..3ca68df1e60 100644 --- a/types.d.ts +++ b/types.d.ts @@ -5795,11 +5795,13 @@ type LoaderContext = NormalModuleLoaderContext & LoaderRunnerLoaderContext & LoaderPluginLoaderContext & HotModuleReplacementPluginLoaderContext; -type LoaderDefinition = - LoaderDefinitionFunction & { - raw?: false; - pitch?: PitchLoaderDefinitionFunction; - }; +type LoaderDefinition< + OptionsType = {}, + ContextAdditions = {} +> = LoaderDefinitionFunction & { + raw?: false; + pitch?: PitchLoaderDefinitionFunction; +}; declare interface LoaderDefinitionFunction< OptionsType = {}, ContextAdditions = {} @@ -8662,11 +8664,13 @@ declare interface RawChunkGroupOptions { preloadOrder?: number; prefetchOrder?: number; } -type RawLoaderDefinition = - RawLoaderDefinitionFunction & { - raw: true; - pitch?: PitchLoaderDefinitionFunction; - }; +type RawLoaderDefinition< + OptionsType = {}, + ContextAdditions = {} +> = RawLoaderDefinitionFunction & { + raw: true; + pitch?: PitchLoaderDefinitionFunction; +}; declare interface RawLoaderDefinitionFunction< OptionsType = {}, ContextAdditions = {}