Migrates the "typescript" dependencies to a catalog

.yarn/versions/2c93d723.yml

@@ -0,0 +1,24 @@
+releases:
+  "@yarnpkg/cli": patch
+
+declined:
+  - "@yarnpkg/eslint-config"
+  - "@yarnpkg/plugin-compat"
+  - "@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"

.yarnrc.yml

@@ -21,6 +21,9 @@ npmPublishAccess: public
 
 npmPublishProvenance: true
 
+catalog:
+  typescript: "^5.9.2"
+
 packageExtensions:
   markdown-it@*:
     dependencies:

package.json

@@ -24,7 +24,7 @@
     "jest": "^29.2.1",
     "pirates": "^4.0.5",
     "tslib": "^2.4.0",
-    "typescript": "^5.9.2"
+    "typescript": "catalog:"
   },
   "resolutions": {
     "ink@^3.2.0": "patch:ink@npm%3A3.2.0#~/.yarn/patches/ink-npm-3.2.0-2f1df5b094.patch",

packages/docusaurus/package.json

@@ -68,7 +68,7 @@
     "three": "^0.145.0",
     "tslib": "^2.4.0",
     "typedoc": "^0.25.7",
-    "typescript": "^5.9.2",
+    "typescript": "catalog:",
     "unist-util-visit-parents": "^6.0.1",
     "usehooks-ts": "^3.1.1",
     "webpack": "^5.88.2"

packages/eslint-config/package.json

@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "eslint": "^9.20.1",
-    "typescript": "^5.9.2"
+    "typescript": "catalog:"
   },
   "stableVersion": "3.1.0"
 }

packages/yarnpkg-builder/package.json

@@ -21,7 +21,7 @@
   "devDependencies": {
     "@types/semver": "^7.1.0",
     "@yarnpkg/monorepo": "workspace:^",
-    "typescript": "^5.9.2"
+    "typescript": "catalog:"
   },
   "scripts": {
     "postpack": "rm -rf lib",

packages/yarnpkg-cli/package.json

@@ -79,6 +79,7 @@
     "bundles": {
       "standard": [
         "@yarnpkg/plugin-essentials",
+        "@yarnpkg/plugin-catalog",
         "@yarnpkg/plugin-compat",
         "@yarnpkg/plugin-constraints",
         "@yarnpkg/plugin-dlx",
@@ -101,8 +102,7 @@
         "@yarnpkg/plugin-stage",
         "@yarnpkg/plugin-typescript",
         "@yarnpkg/plugin-version",
-        "@yarnpkg/plugin-workspace-tools",
-        "@yarnpkg/plugin-catalog"
+        "@yarnpkg/plugin-workspace-tools"
       ]
     }
   },

packages/yarnpkg-doctor/package.json

@@ -16,7 +16,7 @@
     "micromatch": "^4.0.2",
     "p-limit": "^2.2.0",
     "tslib": "^2.4.0",
-    "typescript": "^5.9.2"
+    "typescript": "catalog:"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.1",

scripts/setup-local-plugins.js

@@ -21,6 +21,8 @@ const DYNAMIC_LIBS_MODULE = require.resolve(`${PACKAGES}/yarnpkg-cli/sources/too
 require.cache[PLUGIN_CONFIGURATION_MODULE] = {exports: {getPluginConfiguration}};
 
 function getPluginConfiguration() {
+  const pluginOrder = require(`@yarnpkg/cli/package.json`)[`@yarnpkg/builder`].bundles.standard;
+
   const folders = fs.readdirSync(PACKAGES);
 
   const pluginFolders = folders.filter(folder => {
@@ -40,9 +42,25 @@ function getPluginConfiguration() {
       console.warn(`Disabled non-requirable plugin ${folder}: ${e.message}`);
       isRequirable = false;
     }
+
     return isRequirable;
   });
 
+  pluginFolders.sort((a, b) => {
+    const indexA = pluginOrder.indexOf(`@yarnpkg/${a}`);
+    const indexB = pluginOrder.indexOf(`@yarnpkg/${b}`);
+
+    if (indexA === -1 && indexB === -1)
+      return a.localeCompare(b);
+
+    if (indexA === -1)
+      return 1;
+    if (indexB === -1)
+      return -1;
+
+    return indexA - indexB;
+  });
+
   // Note that we don't need to populate the `modules` field, because the
   // plugins will be loaded without being transformed by the builder wrapper,
   // so they will simply access their own set of dependencies.

yarn.lock

@@ -5811,7 +5811,7 @@ __metadata:
     esbuild: "npm:esbuild-wasm@^0.23.0"
     semver: "npm:^7.1.2"
     tslib: "npm:^2.4.0"
-    typescript: "npm:^5.9.2"
+    typescript: "catalog:"
   bin:
     builder: ./sources/boot-cli-dev.js
   languageName: unknown
@@ -5931,7 +5931,7 @@ __metadata:
     micromatch: "npm:^4.0.2"
     p-limit: "npm:^2.2.0"
     tslib: "npm:^2.4.0"
-    typescript: "npm:^5.9.2"
+    typescript: "catalog:"
   bin:
     doctor: ./sources/boot-cli-dev.js
   languageName: unknown
@@ -6019,7 +6019,7 @@ __metadata:
     three: "npm:^0.145.0"
     tslib: "npm:^2.4.0"
     typedoc: "npm:^0.25.7"
-    typescript: "npm:^5.9.2"
+    typescript: "catalog:"
     unified: "npm:^11.0.4"
     unist-util-visit-parents: "npm:^6.0.1"
     usehooks-ts: "npm:^3.1.1"
@@ -6040,7 +6040,7 @@ __metadata:
     eslint-plugin-react: "npm:^7.37.4"
     globals: "npm:^15.15.0"
     tslib: "npm:^2.4.0"
-    typescript: "npm:^5.9.2"
+    typescript: "catalog:"
   peerDependencies:
     eslint: "*"
     typescript: "*"
@@ -6125,7 +6125,7 @@ __metadata:
     pirates: "npm:^4.0.5"
     semver: "npm:^7.1.2"
     tslib: "npm:^2.4.0"
-    typescript: "npm:^5.9.2"
+    typescript: "catalog:"
   dependenciesMeta:
     core-js:
       built: false