@eggjs/bin 7.1.0 → 7.3.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.
|
@@ -29,7 +29,7 @@ export declare abstract class BaseCommand<T extends typeof Command> extends Comm
|
|
|
29
29
|
protected flags: Flags<T>;
|
|
30
30
|
protected args: Args<T>;
|
|
31
31
|
protected env: {
|
|
32
|
-
[
|
|
32
|
+
[key: string]: string | undefined;
|
|
33
33
|
TZ?: string;
|
|
34
34
|
};
|
|
35
35
|
protected pkg: Record<string, any>;
|
|
@@ -11,6 +11,8 @@ const core_1 = require("@oclif/core");
|
|
|
11
11
|
const globby_1 = __importDefault(require("globby"));
|
|
12
12
|
const utils_1 = require("@eggjs/utils");
|
|
13
13
|
const jest_changed_files_1 = require("jest-changed-files");
|
|
14
|
+
// @ts-expect-error no types
|
|
15
|
+
const ci_parallel_vars_1 = __importDefault(require("ci-parallel-vars"));
|
|
14
16
|
const baseCommand_js_1 = require("../baseCommand.js");
|
|
15
17
|
const debug = (0, node_util_1.debuglog)('@eggjs/bin/commands/test');
|
|
16
18
|
class Test extends baseCommand_js_1.BaseCommand {
|
|
@@ -156,12 +158,23 @@ class Test extends baseCommand_js_1.BaseCommand {
|
|
|
156
158
|
}
|
|
157
159
|
pattern = pattern.concat(['!test/fixtures', '!test/node_modules']);
|
|
158
160
|
// expand glob and skip node_modules and fixtures
|
|
159
|
-
|
|
161
|
+
let files = globby_1.default.sync(pattern, { cwd: flags.base });
|
|
160
162
|
files.sort();
|
|
161
163
|
if (files.length === 0) {
|
|
162
164
|
console.log('No test files found with pattern %o', pattern);
|
|
163
165
|
return;
|
|
164
166
|
}
|
|
167
|
+
// split up test files in parallel CI jobs
|
|
168
|
+
if (ci_parallel_vars_1.default) {
|
|
169
|
+
const { index: currentIndex, total: totalRuns } = ci_parallel_vars_1.default;
|
|
170
|
+
const fileCount = files.length;
|
|
171
|
+
const each = Math.floor(fileCount / totalRuns);
|
|
172
|
+
const remainder = fileCount % totalRuns;
|
|
173
|
+
const offset = Math.min(currentIndex, remainder) + (currentIndex * each);
|
|
174
|
+
const currentFileCount = each + (currentIndex < remainder ? 1 : 0);
|
|
175
|
+
files = files.slice(offset, offset + currentFileCount);
|
|
176
|
+
console.log('# Split test files in parallel CI jobs: %d/%d, files: %d/%d', currentIndex + 1, totalRuns, files.length, fileCount);
|
|
177
|
+
}
|
|
165
178
|
// auto add setup file as the first test file
|
|
166
179
|
const setupFile = node_path_1.default.join(flags.base, `test/.setup.${ext}`);
|
|
167
180
|
try {
|
|
@@ -206,4 +219,4 @@ class Test extends baseCommand_js_1.BaseCommand {
|
|
|
206
219
|
}
|
|
207
220
|
}
|
|
208
221
|
exports.default = Test;
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export declare abstract class BaseCommand<T extends typeof Command> extends Comm
|
|
|
29
29
|
protected flags: Flags<T>;
|
|
30
30
|
protected args: Args<T>;
|
|
31
31
|
protected env: {
|
|
32
|
-
[
|
|
32
|
+
[key: string]: string | undefined;
|
|
33
33
|
TZ?: string;
|
|
34
34
|
};
|
|
35
35
|
protected pkg: Record<string, any>;
|
|
@@ -6,6 +6,8 @@ import { Args, Flags } from '@oclif/core';
|
|
|
6
6
|
import globby from 'globby';
|
|
7
7
|
import { importResolve, detectType, EggType } from '@eggjs/utils';
|
|
8
8
|
import { getChangedFilesForRoots } from 'jest-changed-files';
|
|
9
|
+
// @ts-expect-error no types
|
|
10
|
+
import ciParallelVars from 'ci-parallel-vars';
|
|
9
11
|
import { BaseCommand } from '../baseCommand.js';
|
|
10
12
|
const debug = debuglog('@eggjs/bin/commands/test');
|
|
11
13
|
export default class Test extends BaseCommand {
|
|
@@ -151,12 +153,23 @@ export default class Test extends BaseCommand {
|
|
|
151
153
|
}
|
|
152
154
|
pattern = pattern.concat(['!test/fixtures', '!test/node_modules']);
|
|
153
155
|
// expand glob and skip node_modules and fixtures
|
|
154
|
-
|
|
156
|
+
let files = globby.sync(pattern, { cwd: flags.base });
|
|
155
157
|
files.sort();
|
|
156
158
|
if (files.length === 0) {
|
|
157
159
|
console.log('No test files found with pattern %o', pattern);
|
|
158
160
|
return;
|
|
159
161
|
}
|
|
162
|
+
// split up test files in parallel CI jobs
|
|
163
|
+
if (ciParallelVars) {
|
|
164
|
+
const { index: currentIndex, total: totalRuns } = ciParallelVars;
|
|
165
|
+
const fileCount = files.length;
|
|
166
|
+
const each = Math.floor(fileCount / totalRuns);
|
|
167
|
+
const remainder = fileCount % totalRuns;
|
|
168
|
+
const offset = Math.min(currentIndex, remainder) + (currentIndex * each);
|
|
169
|
+
const currentFileCount = each + (currentIndex < remainder ? 1 : 0);
|
|
170
|
+
files = files.slice(offset, offset + currentFileCount);
|
|
171
|
+
console.log('# Split test files in parallel CI jobs: %d/%d, files: %d/%d', currentIndex + 1, totalRuns, files.length, fileCount);
|
|
172
|
+
}
|
|
160
173
|
// auto add setup file as the first test file
|
|
161
174
|
const setupFile = path.join(flags.base, `test/.setup.${ext}`);
|
|
162
175
|
try {
|
|
@@ -200,4 +213,4 @@ export default class Test extends BaseCommand {
|
|
|
200
213
|
return files;
|
|
201
214
|
}
|
|
202
215
|
}
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/test.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/bin",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.3.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -23,12 +23,13 @@
|
|
|
23
23
|
"@types/mocha": "^10.0.10",
|
|
24
24
|
"@types/supertest": "^6.0.2",
|
|
25
25
|
"c8": "^10.0.0",
|
|
26
|
+
"ci-parallel-vars": "^1.0.1",
|
|
26
27
|
"detect-port": "^2.0.0",
|
|
27
28
|
"egg-ts-helper": "^3.0.0",
|
|
28
29
|
"globby": "^11.1.0",
|
|
29
30
|
"jest-changed-files": "^29.4.2",
|
|
30
31
|
"mocha": "^11.0.1",
|
|
31
|
-
"mochawesome-with-mocha": "^
|
|
32
|
+
"mochawesome-with-mocha": "^8.0.0",
|
|
32
33
|
"runscript": "^2.0.0",
|
|
33
34
|
"ts-node": "^10.9.2",
|
|
34
35
|
"tsconfig-paths": "^4.1.2",
|
|
@@ -55,8 +56,8 @@
|
|
|
55
56
|
"cpy-cli": "^5.0.0",
|
|
56
57
|
"cross-env": "^7.0.3",
|
|
57
58
|
"egg": "^4.0.7",
|
|
58
|
-
"esbuild": "^0.
|
|
59
|
-
"esbuild-register": "^3.
|
|
59
|
+
"esbuild": "^0.25.0",
|
|
60
|
+
"esbuild-register": "^3.6.0",
|
|
60
61
|
"eslint": "8",
|
|
61
62
|
"eslint-config-egg": "14",
|
|
62
63
|
"npminstall": "^7.12.0",
|
package/src/commands/test.ts
CHANGED
|
@@ -6,6 +6,8 @@ import { Args, Flags } from '@oclif/core';
|
|
|
6
6
|
import globby from 'globby';
|
|
7
7
|
import { importResolve, detectType, EggType } from '@eggjs/utils';
|
|
8
8
|
import { getChangedFilesForRoots } from 'jest-changed-files';
|
|
9
|
+
// @ts-expect-error no types
|
|
10
|
+
import ciParallelVars from 'ci-parallel-vars';
|
|
9
11
|
import { BaseCommand } from '../baseCommand.js';
|
|
10
12
|
|
|
11
13
|
const debug = debuglog('@eggjs/bin/commands/test');
|
|
@@ -166,7 +168,7 @@ export default class Test<T extends typeof Test> extends BaseCommand<T> {
|
|
|
166
168
|
pattern = pattern.concat([ '!test/fixtures', '!test/node_modules' ]);
|
|
167
169
|
|
|
168
170
|
// expand glob and skip node_modules and fixtures
|
|
169
|
-
|
|
171
|
+
let files = globby.sync(pattern, { cwd: flags.base });
|
|
170
172
|
files.sort();
|
|
171
173
|
|
|
172
174
|
if (files.length === 0) {
|
|
@@ -174,6 +176,19 @@ export default class Test<T extends typeof Test> extends BaseCommand<T> {
|
|
|
174
176
|
return;
|
|
175
177
|
}
|
|
176
178
|
|
|
179
|
+
// split up test files in parallel CI jobs
|
|
180
|
+
if (ciParallelVars) {
|
|
181
|
+
const { index: currentIndex, total: totalRuns } = ciParallelVars as { index: number, total: number };
|
|
182
|
+
const fileCount = files.length;
|
|
183
|
+
const each = Math.floor(fileCount / totalRuns);
|
|
184
|
+
const remainder = fileCount % totalRuns;
|
|
185
|
+
const offset = Math.min(currentIndex, remainder) + (currentIndex * each);
|
|
186
|
+
const currentFileCount = each + (currentIndex < remainder ? 1 : 0);
|
|
187
|
+
files = files.slice(offset, offset + currentFileCount);
|
|
188
|
+
console.log('# Split test files in parallel CI jobs: %d/%d, files: %d/%d',
|
|
189
|
+
currentIndex + 1, totalRuns, files.length, fileCount);
|
|
190
|
+
}
|
|
191
|
+
|
|
177
192
|
// auto add setup file as the first test file
|
|
178
193
|
const setupFile = path.join(flags.base, `test/.setup.${ext}`);
|
|
179
194
|
try {
|