@ffflorian/auto-merge 1.6.2 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/AutoMerge.js +2 -2
- package/dist/cli.js +7 -5
- package/package.json +4 -3
package/README.md
CHANGED
|
@@ -4,8 +4,8 @@ Automatically merge (and optionally approve) all GitHub PRs which match a specif
|
|
|
4
4
|
|
|
5
5
|
## Prerequisites
|
|
6
6
|
|
|
7
|
-
- [Node.js](https://nodejs.org)
|
|
8
|
-
- npm (preinstalled) or [yarn](https://
|
|
7
|
+
- [Node.js](https://nodejs.org)
|
|
8
|
+
- npm (preinstalled) or [yarn](https://yarnpkg.com)
|
|
9
9
|
|
|
10
10
|
## Installation
|
|
11
11
|
|
package/dist/AutoMerge.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import fs from 'node:fs';
|
|
1
|
+
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import logdown from 'logdown';
|
|
4
4
|
const __dirname = import.meta.dirname;
|
|
5
5
|
const packageJsonPath = path.join(__dirname, '../package.json');
|
|
6
|
-
const { name: toolName, version: toolVersion } = JSON.parse(fs.
|
|
6
|
+
const { name: toolName, version: toolVersion } = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'));
|
|
7
7
|
export class AutoMerge {
|
|
8
8
|
constructor(config) {
|
|
9
9
|
this.config = config;
|
package/dist/cli.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import fs from 'node:fs';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import readline from 'node:readline';
|
|
5
5
|
import { program as commander } from 'commander';
|
|
6
|
-
import {
|
|
6
|
+
import { cosmiconfig } from 'cosmiconfig';
|
|
7
7
|
import logdown from 'logdown';
|
|
8
8
|
import { AutoMerge } from './AutoMerge.js';
|
|
9
9
|
import { pluralize } from './util.js';
|
|
@@ -15,7 +15,7 @@ const logger = logdown('auto-merge', {
|
|
|
15
15
|
logger.state.isEnabled = true;
|
|
16
16
|
const __dirname = import.meta.dirname;
|
|
17
17
|
const packageJsonPath = path.join(__dirname, '../package.json');
|
|
18
|
-
const { description, name, version } = JSON.parse(fs.
|
|
18
|
+
const { description, name, version } = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'));
|
|
19
19
|
commander
|
|
20
20
|
.name(name.replace(/^@[^/]+\//, ''))
|
|
21
21
|
.description(description)
|
|
@@ -27,8 +27,10 @@ commander
|
|
|
27
27
|
.version(version)
|
|
28
28
|
.parse(process.argv);
|
|
29
29
|
const commanderOptions = commander.opts();
|
|
30
|
-
const configExplorer =
|
|
31
|
-
const configResult = commanderOptions.config
|
|
30
|
+
const configExplorer = cosmiconfig('automerge');
|
|
31
|
+
const configResult = commanderOptions.config
|
|
32
|
+
? await configExplorer.load(commanderOptions.config)
|
|
33
|
+
: await configExplorer.search();
|
|
32
34
|
if (!configResult || configResult.isEmpty) {
|
|
33
35
|
logger.error('No valid configuration file found.');
|
|
34
36
|
commander.help();
|
package/package.json
CHANGED
|
@@ -16,13 +16,14 @@
|
|
|
16
16
|
"vitest": "4.0.16"
|
|
17
17
|
},
|
|
18
18
|
"engines": {
|
|
19
|
-
"node": ">=
|
|
19
|
+
"node": ">= 21"
|
|
20
20
|
},
|
|
21
21
|
"exports": "./dist/index.js",
|
|
22
22
|
"files": [
|
|
23
23
|
"dist"
|
|
24
24
|
],
|
|
25
25
|
"keywords": [
|
|
26
|
+
"auto-merge",
|
|
26
27
|
"cli",
|
|
27
28
|
"typescript"
|
|
28
29
|
],
|
|
@@ -39,6 +40,6 @@
|
|
|
39
40
|
"test": "vitest run"
|
|
40
41
|
},
|
|
41
42
|
"type": "module",
|
|
42
|
-
"version": "1.
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"version": "1.7.0",
|
|
44
|
+
"gitHead": "b968c846095113cbe57fbdd34e4593a4dea8a1c9"
|
|
44
45
|
}
|