Skip to content

Commit 148a118

Browse files
Merge branch 'master' into master
2 parents 086fd34 + 28b3c9c commit 148a118

8 files changed

Lines changed: 42 additions & 7 deletions

File tree

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Workflow for auto-merging Dependabot PRs
2+
# This workflow uses the action-automerge-dependabot action to automatically merge
3+
# Dependabot PRs based on the rules defined in .github/auto-merge.yml
4+
5+
name: Auto-Merge Dependabot PRs
6+
7+
on:
8+
# Trigger when a PR is opened or updated
9+
# WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
10+
pull_request_target:
11+
types: [opened, synchronize, reopened]
12+
13+
jobs:
14+
auto-merge:
15+
runs-on: ubuntu-latest
16+
# Only run if actor is dependabot
17+
if: github.actor == 'dependabot[bot]'
18+
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
23+
steps:
24+
- name: Auto-merge Dependabot PRs
25+
uses: iobroker-bot-orga/action-automerge-dependabot@v1
26+
with:
27+
github-token: ${{ secrets.GITHUB_TOKEN }}
28+
# Optional: Path to your auto-merge configuration file
29+
# config-file-path: '.github/auto-merge.yml'
30+
# Optional: Merge method (merge, squash, or rebase)
31+
# merge-method: 'squash'
32+
# Optional: Wait for other checks to complete
33+
# wait-for-checks: 'true'
34+
# Optional: Maximum time to wait for checks in seconds (default: 3600)
35+
# max-wait-time: '3600'
File renamed without changes.

detection/detect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const AWS = require('aws-sdk');
2-
const fs = require('fs');
2+
const fs = require('node:fs');
33
const sharp = require('sharp');
44

55
sharp(__dirname + '/Codeimage.jpg')

install/installTypings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function npmCommand(command, npmArgs, options) {
5353
if (npmArgs == null) npmArgs = [];
5454

5555
const npmBinary = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
56-
/** @type {import("child_process").SpawnOptions} */
56+
/** @type {import("node:child_process").SpawnOptions} */
5757
const spawnOptions = {
5858
stdio: [options.stdin || process.stdin, options.stdout || process.stdout, options.stderr || process.stderr],
5959
// @ts-ignore This option exists starting with NodeJS 8

src-editor/updateBlockly.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// this script updates blockly
22

3-
const cp = require('child_process');
4-
const fs = require('fs');
3+
const cp = require('node:child_process');
4+
const fs = require('node:fs');
55

66
function copyFile(fileName, newName) {
77
if (fileName.endsWith('/')) {

src/lib/debugger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* IN THE SOFTWARE.
2121
*/
2222
import { join, resolve } from 'node:path';
23-
import { type ReplOptions, type REPLServer, start } from 'repl';
23+
import { type ReplOptions, type REPLServer, start } from 'node:repl';
2424
import {
2525
debuglog as debuglogUtil,
2626
inspect as inspectUtil,

src/lib/inspect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import type { WriteStream, ReadStream } from 'node:tty';
3030
// @ts-expect-error no types available
3131
import InspectClient from 'node-inspect/lib/internal/inspect_client';
3232
import type { Debugger, Runtime } from 'node:inspector';
33-
import type { REPLServer } from 'repl';
33+
import type { REPLServer } from 'node:repl';
3434
import createRepl from './debugger';
3535
// const runAsStandalone = typeof __dirname !== 'undefined';
3636

src/lib/nodeModulesManagement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { execFile, type ExecFileException } from 'child_process';
1+
import { execFile, type ExecFileException } from 'node:child_process';
22

33
/**
44
* Request a module name by given url using `npm view`

0 commit comments

Comments
 (0)