Skip to content

Commit 740104d

Browse files
authored
chore(core): shim __dirname in esm (#1058)
1 parent 9b68cce commit 740104d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

packages/android/src/page/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import assert from 'node:assert';
22
import { randomUUID } from 'node:crypto';
33
import fs from 'node:fs';
4+
import { createRequire } from 'node:module';
45
import path from 'node:path';
56
import { type Point, type Size, getAIConfig } from '@midscene/core';
67
import type { DeviceAction, PageType } from '@midscene/core';
@@ -653,7 +654,9 @@ ${Object.keys(size)
653654
if (!this.yadbPushed) {
654655
const adb = await this.getAdb();
655656
// Use a more reliable path resolution method
656-
const androidPkgJson = require.resolve('@midscene/android/package.json');
657+
const androidPkgJson = createRequire(import.meta.url).resolve(
658+
'@midscene/android/package.json',
659+
);
657660
const yadbBin = path.join(path.dirname(androidPkgJson), 'bin', 'yadb');
658661
await adb.push(yadbBin, '/data/local/tmp');
659662
this.yadbPushed = true;

packages/core/src/utils.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as fs from 'node:fs';
33
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
44
import { tmpdir } from 'node:os';
55
import * as path from 'node:path';
6-
import { dirname } from 'node:path';
76
import {
87
defaultRunDirName,
98
getMidsceneRunSubDir,
@@ -142,13 +141,6 @@ export function writeDumpReport(
142141
return null;
143142
}
144143

145-
const __dirname = dirname(__filename);
146-
const midscenePkgInfo = getRunningPkgInfo(__dirname);
147-
if (!midscenePkgInfo) {
148-
console.warn('midscenePkgInfo not found, will not write report');
149-
return null;
150-
}
151-
152144
const reportPath = path.join(
153145
getMidsceneRunSubDir('report'),
154146
`${fileName}.html`,

packages/mcp/rslib.config.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ export default defineConfig({
6060
format: 'esm',
6161
syntax: 'es2021',
6262
dts: true,
63+
shims: {
64+
esm: {
65+
__dirname: true,
66+
},
67+
},
6368
},
6469
{
6570
format: 'cjs',

0 commit comments

Comments
 (0)