Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nested-targets-inherit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-doctor": patch
---

Inherit browser and Electron target capabilities when scanning a nested project directory.
10 changes: 8 additions & 2 deletions packages/core/src/project-info/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ import {
parseTailwindMajorMinor,
} from "./version.js";
import { detectTargetBlankOpenerProtection } from "./detect-target-blank-opener-protection.js";
import { findNearestAncestorPackageJson } from "./find-nearest-ancestor-package-json.js";
import { isFile } from "./fs-utils.js";
import { readPackageJson } from "./package-json.js";

// SPA / mobile frameworks with no server-side form handler at all —
Expand Down Expand Up @@ -351,9 +353,13 @@ export const getCapabilities = (project: ProjectInfo): ReadonlySet<Capability> =
const cached = capabilitiesByProject.get(project);
if (cached !== undefined) return cached;
const capabilities = new Set(buildCapabilities(project));
const packageJson = readPackageJson(path.join(project.rootDirectory, "package.json"));
const packageJsonPath = path.join(project.rootDirectory, "package.json");
const capabilityRootDirectory = isFile(packageJsonPath)
? project.rootDirectory
: (findNearestAncestorPackageJson(project.rootDirectory) ?? project.rootDirectory);
const packageJson = readPackageJson(path.join(capabilityRootDirectory, "package.json"));
const targetBlankOpenerProtection = detectTargetBlankOpenerProtection(
project.rootDirectory,
capabilityRootDirectory,
packageJson,
);
if (targetBlankOpenerProtection !== undefined) {
Expand Down
34 changes: 34 additions & 0 deletions packages/core/tests/detect-target-blank-opener-protection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,40 @@ describe("detectTargetBlankOpenerProtection", () => {
expect(capabilities.has("target-blank-needs-noreferrer")).toBe(true);
});

it.each([
[
"nested-browser-target",
{
name: "nested-browser-target",
dependencies: { react: "^18.0.0" },
browserslist: ["chrome 80"],
},
false,
],
[
"nested-electron-target",
{
name: "nested-electron-target",
dependencies: { react: "^18.0.0" },
devDependencies: { electron: "^0.36.0" },
},
true,
],
])(
"inherits target-blank policy from the enclosing package for %s",
(caseName, packageJson, needsNoreferrer) => {
const projectDirectory = setupProject(caseName, packageJson);
const nestedDirectory = path.join(projectDirectory, "src", "components");
fs.mkdirSync(nestedDirectory, { recursive: true });
fs.writeFileSync(path.join(nestedDirectory, "button.tsx"), "export const Button = null;\n");

const capabilities = getCapabilities(discoverProject(nestedDirectory));

expect(capabilities.has("target-blank-needs-explicit-protection")).toBe(true);
expect(capabilities.has("target-blank-needs-noreferrer")).toBe(needsNoreferrer);
},
);

it("requires noopener once Electron adopted Chromium 49", () => {
const packageJson: PackageJson = {
name: "electron-0-37",
Expand Down
Loading