Skip to content

Commit eb843c7

Browse files
committed
Merge remote-tracking branch 'github/master' into develop
2 parents af9350e + 48320a0 commit eb843c7

4 files changed

Lines changed: 2 additions & 205 deletions

File tree

lib/units/tizen-device/plugins/launcher.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import push from '../../base-device/support/push.js'
33
import router from '../../base-device/support/router.js'
44
import group from '../../base-device/plugins/group.js'
55
import sdb from './sdb/index.js'
6-
import wire from '../../../wire/index.js'
76
import wireutil from '../../../wire/util.js'
87
import webinspector from './webinspector/index.js'
9-
import {GetInstalledApplications, KillDeviceApp, LaunchDeviceApp, TerminateDeviceApp} from '../../../wire/wire.js'
108

119
export default syrup.serial()
1210
.dependency(push)

lib/units/tizen-device/plugins/webinspector/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import logger from '../../../../util/logger.js'
88
import syrup from '@devicefarmer/stf-syrup'
99
import webSocketServer from 'ws'
1010
import _ from 'lodash'
11-
import urlformat from '../../../base-device/support/urlformat.js'
1211
import MyReplicator from './Replicator.js'
1312
import * as transform from './transform/index.js'
1413
import {GetAppAsset, GetAppAssetsList, GetAppHTML, GetAppInspectServerUrl} from "../../../../wire/wire.js";
14+
import urlformat from '../../../base-device/support/urlformat.js'
1515

1616
const consoleListeners = new Map()
1717
const replicator = new MyReplicator()
@@ -141,7 +141,6 @@ export default syrup.serial()
141141
.on(GetAppInspectServerUrl, (channel: string) =>
142142
!!inspServer && success(channel, wsUrl)
143143
)
144-
145144
const plugin = {
146145
host: '',
147146
port: 0,

package-lock.json

Lines changed: 0 additions & 200 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"moduleResolution": "nodenext",
1919
"target": "es2022",
2020
"rewriteRelativeImportExtensions": true,
21-
"lib": ["ES2022", "DOM"],
2221
"paths": {
2322
"@u4/adbkit/*": ["./node_modules/@u4/adbkit/*"]
2423
},
24+
"lib": ["ES2022"],
2525
"types": ["node"]
2626
},
2727
"include": [

0 commit comments

Comments
 (0)