Merge branch 'master' into merceyz/esm-loader

.yarn/sdks/typescript/lib/tsserver.js

@@ -153,7 +153,7 @@ const moduleWrapper = tsserver => {
         typeof parsedMessage.arguments.hostInfo === `string`
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.[1-5][0-9]\./)) {
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
           hostInfo += ` <1.61`;
         }
       }

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -153,7 +153,7 @@ const moduleWrapper = tsserver => {
         typeof parsedMessage.arguments.hostInfo === `string`
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.[1-5][0-9]\./)) {
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
           hostInfo += ` <1.61`;
         }
       }

.yarn/versions/8d549ed5.yml

@@ -0,0 +1,33 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+  "@yarnpkg/plugin-git": patch
+  "@yarnpkg/plugin-github": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"

.yarn/versions/b6a6ec26.yml

@@ -0,0 +1,2 @@
+releases:
+  "@yarnpkg/sdks": patch

.yarn/versions/d0edcb62.yml

@@ -0,0 +1,24 @@
+releases:
+  "@yarnpkg/cli": minor
+  "@yarnpkg/plugin-npm": minor
+  "@yarnpkg/plugin-npm-cli": minor
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/versions/d36176bb.yml

@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-compat": patch
+
+declined:
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

.yarn/versions/d6a37a42.yml

@@ -0,0 +1,25 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-git": patch
+  "@yarnpkg/plugin-version": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

packages/acceptance-tests/pkg-tests-specs/sources/commands/workspaces/foreach.test.js

@@ -584,7 +584,6 @@ function makeWorkspacesForeachSinceEnv(cb) {
     workspaces: [`packages/*`],
   }, {
     plugins: [
-      require.resolve(`@yarnpkg/monorepo/scripts/plugin-version.js`),
       require.resolve(`@yarnpkg/monorepo/scripts/plugin-workspace-tools.js`),
     ],
   }, async ({path, run, ...rest}) => {

packages/acceptance-tests/pkg-tests-specs/sources/commands/workspaces/list.test.js

@@ -389,11 +389,7 @@ function makeWorkspacesListSinceEnv(cb) {
   return makeTemporaryEnv({
     private: true,
     workspaces: [`packages/*`],
-  }, {
-    plugins: [
-      require.resolve(`@yarnpkg/monorepo/scripts/plugin-version.js`),
-    ],
-  }, async ({path, run, ...rest}) => {
+  }, {}, async ({path, run, ...rest}) => {
     await setupWorkspaces(path);
 
     const git = (...args) => execFile(`git`, args, {cwd: path});

packages/gatsby/static/configuration/yarnrc.json

@@ -34,7 +34,7 @@
       "examples": ["./exampleCA.pem"]
     },
     "changesetBaseRefs": {
-      "_package": "@yarnpkg/plugin-version",
+      "_package": "@yarnpkg/plugin-git",
       "description": "The base git refs that the current HEAD is compared against in the version plugin. This overrides the default behavior of comparing against master, origin/master, upstream/master, main, origin/main, and upstream/main. Supports git branches, tags, and commits.",
       "type": "array",
       "items": {
@@ -43,7 +43,7 @@
       "default": ["master", "origin/master", "upstream/master", "main", "origin/main", "upstream/main"]
     },
     "changesetIgnorePatterns": {
-      "_package": "@yarnpkg/plugin-version",
+      "_package": "@yarnpkg/plugin-git",
       "description": "An Array of glob patterns. Files matching the following patterns (in terms of relative paths compared to the root of the project) will be ignored by the `yarn version check` command.",
       "type": "array",
       "items": {

packages/plugin-compat/sources/extensions.ts

@@ -164,7 +164,7 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [
     },
   }],
   // https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/pull/507
-  [`fork-ts-checker-webpack-plugin@*`, {
+  [`fork-ts-checker-webpack-plugin@<=6.3.4`, {
     peerDependencies: {
       eslint: `>= 6`,
       typescript: `>= 2.7`,
@@ -564,4 +564,143 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [
       logform: `^2.2.0`,
     },
   }],
+  // https://github.com/vire/jest-vue-preprocessor/pull/177
+  [`jest-vue-preprocessor@*`, {
+    dependencies: {
+      '@babel/core': `7.8.7`,
+      '@babel/template': `7.8.6`,
+    },
+    peerDependencies: {
+      pug: `^2.0.4`,
+    },
+    peerDependenciesMeta: {
+      pug: optionalPeerDep,
+    },
+  }],
+  // https://github.com/rt2zz/redux-persist/pull/1336
+  [`redux-persist@*`, {
+    peerDependencies: {
+      react: `>=16`,
+    },
+    peerDependenciesMeta: {
+      react: optionalPeerDep,
+    },
+  }],
+  // https://github.com/paixaop/node-sodium/pull/159
+  [`sodium@>=3`, {
+    dependencies: {
+      'node-gyp': `^3.8.0`,
+    },
+  }],
+  // https://github.com/gajus/babel-plugin-graphql-tag/pull/63
+  [`babel-plugin-graphql-tag@<=3.1.0`, {
+    peerDependencies: {
+      graphql: `^14.0.0 || ^15.0.0`,
+    },
+  }],
+  // https://github.com/microsoft/playwright/pull/8501
+  [`@playwright/test@<=1.14.1`, {
+    dependencies: {
+      'jest-matcher-utils': `^26.4.2`,
+    },
+  }],
+  // https://github.com/gatsbyjs/gatsby/pull/32954
+  ...[
+    `babel-plugin-remove-graphql-queries@<3.14.0-next.1`,
+    `babel-preset-gatsby-package@<1.14.0-next.1`,
+    `create-gatsby@<1.14.0-next.1`,
+    `gatsby-admin@<0.24.0-next.1`,
+    `gatsby-cli@<3.14.0-next.1`,
+    `gatsby-core-utils@<2.14.0-next.1`,
+    `gatsby-design-tokens@<3.14.0-next.1`,
+    `gatsby-legacy-polyfills@<1.14.0-next.1`,
+    `gatsby-plugin-benchmark-reporting@<1.14.0-next.1`,
+    `gatsby-plugin-graphql-config@<0.23.0-next.1`,
+    `gatsby-plugin-image@<1.14.0-next.1`,
+    `gatsby-plugin-mdx@<2.14.0-next.1`,
+    `gatsby-plugin-netlify-cms@<5.14.0-next.1`,
+    `gatsby-plugin-no-sourcemaps@<3.14.0-next.1`,
+    `gatsby-plugin-page-creator@<3.14.0-next.1`,
+    `gatsby-plugin-preact@<5.14.0-next.1`,
+    `gatsby-plugin-preload-fonts@<2.14.0-next.1`,
+    `gatsby-plugin-schema-snapshot@<2.14.0-next.1`,
+    `gatsby-plugin-styletron@<6.14.0-next.1`,
+    `gatsby-plugin-subfont@<3.14.0-next.1`,
+    `gatsby-plugin-utils@<1.14.0-next.1`,
+    `gatsby-recipes@<0.25.0-next.1`,
+    `gatsby-source-shopify@<5.6.0-next.1`,
+    `gatsby-source-wikipedia@<3.14.0-next.1`,
+    `gatsby-transformer-screenshot@<3.14.0-next.1`,
+    `gatsby-worker@<0.5.0-next.1`,
+  ].map<[string, PackageExtensionData]>(descriptorString => [
+    descriptorString,
+    {
+      dependencies: {
+        '@babel/runtime': `^7.14.8`,
+      },
+    },
+  ]),
+  // Originally fixed in https://github.com/gatsbyjs/gatsby/pull/31837 (https://github.com/gatsbyjs/gatsby/commit/6378692d7ec1eb902520720e27aca97e8eb42c21)
+  // Version updated and added in https://github.com/gatsbyjs/gatsby/pull/32928
+  [`gatsby-core-utils@<2.14.0-next.1`, {
+    dependencies: {
+      got: `8.3.2`,
+    },
+  }],
+  // https://github.com/gatsbyjs/gatsby/pull/32861
+  [`gatsby-plugin-gatsby-cloud@<=3.1.0-next.0`, {
+    dependencies: {
+      'gatsby-core-utils': `^2.13.0-next.0`,
+    },
+  }],
+  // https://github.com/gatsbyjs/gatsby/pull/31837
+  [`gatsby-plugin-gatsby-cloud@<=3.2.0-next.1`, {
+    peerDependencies: {
+      webpack: `*`,
+    },
+  }],
+  // https://github.com/gatsbyjs/gatsby/pull/31837
+  [`babel-plugin-remove-graphql-queries@<=3.14.0-next.1`, {
+    dependencies: {
+      'gatsby-core-utils': `^2.8.0-next.1`,
+    },
+  }],
+  // https://github.com/gatsbyjs/gatsby/pull/32861
+  [`gatsby-plugin-netlify@3.13.0-next.1`, {
+    dependencies: {
+      'gatsby-core-utils': `^2.13.0-next.0`,
+    },
+  }],
+  // https://github.com/paul-soporan/clipanion-v3-codemod/pull/1
+  [`clipanion-v3-codemod@<=0.2.0`, {
+    peerDependencies: {
+      jscodeshift: `^0.11.0`,
+    },
+  }],
+  // https://github.com/FormidableLabs/react-live/pull/180
+  [`react-live@*`, {
+    peerDependencies: {
+      'react-dom': `*`,
+      react: `*`,
+    },
+  }],
+  // https://github.com/webpack/webpack/pull/11190
+  [`webpack@<4.44.1`, {
+    peerDependenciesMeta: {
+      'webpack-cli': optionalPeerDep,
+      'webpack-command': optionalPeerDep,
+    },
+  }],
+  // https://github.com/webpack/webpack/pull/11189
+  [`webpack@<5.0.0-beta.23`, {
+    peerDependenciesMeta: {
+      'webpack-cli': optionalPeerDep,
+    },
+  }],
+  // https://github.com/webpack/webpack-dev-server/pull/2396
+  [`webpack-dev-server@<3.10.2`, {
+    peerDependenciesMeta: {
+      'webpack-cli': optionalPeerDep,
+    },
+  }],
 ];

packages/plugin-git/sources/index.ts

@@ -14,12 +14,27 @@ export interface Hooks {
 
 declare module '@yarnpkg/core' {
   interface ConfigurationValueMap {
+    changesetBaseRefs: Array<string>;
+    changesetIgnorePatterns: Array<string>;
     cloneConcurrency: number;
   }
 }
 
 const plugin: Plugin = {
   configuration: {
+    changesetBaseRefs: {
+      description: `The base git refs that the current HEAD is compared against when detecting changes. Supports git branches, tags, and commits.`,
+      type: SettingsType.STRING,
+      isArray: true,
+      isNullable: false,
+      default: [`master`, `origin/master`, `upstream/master`, `main`, `origin/main`, `upstream/main`],
+    },
+    changesetIgnorePatterns: {
+      description: `Array of glob patterns; files matching them will be ignored when fetching the changed files`,
+      type: SettingsType.STRING,
+      default: [],
+      isArray: true,
+    },
     cloneConcurrency: {
       description: `Maximal number of concurrent clones`,
       type: SettingsType.NUMBER,

packages/plugin-npm-cli/sources/commands/npm/audit.ts

@@ -96,7 +96,7 @@ export default class AuditCommand extends BaseCommand {
       dependencies,
     };
 
-    const registry = npmConfigUtils.getPublishRegistry(workspace.manifest, {
+    const registry = npmConfigUtils.getAuditRegistry(workspace.manifest, {
       configuration,
     });
 
@@ -106,7 +106,7 @@ export default class AuditCommand extends BaseCommand {
       stdout: this.context.stdout,
     }, async () => {
       result = ((await npmHttpUtils.post(`/-/npm/v1/security/audits/quick`, body, {
-        authType: npmHttpUtils.AuthType.NO_AUTH,
+        authType: npmHttpUtils.AuthType.BEST_EFFORT,
         configuration,
         jsonResponse: true,
         registry,

packages/plugin-npm-cli/sources/npmAuditUtils.ts

@@ -183,7 +183,7 @@ export function getReportTree(result: npmAuditTypes.AuditResponse, severity?: np
         },
         Recommendation: {
           label: `Recommendation`,
-          value: formatUtils.tuple(formatUtils.Type.NO_HINT, advisory.recommendation.replace(/\n/g, ` `)),
+          value: formatUtils.tuple(formatUtils.Type.NO_HINT, advisory.recommendation?.replace(/\n/g, ` `)),
         },
       },
     };

packages/plugin-npm/sources/index.ts

@@ -34,6 +34,11 @@ const authSettings = {
 };
 
 const registrySettings = {
+  npmAuditRegistry: {
+    description: `Registry to query for audit reports`,
+    type: SettingsType.STRING as const,
+    default: null,
+  },
   npmPublishRegistry: {
     description: `Registry to push packages to`,
     type: SettingsType.STRING as const,
@@ -52,6 +57,7 @@ declare module '@yarnpkg/core' {
     npmAuthIdent: string | null;
     npmAuthToken: string | null;
 
+    npmAuditRegistry: string | null;
     npmPublishRegistry: string | null;
     npmRegistryServer: string;