mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
2c94aac330
* build: add oxfmt for code formatting and import sorting
Adds oxfmt as a devDependency alongside oxlint and wires it into the
lint pipeline. The .oxfmtrc.json config matches Electron's current JS
style (single quotes, semicolons, 2-space indent, trailing commas off,
printWidth 100) and configures sortImports with custom groups that
mirror the import/order pathGroups previously enforced by ESLint:
@electron/internal, @electron/*, and {electron,electron/**} each get
their own ordered group ahead of external modules.
- `yarn lint:fmt` runs `oxfmt --check` over JS/TS sources and is
chained into `yarn lint` so CI enforces it automatically.
- `yarn format` runs `oxfmt --write` for local fix-up.
- lint-staged invokes `oxfmt --write` on staged .js/.ts/.mjs/.cjs
files before oxlint, so formatting is applied at commit time.
The next commit applies the formatter to the existing codebase so the
check actually passes.
* chore: apply oxfmt formatting to JS and TS sources
Runs `yarn format` across lib/, spec/, script/, build/, default_app/,
and npm/ to bring the codebase in line with the .oxfmtrc.json settings
added in the previous commit. This is a pure formatting pass: import
statements are sorted into the groups defined by the config, method
chains longer than printWidth are broken, single-quoted strings
containing apostrophes are switched to double quotes, and a handful of
single-statement `if` bodies are re-wrapped and get braces added by
`oxlint --fix` to satisfy the `curly: multi-line` rule.
No behavior changes.
103 lines
3.2 KiB
TypeScript
103 lines
3.2 KiB
TypeScript
import * as semver from 'semver';
|
|
|
|
import { spawnSync } from 'node:child_process';
|
|
|
|
import { ELECTRON_DIR } from '../lib/utils';
|
|
|
|
export enum PreType {
|
|
NONE = 'none',
|
|
PARTIAL = ' partial',
|
|
FULL = 'full'
|
|
}
|
|
|
|
const getCurrentDate = () => {
|
|
const d = new Date();
|
|
const dd = `${d.getDate()}`.padStart(2, '0');
|
|
const mm = `${d.getMonth() + 1}`.padStart(2, '0');
|
|
const yyyy = d.getFullYear();
|
|
return `${yyyy}${mm}${dd}`;
|
|
};
|
|
|
|
export const isNightly = (v: string) => v.includes('nightly');
|
|
export const isAlpha = (v: string) => v.includes('alpha');
|
|
export const isBeta = (v: string) => v.includes('beta');
|
|
export const isStable = (v: string) => {
|
|
const parsed = semver.parse(v);
|
|
return !!(parsed && parsed.prerelease.length === 0);
|
|
};
|
|
|
|
export async function nextAlpha(v: string) {
|
|
const next = semver.coerce(semver.clean(v));
|
|
const tagBlob = spawnSync('git', ['tag', '--list', '-l', `v${next}-alpha.*`], {
|
|
cwd: ELECTRON_DIR,
|
|
encoding: 'utf8',
|
|
stdio: ['inherit', 'pipe', 'pipe']
|
|
});
|
|
const tags = tagBlob.stdout.split('\n').filter((e) => e !== '');
|
|
tags.sort((t1, t2) => {
|
|
const a = parseInt(t1.split('.').pop()!, 10);
|
|
const b = parseInt(t2.split('.').pop()!, 10);
|
|
return a - b;
|
|
});
|
|
|
|
// increment the latest existing alpha tag or start at alpha.1 if it's a new alpha line
|
|
return tags.length === 0 ? `${next}-alpha.1` : semver.inc(tags.pop()!, 'prerelease')!;
|
|
}
|
|
|
|
export async function nextBeta(v: string) {
|
|
const next = semver.coerce(semver.clean(v));
|
|
const tagBlob = spawnSync('git', ['tag', '--list', '-l', `v${next}-beta.*`], {
|
|
cwd: ELECTRON_DIR,
|
|
encoding: 'utf8',
|
|
stdio: ['inherit', 'pipe', 'pipe']
|
|
});
|
|
const tags = tagBlob.stdout.split('\n').filter((e) => e !== '');
|
|
tags.sort((t1, t2) => {
|
|
const a = parseInt(t1.split('.').pop()!, 10);
|
|
const b = parseInt(t2.split('.').pop()!, 10);
|
|
return a - b;
|
|
});
|
|
|
|
// increment the latest existing beta tag or start at beta.1 if it's a new beta line
|
|
return tags.length === 0 ? `${next}-beta.1` : semver.inc(tags.pop()!, 'prerelease')!;
|
|
}
|
|
|
|
export async function nextNightly(v: string) {
|
|
let next = semver.valid(semver.coerce(v));
|
|
const pre = `nightly.${getCurrentDate()}`;
|
|
|
|
const branch = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
|
|
cwd: ELECTRON_DIR,
|
|
encoding: 'utf8',
|
|
stdio: ['inherit', 'pipe', 'pipe']
|
|
}).stdout.trim();
|
|
if (branch === 'main') {
|
|
next = semver.inc(await getLastMajorForMain(), 'major');
|
|
} else if (isStable(v)) {
|
|
next = semver.inc(next!, 'patch');
|
|
}
|
|
|
|
return `${next}-${pre}`;
|
|
}
|
|
|
|
async function getLastMajorForMain() {
|
|
let branchNames;
|
|
const result = spawnSync('git', ['branch', '-a', '--remote', '--list', 'origin/[0-9]*-x-y'], {
|
|
cwd: ELECTRON_DIR,
|
|
encoding: 'utf8',
|
|
stdio: ['inherit', 'pipe', 'pipe']
|
|
});
|
|
if (result.status === 0) {
|
|
branchNames = result.stdout.trim().split('\n');
|
|
const filtered = branchNames.map((b) => b.replace('origin/', ''));
|
|
return getNextReleaseBranch(filtered);
|
|
} else {
|
|
throw new Error('Release branches could not be fetched.');
|
|
}
|
|
}
|
|
|
|
function getNextReleaseBranch(branches: string[]) {
|
|
const converted = branches.map((b) => b.replace(/-/g, '.').replace('x', '0').replace('y', '0'));
|
|
return converted.reduce((v1, v2) => (semver.gt(v1, v2) ? v1 : v2));
|
|
}
|