mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
* 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.
126 lines
3.4 KiB
JavaScript
126 lines
3.4 KiB
JavaScript
const minimist = require('minimist');
|
|
|
|
const cp = require('node:child_process');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const utils = require('./lib/utils');
|
|
const DISABLED_TESTS = require('./node-disabled-tests.json');
|
|
|
|
const args = minimist(process.argv.slice(2), {
|
|
boolean: ['default', 'validateDisabled'],
|
|
string: ['jUnitDir']
|
|
});
|
|
|
|
const BASE = path.resolve(__dirname, '../..');
|
|
|
|
const ROOT_PACKAGE_JSON = path.resolve(BASE, 'package.json');
|
|
const NODE_DIR = path.resolve(BASE, 'third_party', 'electron_node');
|
|
const JUNIT_DIR = args.jUnitDir ? path.resolve(args.jUnitDir) : null;
|
|
const TAP_FILE_NAME = 'test.tap';
|
|
|
|
if (!require.main) {
|
|
throw new Error('Must call the node spec runner directly');
|
|
}
|
|
|
|
const defaultOptions = [
|
|
'tools/test.py',
|
|
'-p',
|
|
'tap',
|
|
'--logfile',
|
|
TAP_FILE_NAME,
|
|
'--mode=debug',
|
|
'default',
|
|
`--skip-tests=${DISABLED_TESTS.join(',')}`,
|
|
'--flaky-tests=dontcare',
|
|
'--measure-flakiness=9',
|
|
'--shell',
|
|
utils.getAbsoluteElectronExec(),
|
|
'-J'
|
|
];
|
|
|
|
// The root package.json is ESM, which breaks the test runner.
|
|
// Temporarily change it to CommonJS while running the tests, then
|
|
// change it back when done.
|
|
const resetPackageJson = ({ useESM }) => {
|
|
// This won't always exist in CI.
|
|
if (!fs.existsSync(ROOT_PACKAGE_JSON)) {
|
|
return;
|
|
}
|
|
|
|
const packageJson = JSON.parse(fs.readFileSync(ROOT_PACKAGE_JSON, 'utf-8'));
|
|
packageJson.type = useESM ? 'module' : 'commonjs';
|
|
fs.writeFileSync(ROOT_PACKAGE_JSON, JSON.stringify(packageJson, null, 2) + '\n');
|
|
};
|
|
|
|
const getCustomOptions = () => {
|
|
let customOptions = ['tools/test.py'];
|
|
|
|
// Add all custom arguments.
|
|
const extra = process.argv.slice(2);
|
|
if (extra) {
|
|
customOptions = customOptions.concat(extra);
|
|
}
|
|
|
|
// Necessary or Node.js will try to run from out/Release/node.
|
|
customOptions = customOptions.concat(['--shell', utils.getAbsoluteElectronExec()]);
|
|
|
|
return customOptions;
|
|
};
|
|
|
|
async function main() {
|
|
// Optionally validate that all disabled specs still exist.
|
|
if (args.validateDisabled) {
|
|
const missing = [];
|
|
for (const test of DISABLED_TESTS) {
|
|
const js = path.join(NODE_DIR, 'test', `${test}.js`);
|
|
const mjs = path.join(NODE_DIR, 'test', `${test}.mjs`);
|
|
if (!fs.existsSync(js) && !fs.existsSync(mjs)) {
|
|
missing.push(test);
|
|
}
|
|
}
|
|
|
|
if (missing.length > 0) {
|
|
console.error(`Found ${missing.length} missing disabled specs: \n${missing.join('\n')}`);
|
|
process.exit(1);
|
|
}
|
|
|
|
console.log(`All ${DISABLED_TESTS.length} disabled specs exist.`);
|
|
process.exit(0);
|
|
}
|
|
|
|
const options = args.default ? defaultOptions : getCustomOptions();
|
|
|
|
resetPackageJson({ useESM: false });
|
|
|
|
const testChild = cp.spawn('python3', options, {
|
|
env: {
|
|
...process.env,
|
|
ELECTRON_RUN_AS_NODE: 'true',
|
|
ELECTRON_EAGER_ASAR_HOOK_FOR_TESTING: 'true'
|
|
},
|
|
cwd: NODE_DIR,
|
|
stdio: 'inherit'
|
|
});
|
|
|
|
testChild.on('exit', (testCode) => {
|
|
resetPackageJson({ useESM: true });
|
|
|
|
if (JUNIT_DIR) {
|
|
fs.mkdirSync(JUNIT_DIR);
|
|
const converterStream = require('tap-xunit')();
|
|
fs.createReadStream(path.resolve(NODE_DIR, TAP_FILE_NAME))
|
|
.pipe(converterStream)
|
|
.pipe(fs.createWriteStream(path.resolve(JUNIT_DIR, 'nodejs.xml')))
|
|
.on('close', () => {
|
|
process.exit(testCode);
|
|
});
|
|
}
|
|
});
|
|
}
|
|
|
|
main().catch((err) => {
|
|
console.error('An unhandled error occurred in the node spec runner', err);
|
|
process.exit(1);
|
|
});
|