fix: fix declaration of dependencies (#2667)

.changeset/khaki-eagles-attack.md

@@ -0,0 +1,6 @@
+---
+"@rnx-kit/metro-service": patch
+"@rnx-kit/cli": patch
+---
+
+Ensure dependencies are correctly declared

package.json

@@ -37,7 +37,6 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@changesets/cli": "^2.22.0",
-    "@rnx-kit/align-deps": "*",
     "eslint": "^8.0.0",
     "jest-cli": "^29.2.1",
     "metro": "^0.76.5",

packages/babel-preset-metro-react-native/package.json

@@ -45,7 +45,7 @@
   },
   "depcheck": {
     "ignoreMatches": [
-      "babel-plugin-const-enum"
+      "@rnx-kit/babel-plugin-import-path-remapper"
     ]
   },
   "eslintConfig": {

packages/cli/package.json

@@ -41,6 +41,7 @@
   },
   "peerDependencies": {
     "@react-native-community/cli": ">=5.0.1",
+    "@react-native-community/cli-clean": ">=8.0.0",
     "@react-native-community/cli-server-api": ">=5.0.1",
     "jest-cli": ">=26.0",
     "react-native": ">=0.64"
@@ -49,6 +50,9 @@
     "@react-native-community/cli": {
       "optional": true
     },
+    "@react-native-community/cli-clean": {
+      "optional": true
+    },
     "@react-native-community/cli-server-api": {
       "optional": true
     },
@@ -66,6 +70,8 @@
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
     "memfs": "^4.0.0",
+    "metro": "^0.76.5",
+    "metro-babel-transformer": "^0.76.8",
     "metro-config": "^0.76.5",
     "prettier": "^3.0.0",
     "type-fest": "^3.0.0",
@@ -73,9 +79,6 @@
   },
   "depcheck": {
     "ignoreMatches": [
-      "@react-native-community/cli-clean",
-      "metro",
-      "metro-babel-transformer",
       "readline"
     ]
   },

packages/config/package.json

@@ -45,14 +45,10 @@
     "@types/semver": "^7.0.0",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro": "^0.76.5",
     "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "metro"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

packages/eslint-plugin/package.json

@@ -52,7 +52,6 @@
   "depcheck": {
     "ignoreMatches": [
       "@typescript-eslint/eslint-plugin",
-      "@typescript-eslint/parser",
       "@typescript-eslint/types",
       "eslint-plugin-react",
       "eslint-plugin-react-hooks"

packages/jest-preset/package.json

@@ -54,7 +54,8 @@
     "ignoreMatches": [
       "@babel/preset-env",
       "@babel/preset-typescript",
-      "@jest/types"
+      "@jest/types",
+      "react"
     ]
   },
   "eslintConfig": {

packages/metro-config/package.json

@@ -51,6 +51,7 @@
     "@types/jest": "^29.2.1",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro": "^0.76.5",
     "metro-config": "^0.76.5",
     "metro-react-native-babel-preset": "^0.76.5",
     "prettier": "^3.0.0",
@@ -60,8 +61,10 @@
   },
   "depcheck": {
     "ignoreMatches": [
+      "@babel/core",
+      "@babel/preset-env",
       "@rnx-kit/babel-preset-metro-react-native",
-      "metro"
+      "type-fest"
     ]
   },
   "eslintConfig": {

packages/metro-plugin-cyclic-dependencies-detector/package.json

@@ -31,14 +31,10 @@
     "@types/node": "^18.0.0",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro": "^0.76.5",
     "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "metro"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

packages/metro-plugin-duplicates-checker/package.json

@@ -34,15 +34,11 @@
     "@types/node": "^18.0.0",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro": "^0.76.5",
+    "metro-source-map": "^0.76.8",
     "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "metro",
-      "metro-source-map"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

packages/metro-plugin-typescript/package.json

@@ -40,13 +40,9 @@
     "@rnx-kit/scripts": "*",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro": "^0.76.5",
     "prettier": "^3.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "metro"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

packages/metro-serializer-esbuild/package.json

@@ -44,7 +44,9 @@
     "jest": "^29.2.1",
     "lodash-es": "^4.17.21",
     "metro": "^0.76.5",
+    "metro-config": "^0.76.5",
     "metro-react-native-babel-preset": "^0.76.5",
+    "metro-transform-worker": "^0.76.5",
     "prettier": "^3.0.0",
     "react": "18.2.0",
     "react-native": "^0.72.0",
@@ -52,10 +54,7 @@
   },
   "depcheck": {
     "ignoreMatches": [
-      "@fluentui/utilities",
-      "lodash-es",
-      "metro-config",
-      "metro-transform-worker"
+      "@babel/preset-env"
     ]
   },
   "eslintConfig": {

packages/metro-service/package.json

@@ -29,6 +29,7 @@
     "chalk": "^4.1.0"
   },
   "peerDependencies": {
+    "@office-iss/react-native-win32": "*",
     "@react-native-community/cli-plugin-metro": "*",
     "@react-native/metro-config": "*",
     "metro": ">=0.66.1",
@@ -39,6 +40,9 @@
     "metro-runtime": ">=0.66.1"
   },
   "peerDependenciesMeta": {
+    "@office-iss/react-native-win32": {
+      "optional": true
+    },
     "@react-native-community/cli-plugin-metro": {
       "optional": true
     },
@@ -61,12 +65,6 @@
     "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "@office-iss/react-native-win32",
-      "metro-babel-transformer"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

packages/third-party-notices/package.json

@@ -38,14 +38,10 @@
     "@types/yargs": "^16.0.0",
     "eslint": "^8.0.0",
     "jest": "^29.2.1",
+    "metro-source-map": "^0.76.8",
     "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
-  "depcheck": {
-    "ignoreMatches": [
-      "metro-source-map"
-    ]
-  },
   "eslintConfig": {
     "extends": "@rnx-kit/eslint-config"
   },

scripts/package.json

@@ -30,13 +30,7 @@
   "depcheck": {
     "ignoreMatches": [
       "@rnx-kit/align-deps",
-      "@rnx-kit/jest-preset",
-      "depcheck",
-      "esbuild",
-      "markdown-table",
-      "prettier-plugin-organize-imports",
-      "typedoc",
-      "yargs"
+      "@rnx-kit/jest-preset"
     ]
   },
   "eslintConfig": {

scripts/src/commands/bundle.mjs

@@ -31,7 +31,7 @@ export default async function bundle(options) {
   const targetPlatform = ensureValidPlatform(platform);
 
   const manifest = fs.readFileSync("package.json", { encoding: "utf-8" });
-  const { main, dependencies } = JSON.parse(manifest);
+  const { main, dependencies, peerDependencies } = JSON.parse(manifest);
 
   const esbuild = await import("esbuild");
   await esbuild.build({
@@ -40,6 +40,7 @@ export default async function bundle(options) {
     entryPoints: ["src/index.ts"],
     external: [
       ...(dependencies ? Object.keys(dependencies) : []),
+      ...(peerDependencies ? Object.keys(peerDependencies) : []),
       "./package.json",
     ],
     minify: Boolean(minify),

scripts/src/commands/depcheck.mjs

@@ -28,7 +28,7 @@ export default async function depcheck() {
     const config = JSON.parse(json);
     const options = mergeOneLevel(
       {
-        ignorePatterns: ["/lib/*", "/test/__fixtures__/*"],
+        ignorePatterns: ["/lib/*"],
         ignoreMatches: [
           "@rnx-kit/eslint-config",
           "@rnx-kit/scripts",

yarn.lock

@@ -3351,7 +3351,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rnx-kit/align-deps@*, @rnx-kit/align-deps@^2.2.2, @rnx-kit/align-deps@workspace:packages/align-deps":
+"@rnx-kit/align-deps@^2.2.2, @rnx-kit/align-deps@workspace:packages/align-deps":
   version: 0.0.0-use.local
   resolution: "@rnx-kit/align-deps@workspace:packages/align-deps"
   dependencies:
@@ -3505,6 +3505,8 @@ __metadata:
     fs-extra: ^10.0.0
     jest: ^29.2.1
     memfs: ^4.0.0
+    metro: ^0.76.5
+    metro-babel-transformer: ^0.76.8
     metro-config: ^0.76.5
     ora: ^5.4.1
     prettier: ^3.0.0
@@ -3514,12 +3516,15 @@ __metadata:
     typescript: ^5.0.0
   peerDependencies:
     "@react-native-community/cli": ">=5.0.1"
+    "@react-native-community/cli-clean": ">=8.0.0"
     "@react-native-community/cli-server-api": ">=5.0.1"
     jest-cli: ">=26.0"
     react-native: ">=0.64"
   peerDependenciesMeta:
     "@react-native-community/cli":
       optional: true
+    "@react-native-community/cli-clean":
+      optional: true
     "@react-native-community/cli-server-api":
       optional: true
     jest-cli:
@@ -3558,6 +3563,7 @@ __metadata:
     "@types/semver": ^7.0.0
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro: ^0.76.5
     prettier: ^3.0.0
     semver: ^7.0.0
     typescript: ^5.0.0
@@ -3701,6 +3707,7 @@ __metadata:
     "@types/jest": ^29.2.1
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro: ^0.76.5
     metro-config: ^0.76.5
     metro-react-native-babel-preset: ^0.76.5
     prettier: ^3.0.0
@@ -3734,6 +3741,7 @@ __metadata:
     "@types/node": ^18.0.0
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro: ^0.76.5
     prettier: ^3.0.0
     typescript: ^5.0.0
   languageName: unknown
@@ -3751,6 +3759,8 @@ __metadata:
     "@types/node": ^18.0.0
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro: ^0.76.5
+    metro-source-map: ^0.76.8
     prettier: ^3.0.0
     typescript: ^5.0.0
   bin:
@@ -3770,6 +3780,7 @@ __metadata:
     "@rnx-kit/typescript-service": ^1.5.7
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro: ^0.76.5
     prettier: ^3.0.0
     semver: ^7.0.0
     typescript: ">=4.7.0"
@@ -3818,7 +3829,9 @@ __metadata:
     jest: ^29.2.1
     lodash-es: ^4.17.21
     metro: ^0.76.5
+    metro-config: ^0.76.5
     metro-react-native-babel-preset: ^0.76.5
+    metro-transform-worker: ^0.76.5
     prettier: ^3.0.0
     react: 18.2.0
     react-native: ^0.72.0
@@ -3863,6 +3876,7 @@ __metadata:
     prettier: ^3.0.0
     typescript: ^5.0.0
   peerDependencies:
+    "@office-iss/react-native-win32": "*"
     "@react-native-community/cli-plugin-metro": "*"
     "@react-native/metro-config": "*"
     metro: ">=0.66.1"
@@ -3872,6 +3886,8 @@ __metadata:
     metro-resolver: ">=0.66.1"
     metro-runtime: ">=0.66.1"
   peerDependenciesMeta:
+    "@office-iss/react-native-win32":
+      optional: true
     "@react-native-community/cli-plugin-metro":
       optional: true
     "@react-native/metro-config":
@@ -4102,6 +4118,7 @@ __metadata:
     "@types/yargs": ^16.0.0
     eslint: ^8.0.0
     jest: ^29.2.1
+    metro-source-map: ^0.76.8
     prettier: ^3.0.0
     spdx-expression-parse: ^3.0.1
     typescript: ^5.0.0
@@ -9965,7 +9982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"metro-babel-transformer@npm:0.76.8":
+"metro-babel-transformer@npm:0.76.8, metro-babel-transformer@npm:^0.76.8":
   version: 0.76.8
   resolution: "metro-babel-transformer@npm:0.76.8"
   dependencies:
@@ -12389,7 +12406,6 @@ __metadata:
     "@babel/core": ^7.0.0
     "@babel/preset-env": ^7.0.0
     "@changesets/cli": ^2.22.0
-    "@rnx-kit/align-deps": "*"
     eslint: ^8.0.0
     jest-cli: ^29.2.1
     metro: ^0.76.5