Merge branch 'master' into joverbye-dedupe-optimisation

Author: jordanoverbye

.pnp.cjs

@@ -0,0 +1,38 @@
+releases:
+  "@yarnpkg/fslib": patch
+
+declined:
+  - "@yarnpkg/plugin-catalog"
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-jsr"
+  - "@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"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/cli"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/libzip"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnp"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
+  - "@yarnpkg/shell"

.yarn/versions/78344001.yml

@@ -479,16 +479,14 @@ export const startPackageServer = ({type}: {type: keyof typeof packageServerUrls
       const packageVersionEntry = packageEntry.get(version);
       invariant(packageVersionEntry, `This can only exist`);
 
-      const data = JSON.stringify({
-        [version as string]: Object.assign({}, packageVersionEntry!.packageJson, {
-          dist: {
-            shasum: await getPackageArchiveHash(name, version),
-            tarball: (localName === `unconventional-tarball` || localName === `private-unconventional-tarball`)
-              ? (await getPackageHttpArchivePath(name, version)).replace(`/-/`, `/tralala/`)
-              : await getPackageHttpArchivePath(name, version),
-          },
-        }),
-      });
+      const data = JSON.stringify(Object.assign({}, packageVersionEntry!.packageJson, {
+        dist: {
+          shasum: await getPackageArchiveHash(name, version),
+          tarball: (localName === `unconventional-tarball` || localName === `private-unconventional-tarball`)
+            ? (await getPackageHttpArchivePath(name, version)).replace(`/-/`, `/tralala/`)
+            : await getPackageHttpArchivePath(name, version),
+        },
+      }));
 
       response.writeHead(200, {[`Content-Type`]: `application/json`});
       response.end(data);

packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts

@@ -133,6 +133,10 @@ This code ensures that no two workspaces in your project can list the same packa
 /** @type {import('@yarnpkg/types')} */
 const {defineConfig} = require(`@yarnpkg/types`);
 
+/**
+ * @typedef {import('@yarnpkg/types').Yarn.Constraints.Context} Context
+ */
+
 /**
  * This rule will enforce that a workspace MUST depend on the same version of
  * a dependency as the one used by the other workspaces.

packages/berry-cli/bin/berry.js

@@ -6,7 +6,8 @@
     "build": "docusaurus build",
     "swizzle": "docusaurus swizzle",
     "clear": "docusaurus clear",
-    "serve": "docusaurus serve"
+    "serve": "docusaurus serve",
+    "test:schema": "run test:unit packages/docusaurus"
   },
   "dependencies": {
     "@docusaurus/core": "^3.7.0",
@@ -79,6 +80,7 @@
     "@docusaurus/types": "^3.7.0",
     "@types/dompurify": "^3",
     "@types/git-url-parse": "^9.0.0",
+    "@types/jest": "^28.1.6",
     "@types/markdown-it": "^12.2.3",
     "@types/marked": "^5.0.0",
     "@types/mdast": "^4.0.3",
@@ -91,6 +93,7 @@
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.1.0",
     "@types/three": "^0.144.0",
+    "ajv": "^8.17.1",
     "clipanion": "^4.0.0-rc.2",
     "mdast-util-mdx-jsx": "^3.0.0",
     "unified": "^11.0.4"

packages/docusaurus/docs/features/constraints.mdx

@@ -273,7 +273,7 @@
     "httpTimeout": {
       "_package": "@yarnpkg/core",
       "title": "Amount of time to wait before cancelling pending HTTP requests.",
-      "type": "mixed",
+      "type": ["number", "string"],
       "oneOf": [
         { "type": "number" },
         { "type": "string", "pattern": "^(\\d*\\.?\\d+)(ms|s|m|h|d|w)?$" }
@@ -487,7 +487,7 @@
       "_package": "@yarnpkg/core",
       "title": "Minimum age of a package version according to the publish date on the npm registry to be considered for installation.",
       "description": "If a package version is newer than the minimal age gate, it will not be considered for installation. This can be used to reduce the likelihood of installing compromised packages, or to avoid relying on packages that could still be unpublished (e.g. the npm registry has specific rules for packages less than 3 days old).",
-      "type": "mixed",
+      "type": ["number", "string"],
       "oneOf": [
         { "type": "number" },
         { "type": "string", "pattern": "^(\\d*\\.?\\d+)(ms|s|m|h|d|w)?$" }
@@ -861,7 +861,7 @@
       "_package": "@yarnpkg/core",
       "title": "Define the minimal amount of time between two telemetry events.",
       "description": "By default we only send one request per week, making it impossible for us to track your usage with a lower granularity.",
-      "type": "mixed",
+      "type": ["number", "string"],
       "oneOf": [
         { "type": "number" },
         { "type": "string", "pattern": "^(\\d*\\.?\\d+)(ms|s|m|h|d|w)?$" }

packages/docusaurus/package.json

@@ -0,0 +1,24 @@
+import Ajv2019         from 'ajv/dist/2019';
+import draft2019Schema from 'ajv/dist/refs/json-schema-2019-09/schema.json';
+
+import manifestSchema  from '../static/configuration/manifest.json';
+import yarnRcSchema    from '../static/configuration/yarnrc.json';
+
+const ajv = new Ajv2019();
+const validate = ajv.compile(draft2019Schema);
+
+describe(`manifest.json`, () => {
+  it(`is a valid JSON Schema`, () => {
+    const result = validate(manifestSchema);
+    expect(validate.errors).toBeNull();
+    expect(result).toBe(true);
+  });
+});
+
+describe(`yarnrc.json`, () => {
+  it(`is a valid JSON Schema`, () => {
+    const result = validate(yarnRcSchema);
+    expect(validate.errors).toBeNull();
+    expect(result).toBe(true);
+  });
+});

packages/docusaurus/static/configuration/yarnrc.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-git",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "exports": {
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=18.12.0"
   },
-  "stableVersion": "3.1.3"
+  "stableVersion": "3.1.4"
 }

packages/docusaurus/tests/schema.test.ts

@@ -259,7 +259,7 @@ export async function clone(url: string, configuration: Configuration) {
     const directory = await xfs.mktempPromise();
     const execOpts = {cwd: directory, env: makeGitEnvironment()};
 
-    await git(`cloning the repository`, [`clone`, `-c core.autocrlf=false`, normalizedRepoUrl, npath.fromPortablePath(directory)], execOpts, {configuration, normalizedRepoUrl});
+    await git(`cloning the repository`, [`clone`, `-c`, `core.autocrlf=false`, normalizedRepoUrl, npath.fromPortablePath(directory)], execOpts, {configuration, normalizedRepoUrl});
     await git(`switching branch`, [`checkout`, `${request}`], execOpts, {configuration, normalizedRepoUrl});
 
     return directory;