testplane 8.37.0 → 8.37.2
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/build/package.json +6 -1
- package/build/src/base-testplane.js +1 -0
- package/build/src/base-testplane.js.map +1 -1
- package/build/src/browser/commands/openAndWait.js +48 -3
- package/build/src/browser/commands/openAndWait.js.map +1 -1
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js +3 -5
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js.map +1 -1
- package/build/src/runner/browser-env/vite/server.d.ts +1 -0
- package/build/src/runner/browser-env/vite/server.js +16 -0
- package/build/src/runner/browser-env/vite/server.js.map +1 -1
- package/build/src/runner/browser-env/vite/utils.d.ts +0 -5
- package/build/src/runner/browser-env/vite/utils.js +1 -8
- package/build/src/runner/browser-env/vite/utils.js.map +1 -1
- package/build/src/test-reader/mocha-reader/index.d.ts +2 -1
- package/build/src/test-reader/mocha-reader/index.js +14 -2
- package/build/src/test-reader/mocha-reader/index.js.map +1 -1
- package/build/src/test-reader/test-parser.js +3 -1
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.d.ts +4 -3
- package/build/src/testplane.js +15 -3
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +2 -3
- package/build/src/types/index.js.map +1 -1
- package/build/src/utils/config.d.ts +1 -0
- package/build/src/utils/config.js +6 -1
- package/build/src/utils/config.js.map +1 -1
- package/build/src/utils/typescript.d.ts +2 -0
- package/build/src/utils/typescript.js +114 -30
- package/build/src/utils/typescript.js.map +1 -1
- package/package.json +6 -1
- package/build/src/runner/browser-env/index.d.ts +0 -12
- package/build/src/runner/browser-env/index.js +0 -45
- package/build/src/runner/browser-env/index.js.map +0 -1
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.37.
|
|
3
|
+
"version": "8.37.2",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -118,6 +118,7 @@
|
|
|
118
118
|
"yallist": "3.1.1"
|
|
119
119
|
},
|
|
120
120
|
"devDependencies": {
|
|
121
|
+
"@babel/parser": "7.28.5",
|
|
121
122
|
"@commitlint/cli": "^19.0.3",
|
|
122
123
|
"@commitlint/config-conventional": "^19.0.3",
|
|
123
124
|
"@cspotcode/source-map-support": "0.8.0",
|
|
@@ -180,11 +181,15 @@
|
|
|
180
181
|
"uglifyify": "3.0.4"
|
|
181
182
|
},
|
|
182
183
|
"peerDependencies": {
|
|
184
|
+
"@babel/parser": ">=7.0.0",
|
|
183
185
|
"@cspotcode/source-map-support": ">=0.7.0",
|
|
184
186
|
"@swc/core": ">=1.3.96",
|
|
185
187
|
"ts-node": ">=10.5.0"
|
|
186
188
|
},
|
|
187
189
|
"peerDependenciesMeta": {
|
|
190
|
+
"@babel/parser": {
|
|
191
|
+
"optional": true
|
|
192
|
+
},
|
|
188
193
|
"ts-node": {
|
|
189
194
|
"optional": true
|
|
190
195
|
},
|
|
@@ -20,6 +20,7 @@ class BaseTestplane extends events_1.AsyncEmitter {
|
|
|
20
20
|
this._interceptors = [];
|
|
21
21
|
(0, typescript_1.registerTransformHook)(this.isWorker());
|
|
22
22
|
this._config = config_1.Config.create(config);
|
|
23
|
+
(0, typescript_1.updateTransformHook)(this._config);
|
|
23
24
|
this._setLogLevel();
|
|
24
25
|
this._loadPlugins();
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-testplane.js","sourceRoot":"","sources":["../../src/base-testplane.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,oEAA2C;AAC3C,qCAAkC;AAClC,qCAQkB;AAClB,sDAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"base-testplane.js","sourceRoot":"","sources":["../../src/base-testplane.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,oEAA2C;AAC3C,qCAAkC;AAClC,qCAQkB;AAClB,sDAA8B;AAC9B,mDAAgF;AAGhF,MAAsB,aAAc,SAAQ,qBAAY;IAIpD,MAAM,CAAC,MAAM,CAET,MAA6B;QAE7B,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,YAAsB,MAA6B;QAC/C,KAAK,EAAE,CAAC;QAXF,kBAAa,GAAkB,EAAE,CAAC;QAaxC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,IAAA,kCAAqB,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,eAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrC,IAAA,gCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAES,KAAK,CAAC,KAAK;QACjB,IAAI,CAAC,KAAK,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB;QACtE,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAC,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAY,EAAE,qBAAY,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAM,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,KAAuB,EAAE,OAAyB;QACxD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAIS,YAAY;QAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/F,CAAC;IACL,CAAC;IAES,YAAY;QAClB,wBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;CACJ;AA1DD,sCA0DC"}
|
|
@@ -39,6 +39,25 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
|
|
|
39
39
|
const isChrome = config.desiredCapabilities?.browserName === "chrome";
|
|
40
40
|
const isCDP = config.automationProtocol === "devtools";
|
|
41
41
|
waitNetworkIdle &&= isChrome || isCDP;
|
|
42
|
+
const originalPageLoadTimeout = config.pageLoadTimeout;
|
|
43
|
+
const shouldUpdateTimeout = timeout && timeout !== originalPageLoadTimeout;
|
|
44
|
+
const setPageLoadTimeout = async (value) => {
|
|
45
|
+
if (!value) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
await session.setTimeout({ pageLoad: value });
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
/* */
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
const restorePageLoadTimeout = () => {
|
|
56
|
+
if (shouldUpdateTimeout && originalPageLoadTimeout) {
|
|
57
|
+
// No await because session might be stuck on url() command
|
|
58
|
+
setPageLoadTimeout(originalPageLoadTimeout).catch(() => { });
|
|
59
|
+
}
|
|
60
|
+
};
|
|
42
61
|
if (!uri || uri === emptyPageUrl) {
|
|
43
62
|
return new Promise(resolve => {
|
|
44
63
|
session.url(uri).then(() => resolve());
|
|
@@ -55,7 +74,21 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
|
|
|
55
74
|
let selectorsResolved = !selectors.length;
|
|
56
75
|
let predicateResolved = !predicate;
|
|
57
76
|
let networkResolved = !waitNetworkIdle;
|
|
58
|
-
|
|
77
|
+
if (shouldUpdateTimeout) {
|
|
78
|
+
await setPageLoadTimeout(timeout);
|
|
79
|
+
}
|
|
80
|
+
// Create hard timeout promise to guarantee timeout is respected
|
|
81
|
+
// This is needed because WebDriver pageLoad timeout only affects the browser's
|
|
82
|
+
// page load event, not the HTTP connection/response time
|
|
83
|
+
let hardTimeoutId;
|
|
84
|
+
const hardTimeoutPromise = timeout
|
|
85
|
+
? new Promise((_, reject) => {
|
|
86
|
+
hardTimeoutId = setTimeout(() => {
|
|
87
|
+
reject(new Error(`openAndWait timed out after ${timeout}ms`));
|
|
88
|
+
}, timeout);
|
|
89
|
+
})
|
|
90
|
+
: null;
|
|
91
|
+
const loadPromise = new Promise((resolve, reject) => {
|
|
59
92
|
const handleError = (err) => {
|
|
60
93
|
reject(new Error(`url: ${err.message}`));
|
|
61
94
|
};
|
|
@@ -65,7 +98,7 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
|
|
|
65
98
|
}
|
|
66
99
|
};
|
|
67
100
|
const goToPage = async () => {
|
|
68
|
-
await session.url(uri);
|
|
101
|
+
await session.url(uri, { timeout });
|
|
69
102
|
};
|
|
70
103
|
pageLoader.on("pageLoadError", handleError);
|
|
71
104
|
pageLoader.on("selectorsError", handleError);
|
|
@@ -92,7 +125,19 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
|
|
|
92
125
|
checkLoaded();
|
|
93
126
|
});
|
|
94
127
|
pageLoader.load(goToPage).then(checkLoaded);
|
|
95
|
-
})
|
|
128
|
+
});
|
|
129
|
+
const racePromises = [loadPromise];
|
|
130
|
+
if (hardTimeoutPromise) {
|
|
131
|
+
racePromises.push(hardTimeoutPromise);
|
|
132
|
+
}
|
|
133
|
+
return Promise.race(racePromises).finally(() => {
|
|
134
|
+
if (hardTimeoutId) {
|
|
135
|
+
clearTimeout(hardTimeoutId);
|
|
136
|
+
}
|
|
137
|
+
// No await, because session might be stuck on url() command
|
|
138
|
+
pageLoader.unsubscribe();
|
|
139
|
+
restorePageLoadTimeout();
|
|
140
|
+
});
|
|
96
141
|
};
|
|
97
142
|
exports.default = (browser) => {
|
|
98
143
|
const { publicAPI: session, config } = browser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openAndWait.js","sourceRoot":"","sources":["../../../../src/browser/commands/openAndWait.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAgBvB,MAAM,YAAY,GAAG,aAAa,CAAC;AAEnC,MAAM,EAAE,GAAgD;IACpD,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC;IAChE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxG,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;CAChF,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,MAAqB,EAAE,OAA4B,EAAE,EAAE,CACnF,KAAK,UAAU,WAAW,CAEtB,GAAW,EACX,EACI,QAAQ,GAAG,EAAE,EACb,SAAS,EACT,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,eAAe,EACzD,sBAAsB,GAAG,MAAM,CAAC,eAAe,EAAE,sBAAsB,EACvE,kBAAkB,GAAG,MAAM,CAAC,eAAe,EAAE,kBAAkB,EAC/D,gBAAgB,GAAG,uBAAuB,EAC1C,2BAA2B,GAAG,MAAM,CAAC,eAAe,EAAE,2BAA2B,EACjF,OAAO,GAAG,MAAM,CAAC,eAAe,EAAE,OAAO,IAAI,MAAM,EAAE,eAAe,IAAI,CAAC,MAC/D,EAAE;IAEhB,MAAM,UAAU,GAAG,MAAM,kDAAO,yBAAyB,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,EAAE,WAAW,KAAK,QAAQ,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,KAAK,UAAU,CAAC;IAEvD,eAAe,KAAK,QAAQ,IAAI,KAAK,CAAC;IAEtC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;QAC/B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE;QACvC,SAAS;QACT,SAAS;QACT,OAAO;QACP,eAAe;QACf,sBAAsB;KACzB,CAAC,CAAC;IAEH,IAAI,iBAAiB,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;IAC1C,IAAI,iBAAiB,GAAG,CAAC,SAAS,CAAC;IACnC,IAAI,eAAe,GAAG,CAAC,eAAe,CAAC;IAEvC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"openAndWait.js","sourceRoot":"","sources":["../../../../src/browser/commands/openAndWait.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,11 +48,9 @@ const virtualModules = {
|
|
|
48
48
|
},
|
|
49
49
|
};
|
|
50
50
|
const plugin = async () => {
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
});
|
|
55
|
-
const mochaModulePath = node_path_1.default.join(node_url_1.default.fileURLToPath(node_path_1.default.dirname(mochaPackagePath)), "mocha.js");
|
|
51
|
+
const require = (0, node_module_1.createRequire)((0, utils_1.getImportMetaUrl)(__filename));
|
|
52
|
+
const mochaMainPath = require.resolve("mocha");
|
|
53
|
+
const mochaModulePath = node_path_1.default.join(node_path_1.default.dirname(mochaMainPath), "mocha.js");
|
|
56
54
|
const dirname = node_url_1.default.fileURLToPath(new URL(".", (0, utils_1.getImportMetaUrl)(__filename)));
|
|
57
55
|
const browserModulesPath = node_path_1.default.resolve(dirname, "..", "browser-modules");
|
|
58
56
|
const browserRunnerModulePath = node_path_1.default.resolve(browserModulesPath, "index.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-index-html.js","sourceRoot":"","sources":["../../../../../../src/runner/browser-env/vite/plugins/generate-index-html.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA6B;AAC7B,wDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"generate-index-html.js","sourceRoot":"","sources":["../../../../../../src/runner/browser-env/vite/plugins/generate-index-html.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,9 @@ const socket_1 = require("./socket");
|
|
|
39
39
|
const generate_index_html_1 = require("./plugins/generate-index-html");
|
|
40
40
|
const mock_1 = require("./plugins/mock");
|
|
41
41
|
const manual_mock_1 = require("./manual-mock");
|
|
42
|
+
const runtime_config_1 = __importDefault(require("../../../config/runtime-config"));
|
|
42
43
|
const constants_1 = require("./constants");
|
|
44
|
+
const defaults_1 = __importDefault(require("../../../config/defaults"));
|
|
43
45
|
class ViteServer {
|
|
44
46
|
static create(testplaneConfig) {
|
|
45
47
|
return new this(testplaneConfig);
|
|
@@ -86,6 +88,7 @@ class ViteServer {
|
|
|
86
88
|
this._server = await (0, vite_1.createServer)(this._viteConfig);
|
|
87
89
|
(0, socket_1.createSocketServer)(this._server.httpServer);
|
|
88
90
|
await this._server.listen();
|
|
91
|
+
this._useBaseUrlFromVite();
|
|
89
92
|
logger.log(chalk_1.default.green(`Vite server started on ${this.baseUrl}`));
|
|
90
93
|
}
|
|
91
94
|
async close() {
|
|
@@ -119,6 +122,19 @@ class ViteServer {
|
|
|
119
122
|
get baseUrl() {
|
|
120
123
|
return this._server?.resolvedUrls.local[0];
|
|
121
124
|
}
|
|
125
|
+
_useBaseUrlFromVite() {
|
|
126
|
+
const viteBaseUrl = this.baseUrl;
|
|
127
|
+
const defaultBaseUrl = defaults_1.default.baseUrl;
|
|
128
|
+
runtime_config_1.default.getInstance().extend({ viteBaseUrl });
|
|
129
|
+
if (this._testplaneConfig.baseUrl === defaultBaseUrl) {
|
|
130
|
+
this._testplaneConfig.baseUrl = viteBaseUrl;
|
|
131
|
+
}
|
|
132
|
+
for (const broConfig of Object.values(this._testplaneConfig.browsers)) {
|
|
133
|
+
if (broConfig.baseUrl === defaultBaseUrl) {
|
|
134
|
+
broConfig.baseUrl = viteBaseUrl;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
122
138
|
}
|
|
123
139
|
exports.ViteServer = ViteServer;
|
|
124
140
|
//# sourceMappingURL=server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/runner/browser-env/vite/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAA8B;AAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,GAAG,CAAC;AAE1C,0DAA6B;AAC7B,+BAAoC;AACpC,oDAAuB;AACvB,wDAA+B;AAC/B,kDAA0B;AAE1B,8DAAgD;AAChD,qCAA8C;AAC9C,uEAA4E;AAC5E,yCAAsD;AACtD,+CAA2C;AAE3C,2CAAsD;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/runner/browser-env/vite/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,6 @@ type TestInfoFromViteRequest = {
|
|
|
6
6
|
env: WorkerInitializePayload;
|
|
7
7
|
};
|
|
8
8
|
export declare const getImportMetaUrl: (path: string) => string;
|
|
9
|
-
export declare const getNodeModulePath: ({ moduleName, rootDir, parent, }: {
|
|
10
|
-
moduleName: string;
|
|
11
|
-
rootDir?: string | undefined;
|
|
12
|
-
parent?: string | undefined;
|
|
13
|
-
}) => Promise<string>;
|
|
14
9
|
export declare const prepareError: (error: Error) => Error;
|
|
15
10
|
export declare const getTestInfoFromViteRequest: (req: Connect.IncomingMessage) => TestInfoFromViteRequest | null;
|
|
16
11
|
export declare const getPathWithoutExtName: (fsPath: string) => string;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getPathWithoutExtName = exports.getTestInfoFromViteRequest = exports.prepareError = exports.
|
|
6
|
+
exports.getPathWithoutExtName = exports.getTestInfoFromViteRequest = exports.prepareError = exports.getImportMetaUrl = void 0;
|
|
7
7
|
const node_url_1 = __importDefault(require("node:url"));
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -13,13 +13,6 @@ const getImportMetaUrl = (path) => {
|
|
|
13
13
|
return node_url_1.default.pathToFileURL(path).toString();
|
|
14
14
|
};
|
|
15
15
|
exports.getImportMetaUrl = getImportMetaUrl;
|
|
16
|
-
const getNodeModulePath = async ({ moduleName, rootDir = process.cwd(), parent = "node_modules", }) => {
|
|
17
|
-
const rootFileUrl = node_url_1.default.pathToFileURL(rootDir).href;
|
|
18
|
-
// TODO: use import at the beginning of the file after migrate to esm
|
|
19
|
-
const { resolve } = await eval(`import("import-meta-resolve")`);
|
|
20
|
-
return resolve(moduleName, node_path_1.default.join(rootFileUrl, parent));
|
|
21
|
-
};
|
|
22
|
-
exports.getNodeModulePath = getNodeModulePath;
|
|
23
16
|
// TODO: use from browser code after migrate to esm
|
|
24
17
|
const prepareError = (error) => {
|
|
25
18
|
return JSON.parse(JSON.stringify(error, Object.getOwnPropertyNames(error)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/runner/browser-env/vite/utils.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,0DAA6B;AAC7B,oDAAuB;AAEvB,2CAA0E;AAW1E,iDAAiD;AAC1C,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAU,EAAE;IACrD,OAAO,kBAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/runner/browser-env/vite/utils.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,0DAA6B;AAC7B,oDAAuB;AAEvB,2CAA0E;AAW1E,iDAAiD;AAC1C,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAU,EAAE;IACrD,OAAO,kBAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEF,mDAAmD;AAC5C,MAAM,YAAY,GAAG,CAAC,KAAY,EAAS,EAAE;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,MAAM,0BAA0B,GAAG,CAAC,GAA4B,EAAkC,EAAE;IACvG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,kBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAEvE,IAAI,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,SAAS,KAAK,+BAAmB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,yBAAyB,+BAAmB,4BAA4B,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/G,CAAC;IAED,MAAM,GAAG,GAAG,kCAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CACX,uCAAuC,OAAO,KAAK;YAC/C,wBAAwB;YACxB,+CAA+C;YAC/C,2CAA2C;YAC3C,6BAA6B,CACpC,CAAC;IACN,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AACvC,CAAC,CAAC;AAhCW,QAAA,0BAA0B,8BAgCrC;AAEK,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAU,EAAE;IAC5D,MAAM,OAAO,GAAG,mBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC,CAAC;AARW,QAAA,qBAAqB,yBAQhC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export function readFiles(files: any, { esmDecorator, config, eventBus, runnableOpts }: {
|
|
1
|
+
export function readFiles(files: any, { esmDecorator, config, eventBus, runnableOpts, isBrowserEnv }: {
|
|
2
2
|
esmDecorator: any;
|
|
3
3
|
config: any;
|
|
4
4
|
eventBus: any;
|
|
5
5
|
runnableOpts: any;
|
|
6
|
+
isBrowserEnv?: boolean | undefined;
|
|
6
7
|
}): Promise<void>;
|
|
@@ -6,6 +6,7 @@ const { TreeBuilderDecorator } = require("./tree-builder-decorator");
|
|
|
6
6
|
const { TestReaderEvents } = require("../../events");
|
|
7
7
|
const { MasterEvents } = require("../../events");
|
|
8
8
|
const { getMethodsByInterface } = require("./utils");
|
|
9
|
+
const logger = require("../../utils/logger");
|
|
9
10
|
const { enableSourceMaps } = require("../../utils/typescript");
|
|
10
11
|
function getTagParser(original) {
|
|
11
12
|
return function (title, paramsOrFn, fn) {
|
|
@@ -26,7 +27,7 @@ function getTagParser(original) {
|
|
|
26
27
|
}
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
|
-
async function readFiles(files, { esmDecorator, config, eventBus, runnableOpts }) {
|
|
30
|
+
async function readFiles(files, { esmDecorator, config, eventBus, runnableOpts, isBrowserEnv = false }) {
|
|
30
31
|
const mocha = new Mocha(config);
|
|
31
32
|
mocha.suite.on("pre-require", context => {
|
|
32
33
|
const originalDescribe = context.describe;
|
|
@@ -44,7 +45,18 @@ async function readFiles(files, { esmDecorator, config, eventBus, runnableOpts }
|
|
|
44
45
|
initBuildContext(eventBus);
|
|
45
46
|
initEventListeners({ rootSuite: mocha.suite, outBus: eventBus, config, runnableOpts });
|
|
46
47
|
files.forEach(f => mocha.addFile(f));
|
|
47
|
-
|
|
48
|
+
try {
|
|
49
|
+
await mocha.loadFilesAsync({ esmDecorator });
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
const errorMessage = (err.message || "").split("\n")[0].trim();
|
|
53
|
+
if (isBrowserEnv && err.code === "MODULE_NOT_FOUND" && errorMessage.includes("?")) {
|
|
54
|
+
logger.warn(`Failed to resolve module with query parameter: ${errorMessage}. ` +
|
|
55
|
+
`This is likely a Vite-style import (e.g., './file.svg?react'). ` +
|
|
56
|
+
`Please install @babel/parser version 7 or higher to fix this issue.`);
|
|
57
|
+
}
|
|
58
|
+
throw err;
|
|
59
|
+
}
|
|
48
60
|
applyOnly(mocha.suite, eventBus);
|
|
49
61
|
}
|
|
50
62
|
function initBuildContext(outBus) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACrE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACjD,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACrD,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAE/D,SAAS,YAAY,CAAC,QAAQ;IAC1B,OAAO,UAAU,KAAK,EAAE,UAAU,EAAE,EAAE;QAClC,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAE5C,IAAI,UAAU,EAAE,GAAG,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBACzE,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC5D,CAAC;YACL,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/index.js"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
56
56
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
57
57
|
const logger = __importStar(require("../utils/logger"));
|
|
58
58
|
const crypto_1 = require("../utils/crypto");
|
|
59
|
+
const config_1 = require("../utils/config");
|
|
59
60
|
const getFailedTestId = (test) => (0, crypto_1.getShortMD5)(`${test.fullTitle}${test.browserId}${test.browserVersion}`);
|
|
60
61
|
class TestParser extends events_1.EventEmitter {
|
|
61
62
|
constructor() {
|
|
@@ -91,7 +92,8 @@ class TestParser extends events_1.EventEmitter {
|
|
|
91
92
|
const { readFiles } = await Promise.resolve().then(() => __importStar(require("./mocha-reader")));
|
|
92
93
|
const rand = Math.random();
|
|
93
94
|
const esmDecorator = (f) => f + `?rand=${rand}`;
|
|
94
|
-
|
|
95
|
+
const isBrowserEnv = (0, config_1.isRunInBrowserEnv)(config);
|
|
96
|
+
await readFiles(files, { esmDecorator, config: mochaOpts, eventBus, runnableOpts, isBrowserEnv });
|
|
95
97
|
if (config.lastFailed.only) {
|
|
96
98
|
try {
|
|
97
99
|
__classPrivateFieldSet(this, _TestParser_failedTests, new Set(), "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAsC;AACtC,6DAAsE;AACtE,mEAA+D;AAC/D,mEAA+D;AAC/D,mEAA+D;AAC/D,uEAAmE;AACnE,yFAAsE;AACtE,iDAA6C;AAC7C,sCAA6C;AAC7C,uDAA2D;AAC3D,sCAAyC;AACzC,oDAAuB;AACvB,kEAAyC;AACzC,gDAAwB;AACxB,wDAA0B;AAC1B,wDAA0C;AAC1C,4CAA8C;
|
|
1
|
+
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.ts"],"names":[],"mappings":"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"}
|
package/build/src/testplane.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Command } from "@gemini-testing/commander";
|
|
2
2
|
import { BaseTestplane } from "./base-testplane";
|
|
3
|
-
import type { MainRunner
|
|
4
|
-
import type { MainRunner as BrowserEnvRunner } from "./runner/browser-env";
|
|
3
|
+
import type { MainRunner } from "./runner";
|
|
5
4
|
import { TestCollection } from "./test-collection";
|
|
6
5
|
import { ConfigInput } from "./config/types";
|
|
7
6
|
import { MasterEventHandler, Test, TestResult } from "./types";
|
|
8
7
|
import { TagFilter } from "./utils/cli";
|
|
8
|
+
import { ViteServer } from "./runner/browser-env/vite/server";
|
|
9
9
|
interface RunOpts {
|
|
10
10
|
browsers: string[];
|
|
11
11
|
sets: string[];
|
|
@@ -52,7 +52,8 @@ export interface Testplane {
|
|
|
52
52
|
export declare class Testplane extends BaseTestplane {
|
|
53
53
|
protected failed: boolean;
|
|
54
54
|
protected failedList: FailedListItem[];
|
|
55
|
-
protected runner:
|
|
55
|
+
protected runner: MainRunner | null;
|
|
56
|
+
protected viteServer: ViteServer | null;
|
|
56
57
|
constructor(config?: string | ConfigInput);
|
|
57
58
|
extendCli(parser: Command): void;
|
|
58
59
|
protected _init(): Promise<void>;
|
package/build/src/testplane.js
CHANGED
|
@@ -44,12 +44,14 @@ const config_1 = require("./utils/config");
|
|
|
44
44
|
const dev_server_1 = require("./dev-server");
|
|
45
45
|
const preload_utils_1 = require("./utils/preload-utils");
|
|
46
46
|
const selectivity_1 = require("./browser/cdp/selectivity");
|
|
47
|
+
const server_1 = require("./runner/browser-env/vite/server");
|
|
47
48
|
class Testplane extends base_testplane_1.BaseTestplane {
|
|
48
49
|
constructor(config) {
|
|
49
50
|
super(config);
|
|
50
51
|
this.failed = false;
|
|
51
52
|
this.failedList = [];
|
|
52
53
|
this.runner = null;
|
|
54
|
+
this.viteServer = null;
|
|
53
55
|
}
|
|
54
56
|
extendCli(parser) {
|
|
55
57
|
this.emit(events_1.MasterEvents.CLI, parser);
|
|
@@ -60,6 +62,15 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
60
62
|
devServerConfig: this._config.devServer,
|
|
61
63
|
configPath: this._config.configPath,
|
|
62
64
|
});
|
|
65
|
+
if (!(0, config_1.isRunInNodeJsEnv)(this._config)) {
|
|
66
|
+
try {
|
|
67
|
+
this.viteServer = server_1.ViteServer.create(this._config);
|
|
68
|
+
await this.viteServer.start();
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
throw new Error(`Vite server failed to start: ${err.message}`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
63
74
|
return super._init();
|
|
64
75
|
}
|
|
65
76
|
async run(testPaths, { browsers, sets, grep, tag, updateRefs, requireModules, inspectMode, replMode, devtools, local, keepBrowserMode, reporters = [], } = {}) {
|
|
@@ -76,9 +87,7 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
76
87
|
if (replMode?.enabled) {
|
|
77
88
|
this._config.system.mochaOpts.timeout = 0;
|
|
78
89
|
}
|
|
79
|
-
const RunnerClass =
|
|
80
|
-
? await Promise.resolve().then(() => __importStar(require("./runner"))).then(m => m.MainRunner)
|
|
81
|
-
: await Promise.resolve().then(() => __importStar(require("./runner/browser-env"))).then(m => m.MainRunner);
|
|
90
|
+
const RunnerClass = await Promise.resolve().then(() => __importStar(require("./runner"))).then(m => m.MainRunner);
|
|
82
91
|
const runner = RunnerClass.create(this._config, this._interceptors);
|
|
83
92
|
this.runner = runner;
|
|
84
93
|
this.on(events_1.MasterEvents.TEST_FAIL, res => {
|
|
@@ -174,6 +183,9 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
174
183
|
process.exit(1);
|
|
175
184
|
}, timeout).unref();
|
|
176
185
|
}
|
|
186
|
+
if (this.viteServer) {
|
|
187
|
+
this.viteServer.close();
|
|
188
|
+
}
|
|
177
189
|
if (this.runner) {
|
|
178
190
|
this.runner.cancel();
|
|
179
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAuB;AACvB,wDAA0B;AAC1B,mCAA+C;AAC/C,qDAAiD;
|
|
1
|
+
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { Events } from "../events";
|
|
2
|
-
import type { MainRunner
|
|
3
|
-
import type { MainRunner as BrowserEnvRunner } from "../runner/browser-env/index";
|
|
2
|
+
import type { MainRunner } from "../runner";
|
|
4
3
|
import type { TestCollection } from "../test-collection";
|
|
5
4
|
import type { Test } from "../test-reader/test-object/test";
|
|
6
5
|
import type { Suite } from "../test-reader/test-object/suite";
|
|
@@ -198,7 +197,7 @@ export interface TestDepsData extends NormalizedDependencies {
|
|
|
198
197
|
}
|
|
199
198
|
export type MasterEventHandler<T extends BaseTestplane> = {
|
|
200
199
|
(event: Events["INIT"], callback: () => Promise<void> | void): T;
|
|
201
|
-
(event: Events["RUNNER_START"], callback: (runner:
|
|
200
|
+
(event: Events["RUNNER_START"], callback: (runner: MainRunner) => Promise<void> | void): T;
|
|
202
201
|
(event: Events["RUNNER_END"], callback: (result: StatsResult) => Promise<void> | void): T;
|
|
203
202
|
(event: Events["SESSION_START"], callback: AsyncSessionEventCallback): T;
|
|
204
203
|
(event: Events["SESSION_END"], callback: AsyncSessionEventCallback): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;AA0GA,IAAY,WAYX;AAZD,WAAY,WAAW;IACnB,yBAAU,CAAA;IACV,yBAAU,CAAA;IACV,0BAAW,CAAA;IACX,6BAAc,CAAA;IACd,+BAAgB,CAAA;IAChB,6BAAc,CAAA;IACd,kCAAmB,CAAA;IACnB,4BAAa,CAAA;IACb,6BAAc,CAAA;IACd,6BAAc,CAAA;IACd,wBAAS,CAAA;AACb,CAAC,EAZW,WAAW,2BAAX,WAAW,QAYtB"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isRunInNodeJsEnv = void 0;
|
|
3
|
+
exports.isRunInBrowserEnv = exports.isRunInNodeJsEnv = void 0;
|
|
4
4
|
const config_1 = require("../constants/config");
|
|
5
5
|
const isRunInNodeJsEnv = (config) => {
|
|
6
6
|
return config.system.testRunEnv === config_1.NODEJS_TEST_RUN_ENV;
|
|
7
7
|
};
|
|
8
8
|
exports.isRunInNodeJsEnv = isRunInNodeJsEnv;
|
|
9
|
+
const isRunInBrowserEnv = (config) => {
|
|
10
|
+
return ((typeof config.system.testRunEnv === "string" && config.system.testRunEnv === config_1.BROWSER_TEST_RUN_ENV) ||
|
|
11
|
+
(Array.isArray(config.system.testRunEnv) && config.system.testRunEnv[0] === config_1.BROWSER_TEST_RUN_ENV));
|
|
12
|
+
};
|
|
13
|
+
exports.isRunInBrowserEnv = isRunInBrowserEnv;
|
|
9
14
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;;AAAA,gDAAgF;AAGzE,MAAM,gBAAgB,GAAG,CAAC,MAAoB,EAAW,EAAE;IAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,KAAK,4BAAmB,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAW,EAAE;IAC/D,OAAO,CACH,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,KAAK,6BAAoB,CAAC;QACnG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,6BAAoB,CAAC,CACpG,CAAC;AACN,CAAC,CAAC;AALW,QAAA,iBAAiB,qBAK5B"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import type { CommonConfig } from "../config/types";
|
|
1
2
|
export declare const transformCode: (code: string, { sourceFile, sourceMaps, isSilent }: {
|
|
2
3
|
sourceFile: string;
|
|
3
4
|
sourceMaps: boolean;
|
|
4
5
|
isSilent?: boolean | undefined;
|
|
5
6
|
}) => string;
|
|
6
7
|
export declare const registerTransformHook: (isSilent?: boolean) => void;
|
|
8
|
+
export declare const updateTransformHook: (config: CommonConfig) => void;
|
|
7
9
|
export declare const enableSourceMaps: () => void;
|
|
@@ -26,10 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.enableSourceMaps = exports.registerTransformHook = exports.transformCode = void 0;
|
|
29
|
+
exports.enableSourceMaps = exports.updateTransformHook = exports.registerTransformHook = exports.transformCode = void 0;
|
|
30
30
|
const node_path_1 = __importDefault(require("node:path"));
|
|
31
31
|
const pirates_1 = require("pirates");
|
|
32
|
+
const recast = __importStar(require("recast"));
|
|
32
33
|
const logger = __importStar(require("./logger"));
|
|
34
|
+
const config_1 = require("./config");
|
|
33
35
|
const TESTPLANE_TRANSFORM_HOOK = Symbol.for("testplane.transform.hook");
|
|
34
36
|
const TRANSFORM_CODE_EXTENSIONS = [".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs", ".mts", ".cts"];
|
|
35
37
|
const ASSET_EXTENSIONS = [
|
|
@@ -47,6 +49,7 @@ const ASSET_EXTENSIONS = [
|
|
|
47
49
|
".woff2",
|
|
48
50
|
];
|
|
49
51
|
let transformFunc = null;
|
|
52
|
+
let shouldRemoveViteQueryImports = false;
|
|
50
53
|
const transformCode = (code, { sourceFile, sourceMaps, isSilent = true }) => {
|
|
51
54
|
if (transformFunc === null) {
|
|
52
55
|
const envVar = process.env.TS_NODE_SWC === "false" ? false : true;
|
|
@@ -65,40 +68,46 @@ const transformCode = (code, { sourceFile, sourceMaps, isSilent = true }) => {
|
|
|
65
68
|
if (envVar && hasSwcCore()) {
|
|
66
69
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
67
70
|
const { transformSync } = require("@swc/core");
|
|
68
|
-
transformFunc = (code, sourceFile, sourceMaps) =>
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
71
|
+
transformFunc = (code, sourceFile, sourceMaps) => {
|
|
72
|
+
const preprocessedCode = shouldRemoveViteQueryImports ? removeViteQueryImports(code, sourceFile) : code;
|
|
73
|
+
return transformSync(preprocessedCode, {
|
|
74
|
+
sourceFileName: sourceFile,
|
|
75
|
+
sourceMaps: sourceMaps ? "inline" : false,
|
|
76
|
+
configFile: false,
|
|
77
|
+
swcrc: false,
|
|
78
|
+
minify: false,
|
|
79
|
+
module: {
|
|
80
|
+
type: "commonjs",
|
|
81
|
+
ignoreDynamic: true,
|
|
82
|
+
},
|
|
83
|
+
jsc: {
|
|
84
|
+
target: "esnext",
|
|
85
|
+
parser: {
|
|
86
|
+
syntax: "typescript",
|
|
87
|
+
tsx: true,
|
|
88
|
+
decorators: true,
|
|
89
|
+
dynamicImport: true,
|
|
90
|
+
},
|
|
85
91
|
},
|
|
86
|
-
}
|
|
87
|
-
}
|
|
92
|
+
}).code;
|
|
93
|
+
};
|
|
88
94
|
}
|
|
89
95
|
else {
|
|
90
96
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
91
97
|
const { transformSync } = require("esbuild");
|
|
92
|
-
transformFunc = (code, sourceFile, sourceMaps) =>
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
98
|
+
transformFunc = (code, sourceFile, sourceMaps) => {
|
|
99
|
+
const preprocessedCode = shouldRemoveViteQueryImports ? removeViteQueryImports(code, sourceFile) : code;
|
|
100
|
+
return transformSync(preprocessedCode, {
|
|
101
|
+
sourcefile: sourceFile,
|
|
102
|
+
sourcemap: sourceMaps ? "inline" : false,
|
|
103
|
+
minify: false,
|
|
104
|
+
loader: node_path_1.default.extname(sourceFile).includes("j") ? "jsx" : "tsx",
|
|
105
|
+
format: "cjs",
|
|
106
|
+
target: "esnext",
|
|
107
|
+
platform: "node",
|
|
108
|
+
jsx: "automatic",
|
|
109
|
+
}).code;
|
|
110
|
+
};
|
|
102
111
|
}
|
|
103
112
|
}
|
|
104
113
|
return transformFunc(code, sourceFile, sourceMaps);
|
|
@@ -141,6 +150,10 @@ const registerTransformHook = (isSilent = false) => {
|
|
|
141
150
|
}
|
|
142
151
|
};
|
|
143
152
|
exports.registerTransformHook = registerTransformHook;
|
|
153
|
+
const updateTransformHook = (config) => {
|
|
154
|
+
shouldRemoveViteQueryImports = (0, config_1.isRunInBrowserEnv)(config);
|
|
155
|
+
};
|
|
156
|
+
exports.updateTransformHook = updateTransformHook;
|
|
144
157
|
const enableSourceMaps = () => {
|
|
145
158
|
const processWithTranspileSymbol = process;
|
|
146
159
|
if (!processWithTranspileSymbol[TESTPLANE_TRANSFORM_HOOK]) {
|
|
@@ -149,4 +162,75 @@ const enableSourceMaps = () => {
|
|
|
149
162
|
processWithTranspileSymbol[TESTPLANE_TRANSFORM_HOOK].enableSourceMaps();
|
|
150
163
|
};
|
|
151
164
|
exports.enableSourceMaps = enableSourceMaps;
|
|
165
|
+
function removeViteQueryImports(code, sourceFile) {
|
|
166
|
+
const extname = node_path_1.default.extname(sourceFile);
|
|
167
|
+
const isJsxOrTsx = extname === ".jsx" || extname === ".tsx";
|
|
168
|
+
if (!isJsxOrTsx) {
|
|
169
|
+
return code;
|
|
170
|
+
}
|
|
171
|
+
let parser = null;
|
|
172
|
+
try {
|
|
173
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
174
|
+
const babelParser = require("@babel/parser");
|
|
175
|
+
parser = {
|
|
176
|
+
parse(source) {
|
|
177
|
+
return babelParser.parse(source, {
|
|
178
|
+
sourceType: "module",
|
|
179
|
+
plugins: [
|
|
180
|
+
"typescript",
|
|
181
|
+
"jsx",
|
|
182
|
+
"decorators-legacy",
|
|
183
|
+
"classProperties",
|
|
184
|
+
"nullishCoalescingOperator",
|
|
185
|
+
"optionalChaining",
|
|
186
|
+
],
|
|
187
|
+
tokens: true,
|
|
188
|
+
});
|
|
189
|
+
},
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
catch (err) {
|
|
193
|
+
// If @babel/parser is not installed, return original code without transformation.
|
|
194
|
+
// This is not a critical issue as the user may not be using Vite-style imports with query parameters.
|
|
195
|
+
return code;
|
|
196
|
+
}
|
|
197
|
+
let ast;
|
|
198
|
+
try {
|
|
199
|
+
ast = recast.parse(code, {
|
|
200
|
+
parser,
|
|
201
|
+
sourceFileName: sourceFile,
|
|
202
|
+
sourceRoot: node_path_1.default.dirname(sourceFile),
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
catch (err) {
|
|
206
|
+
const errorMessage = err.message;
|
|
207
|
+
logger.warn(`Failed to parse file ${sourceFile} for removal of Vite query imports: ${errorMessage}. ` +
|
|
208
|
+
`The file will be processed without removing query imports.`);
|
|
209
|
+
return code;
|
|
210
|
+
}
|
|
211
|
+
recast.visit(ast, {
|
|
212
|
+
visitImportDeclaration(nodePath) {
|
|
213
|
+
const declaration = nodePath.value;
|
|
214
|
+
const source = declaration.source.value;
|
|
215
|
+
if (typeof source === "string") {
|
|
216
|
+
const extname = node_path_1.default.extname(source);
|
|
217
|
+
if (extname && extname.includes("?")) {
|
|
218
|
+
nodePath.prune();
|
|
219
|
+
return false;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return this.traverse(nodePath);
|
|
223
|
+
},
|
|
224
|
+
});
|
|
225
|
+
try {
|
|
226
|
+
const result = recast.print(ast, { sourceMapName: sourceFile });
|
|
227
|
+
return result.code;
|
|
228
|
+
}
|
|
229
|
+
catch (err) {
|
|
230
|
+
const errorMessage = err.message;
|
|
231
|
+
logger.warn(`Failed to transform AST for ${sourceFile} for removal of Vite query imports: ${errorMessage}. ` +
|
|
232
|
+
`The file will be processed without removing query imports.`);
|
|
233
|
+
return code;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
152
236
|
//# sourceMappingURL=typescript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/utils/typescript.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA6B;AAC7B,qCAAkC;AAClC,iDAAmC;
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/utils/typescript.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.37.
|
|
3
|
+
"version": "8.37.2",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -118,6 +118,7 @@
|
|
|
118
118
|
"yallist": "3.1.1"
|
|
119
119
|
},
|
|
120
120
|
"devDependencies": {
|
|
121
|
+
"@babel/parser": "7.28.5",
|
|
121
122
|
"@commitlint/cli": "^19.0.3",
|
|
122
123
|
"@commitlint/config-conventional": "^19.0.3",
|
|
123
124
|
"@cspotcode/source-map-support": "0.8.0",
|
|
@@ -180,11 +181,15 @@
|
|
|
180
181
|
"uglifyify": "3.0.4"
|
|
181
182
|
},
|
|
182
183
|
"peerDependencies": {
|
|
184
|
+
"@babel/parser": ">=7.0.0",
|
|
183
185
|
"@cspotcode/source-map-support": ">=0.7.0",
|
|
184
186
|
"@swc/core": ">=1.3.96",
|
|
185
187
|
"ts-node": ">=10.5.0"
|
|
186
188
|
},
|
|
187
189
|
"peerDependenciesMeta": {
|
|
190
|
+
"@babel/parser": {
|
|
191
|
+
"optional": true
|
|
192
|
+
},
|
|
188
193
|
"ts-node": {
|
|
189
194
|
"optional": true
|
|
190
195
|
},
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { MainRunner as NodejsEnvRunner } from "..";
|
|
2
|
-
import { TestCollection } from "../../test-collection";
|
|
3
|
-
import { Config } from "../../config";
|
|
4
|
-
import { Interceptor } from "../../events";
|
|
5
|
-
import type { Stats as RunnerStats } from "../../stats";
|
|
6
|
-
export declare class MainRunner extends NodejsEnvRunner {
|
|
7
|
-
private _viteServer;
|
|
8
|
-
constructor(config: Config, interceptors: Interceptor[]);
|
|
9
|
-
run(testCollection: TestCollection, stats: RunnerStats): Promise<void>;
|
|
10
|
-
private _useBaseUrlFromVite;
|
|
11
|
-
cancel(): void;
|
|
12
|
-
}
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.MainRunner = void 0;
|
|
7
|
-
const server_1 = require("./vite/server");
|
|
8
|
-
const __1 = require("..");
|
|
9
|
-
const runtime_config_1 = __importDefault(require("../../config/runtime-config"));
|
|
10
|
-
const defaults_1 = __importDefault(require("../../config/defaults"));
|
|
11
|
-
class MainRunner extends __1.MainRunner {
|
|
12
|
-
constructor(config, interceptors) {
|
|
13
|
-
super(config, interceptors);
|
|
14
|
-
this._viteServer = server_1.ViteServer.create(config);
|
|
15
|
-
}
|
|
16
|
-
async run(testCollection, stats) {
|
|
17
|
-
try {
|
|
18
|
-
await this._viteServer.start();
|
|
19
|
-
runtime_config_1.default.getInstance().extend({ viteBaseUrl: this._viteServer.baseUrl });
|
|
20
|
-
}
|
|
21
|
-
catch (err) {
|
|
22
|
-
throw new Error(`Vite server failed to start: ${err.message}`);
|
|
23
|
-
}
|
|
24
|
-
this._useBaseUrlFromVite();
|
|
25
|
-
await super.run(testCollection, stats);
|
|
26
|
-
}
|
|
27
|
-
_useBaseUrlFromVite() {
|
|
28
|
-
const viteBaseUrl = this._viteServer.baseUrl;
|
|
29
|
-
const defaultBaseUrl = defaults_1.default.baseUrl;
|
|
30
|
-
if (this.config.baseUrl === defaultBaseUrl) {
|
|
31
|
-
this.config.baseUrl = viteBaseUrl;
|
|
32
|
-
}
|
|
33
|
-
for (const broConfig of Object.values(this.config.browsers)) {
|
|
34
|
-
if (broConfig.baseUrl === defaultBaseUrl) {
|
|
35
|
-
broConfig.baseUrl = viteBaseUrl;
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
cancel() {
|
|
40
|
-
super.cancel();
|
|
41
|
-
this._viteServer.close();
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
exports.MainRunner = MainRunner;
|
|
45
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runner/browser-env/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA2C;AAC3C,0BAAmD;AAGnD,iFAAwD;AAGxD,qEAA6C;AAE7C,MAAa,UAAW,SAAQ,cAAe;IAG3C,YAAY,MAAc,EAAE,YAA2B;QACnD,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAE5B,IAAI,CAAC,WAAW,GAAG,mBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,cAA8B,EAAE,KAAkB;QACxD,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC/B,wBAAa,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,gCAAiC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEO,mBAAmB;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,OAAQ,CAAC;QAC9C,MAAM,cAAc,GAAG,kBAAQ,CAAC,OAAO,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC;QACtC,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1D,IAAI,SAAS,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;gBACvC,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM;QACF,KAAK,CAAC,MAAM,EAAE,CAAC;QAEf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;CACJ;AAzCD,gCAyCC"}
|