[Package] Exclude unused dependencies when building package.json files

packages/nx-extensions/src/executors/package-json/executor.ts

@@ -1,6 +1,11 @@
 import * as fs from 'fs';
 import { createPackageJson } from '@nx/js';
-import type { ExecutorContext, ProjectGraphDependency } from '@nx/devkit';
+import type {
+	ExecutorContext,
+	FileData,
+	ProjectFileMap,
+	ProjectGraphDependency,
+} from '@nx/devkit';
 import {
 	serializeJson,
 	logger,
@@ -12,6 +17,8 @@ import {
 	HelperDependency,
 	readTsConfig,
 } from '@nx/js';
+import { readFileMapCache } from 'nx/src/project-graph/nx-deps-cache';
+import { fileDataDepTarget } from 'nx/src/config/project-graph';
 import type { PackageJsonExecutorSchema } from './schema';
 
 interface ExecutorEvent {
@@ -52,7 +59,12 @@ export default async function* packageJsonExecutor(
 		});
 	}
 
-	const monorepoDependencies = getMonorepoDependencies(context);
+	const sourceFileMap = getSourceOnlyFileMap();
+	const sourceDeps = getSourceDependencyTargets(
+		sourceFileMap,
+		context.projectName
+	);
+	const monorepoDependencies = getMonorepoDependencies(context, sourceDeps);
 
 	// Read optional dependencies from the original package.json
 	let originalOptionalDependencies: Record<string, string> | undefined;
@@ -75,7 +87,9 @@ export default async function* packageJsonExecutor(
 				context,
 				helperDependencies,
 				monorepoDependencies,
-				originalOptionalDependencies
+				originalOptionalDependencies,
+				sourceFileMap,
+				sourceDeps
 			);
 			if (built === false) {
 				return {
@@ -109,7 +123,9 @@ async function buildPackageJson(
 	context: ExecutorContext,
 	helperDependencies: ProjectGraphDependency[],
 	monorepoDependencies: MonorepoDependency[],
-	originalOptionalDependencies?: Record<string, string>
+	originalOptionalDependencies?: Record<string, string>,
+	sourceFileMap?: ProjectFileMap,
+	sourceDeps?: Set<string>
 ) {
 	const packageJson = createPackageJson(
 		context.projectName,
@@ -119,7 +135,8 @@ async function buildPackageJson(
 			root: context.root,
 			isProduction: true,
 			helperDependencies: helperDependencies.map((dep) => dep.target),
-		} as any
+		} as any,
+		sourceFileMap
 	);
 
 	let main = packageJson.main ?? event.outfile;
@@ -136,6 +153,17 @@ async function buildPackageJson(
 		packageJson.dependencies = {};
 	}
 
+	// Remove external dependencies that are not directly imported by source
+	// files. createPackageJson flattens transitive dependencies, but published
+	// libraries should only declare their direct dependencies.
+	if (sourceDeps) {
+		for (const name of Object.keys(packageJson.dependencies)) {
+			if (!sourceDeps.has(`npm:${name}`)) {
+				delete packageJson.dependencies[name];
+			}
+		}
+	}
+
 	for (const dep of monorepoDependencies) {
 		packageJson.dependencies[dep.name] = dep.version;
 	}
@@ -178,21 +206,48 @@ async function buildPackageJson(
 		options.outputPath + '/package.json',
 		serializeJson(packageJson)
 	);
-
-	// Lock file doesn't work with monorepoDependencies
-	// fs.writeFileSync(
-	//   getLockFileName(),
-	//   createLockFile(packageJson)
-	// );
 }
 
 interface MonorepoDependency {
 	name: string;
 	version: string;
 }
 
+function isSourceFile(filePath: string): boolean {
+	return !/\/tests?\//.test(filePath);
+}
+
+function getSourceOnlyFileMap(): ProjectFileMap {
+	const cache = readFileMapCache();
+	const fullFileMap = cache?.fileMap?.projectFileMap || {};
+	const filtered: ProjectFileMap = {};
+	for (const [project, files] of Object.entries(fullFileMap)) {
+		filtered[project] = (files as FileData[]).filter((f) =>
+			isSourceFile(f.file)
+		);
+	}
+	return filtered;
+}
+
+function getSourceDependencyTargets(
+	sourceFileMap: ProjectFileMap,
+	projectName?: string
+): Set<string> {
+	const targets = new Set<string>();
+	if (projectName) {
+		const projectFiles = sourceFileMap[projectName] || [];
+		for (const fileData of projectFiles) {
+			for (const dep of fileData.deps || []) {
+				targets.add(fileDataDepTarget(dep));
+			}
+		}
+	}
+	return targets;
+}
+
 function getMonorepoDependencies(
-	context: ExecutorContext
+	context: ExecutorContext,
+	sourceDeps: Set<string>
 ): MonorepoDependency[] {
 	const monorepoDeps: MonorepoDependency[] = [];
 	for (const repoDep of context.projectGraph.dependencies[
@@ -207,6 +262,9 @@ function getMonorepoDependencies(
 		if (!(repoDep.target in context.projectGraph.nodes)) {
 			continue;
 		}
+		if (!sourceDeps.has(repoDep.target)) {
+			continue;
+		}
 		const targetSourceRoot =
 			context.projectGraph.nodes[repoDep.target].data.root;
 		const packageJsonPath = `${targetSourceRoot}/package.json`;

packages/php-wasm/node-polyfills/src/lib/blob.spec.ts → packages/php-wasm/node-polyfills/src/test/blob.spec.ts

@@ -1,4 +1,4 @@
-import './blob';
+import '../lib/blob';
 
 describe('File class', () => {
 	it('Should exist', () => {

packages/php-wasm/node-polyfills/src/lib/custom-event.spec.ts → packages/php-wasm/node-polyfills/src/test/custom-event.spec.ts

@@ -1,4 +1,4 @@
-import './custom-event';
+import '../lib/custom-event';
 
 describe('CustomEvent class', () => {
 	it('Should exist', () => {

packages/php-wasm/progress/src/lib/progress-tracker.spec.ts → packages/php-wasm/progress/src/test/progress-tracker.spec.ts

@@ -1,5 +1,5 @@
-import { ProgressTracker } from './progress-tracker';
-import type { ProgressTrackerEvent } from './progress-tracker';
+import { ProgressTracker } from '../lib/progress-tracker';
+import type { ProgressTrackerEvent } from '../lib/progress-tracker';
 
 describe('Tracks total progress', () => {
 	it('A single ProgressTracker populated via fillSlowly (stopBeforeFinishing=true)', async () => {

packages/php-wasm/scopes/src/index.ts

@@ -1,117 +1 @@
-/**
- * Scopes are unique strings, like `my-site`, used to uniquely brand
- * the outgoing HTTP traffic from each browser tab. This helps the
- * main thread distinguish between the relevant and irrelevant
- * messages received from the Service Worker.
- *
- * Scopes are included in the `PHPRequestHandler.absoluteUrl` as follows:
- *
- * An **unscoped** URL: http://localhost:8778/wp-login.php
- * A **scoped** URL:    http://localhost:8778/scope:my-site/wp-login.php
- *
- * For more information, see the README section on scopes.
- */
-
-/**
- * Checks if the given URL contains scope information.
- *
- * @example
- * ```js
- * isURLScoped(new URL('http://localhost/scope:my-site/index.php'));
- * // true
- *
- * isURLScoped(new URL('http://localhost/index.php'));
- * // false
- * ```
- *
- * @param  url The URL to check.
- * @returns `true` if the URL contains scope information, `false` otherwise.
- */
-export function isURLScoped(url: URL): boolean {
-	return url.pathname.startsWith(`/scope:`);
-}
-
-/**
- * Returns the scope stored in the given URL.
- *
- * @example
- * ```js
- * getScopeFromURL(new URL('http://localhost/scope:my-site/index.php'));
- * // '96253'
- *
- * getScopeFromURL(new URL('http://localhost/index.php'));
- * // null
- * ```
- *
- * @param  url The URL.
- * @returns The scope if the URL contains a scope, `null` otherwise.
- */
-export function getURLScope(url: URL): string | null {
-	if (isURLScoped(url)) {
-		return url.pathname.split('/')[1].split(':')[1];
-	}
-	return null;
-}
-
-/**
- * Returns a new URL with the requested scope information.
- *
- * @example
- * ```js
- * setURLScope(new URL('http://localhost/index.php'), 'my-site');
- * // URL('http://localhost/scope:my-site/index.php')
- *
- * setURLScope(new URL('http://localhost/scope:my-site/index.php'), 'my-site');
- * // URL('http://localhost/scope:my-site/index.php')
- *
- * setURLScope(new URL('http://localhost/index.php'), null);
- * // URL('http://localhost/index.php')
- * ```
- *
- * @param  url   The URL to scope.
- * @param  scope The scope value.
- * @returns A new URL with the scope information in it.
- */
-export function setURLScope(url: URL | string, scope: string | null): URL {
-	let newUrl = new URL(url);
-
-	if (isURLScoped(newUrl)) {
-		if (scope) {
-			const parts = newUrl.pathname.split('/');
-			parts[1] = `scope:${scope}`;
-			newUrl.pathname = parts.join('/');
-		} else {
-			newUrl = removeURLScope(newUrl);
-		}
-	} else if (scope) {
-		const suffix = newUrl.pathname === '/' ? '' : newUrl.pathname;
-		newUrl.pathname = `/scope:${scope}${suffix}`;
-	}
-
-	return newUrl;
-}
-
-/**
- * Returns a new URL without any scope information.
- *
- * @example
- * ```js
- * removeURLScope(new URL('http://localhost/scope:my-site/index.php'));
- * // URL('http://localhost/index.php')
- *
- * removeURLScope(new URL('http://localhost/index.php'));
- * // URL('http://localhost/index.php')
- * ```
- *
- * @param  url The URL to remove scope information from.
- * @returns A new URL without the scope information.
- */
-export function removeURLScope(url: URL): URL {
-	if (!isURLScoped(url)) {
-		return url;
-	}
-	const newUrl = new URL(url);
-	const parts = newUrl.pathname.split('/');
-	newUrl.pathname = '/' + parts.slice(2).join('/');
-	return newUrl;
-}
+export * from './lib/scope';