Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .changeset/tidy-friends-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
18 changes: 9 additions & 9 deletions packages/align-deps/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ export type DiffMode = "strict" | "allow-subset";

export type Options = {
presets: string[];
loose: boolean;
migrateConfig: boolean;
noUnmanaged: boolean;
verbose: boolean;
write: boolean;
loose?: boolean;
migrateConfig?: boolean;
noUnmanaged?: boolean;
verbose?: boolean;
write?: boolean;
diffMode?: DiffMode;
excludePackages?: string[];
requirements?: string[];
Expand All @@ -41,13 +41,13 @@ export type Args = Pick<Options, "loose" | "verbose" | "write"> & {
"diff-mode"?: string;
"exclude-packages"?: string | number;
"export-catalogs"?: string;
"migrate-config": boolean;
"no-unmanaged": boolean;
"migrate-config"?: boolean;
"no-unmanaged"?: boolean;
"set-version"?: string | number;
init?: string;
packages?: (string | number)[];
presets?: string | number;
requirements?: string | number;
presets?: string | number | string[];
requirements?: string | number | string[];
};

export type DependencyType = "direct" | "development" | "peer";
Expand Down
71 changes: 40 additions & 31 deletions scripts/align-deps-preset.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,40 +45,49 @@ function getAvailableProfiles() {
}

function makeTypesEntries() {
return Object.entries(dependencies).reduce((types, [name, version]) => {
/** @type {Record<string, { name: string; version: string; devOnly: true; }>} */
const types = {};
for (const [name, version] of Object.entries(dependencies)) {
const pkgName = `@types/${name}`;
types[pkgName] = { name: pkgName, version, devOnly: true };
return types;
}, {});
}
return types;
}

const profile = {
...makeTypesEntries(),
esbuild: {
name: "esbuild",
version: "^0.27.1",
devOnly: true,
},
"find-up": {
name: "find-up",
version: "^5.0.0",
},
"oxc-resolver": {
name: "oxc-resolver",
version: "^11.0.0",
devOnly: true,
},
semver: {
name: "semver",
version: "^7.0.0",
},
yargs: {
name: "yargs",
version: dependencies.yargs,
},
};
function makePreset() {
const profile = {
...makeTypesEntries(),
esbuild: {
name: "esbuild",
version: "^0.27.1",
devOnly: true,
},
"find-up": {
name: "find-up",
version: "^5.0.0",
},
"oxc-resolver": {
name: "oxc-resolver",
version: "^11.0.0",
devOnly: true,
},
semver: {
name: "semver",
version: "^7.0.0",
},
yargs: {
name: "yargs",
version: dependencies.yargs,
},
};

/** @type {Record<string, typeof profile>} */
const preset = {};
for (const key of getAvailableProfiles()) {
preset[key] = profile;
}

module.exports = getAvailableProfiles().reduce((preset, key) => {
preset[key] = profile;
return preset;
}, {});
}

module.exports = makePreset();
34 changes: 28 additions & 6 deletions scripts/dependencies.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,32 @@
import * as fs from "node:fs";
import * as path from "node:path";

/**
* @typedef {{
* scripts?: Record<string, string>;
* dependencies?: Record<string, string>;
* jest?: unknown;
* }} Manifest;
*/

/**
* @returns {true}
*/
function always() {
return true;
}

/**
* @template {object} T
* @template {keyof T} K
* @param {T} obj
* @param {K} property
* @returns {obj is T & Pick<Required<T>, K>}
*/
function hasOwn(obj, property) {
return Object.hasOwn(obj, property);
}

/**
* @param {string} filename
* @returns {(cwd: string) => boolean}
Expand All @@ -20,25 +39,24 @@ function lookForFile(filename) {

/**
* @param {string} cwd
* @param {Record<string, unknown>} manifest
* @param {Manifest} manifest
* @returns {boolean}
*/
function needsJest(cwd, manifest) {
return (
Object.hasOwn(manifest, "jest") ||
fs.existsSync(path.join(cwd, "jest.config.js"))
hasOwn(manifest, "jest") || fs.existsSync(path.join(cwd, "jest.config.js"))
);
}

/**
* @param {string} _cwd
* @param {Record<string, Record<string, string>>} manifest
* @param {Manifest} manifest
* @returns {boolean}
*/
function needsLint(_cwd, manifest) {
return (
Object.hasOwn(manifest, "scripts") &&
Object.hasOwn(manifest["scripts"], "lint") &&
hasOwn(manifest, "scripts") &&
hasOwn(manifest["scripts"], "lint") &&
manifest["scripts"]["lint"].includes("rnx-kit-scripts lint")
);
}
Expand All @@ -54,7 +72,11 @@ const COMMON_DEPENDENCIES = /** @type {const} */ ([
["typescript", needsTypeScript],
]);

/**
* @param {{ cwd: string; manifest: Manifest; }}
*/
export default function ({ cwd, manifest }) {
/** @type {Pick<Required<Manifest>, "dependencies"> | undefined} */
let extensions = undefined;

for (const [pkg, test] of COMMON_DEPENDENCIES) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/rnx-align-deps.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

import { URL, fileURLToPath } from "node:url";
// Directly import align-deps to avoid circular dependency
// @ts-ignore Directly import align-deps to avoid circular dependency
import { cli } from "../packages/align-deps/lib/index.js";

cli({
Expand Down
2 changes: 1 addition & 1 deletion scripts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"compilerOptions": {
"noEmit": true
},
"include": ["src", "*.ts"]
"include": ["*.cjs", "*.js", "*.ts", "src"]
}
Loading