just-scripts 1.6.0 → 1.8.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.
- package/CHANGELOG.json +61 -1
- package/CHANGELOG.md +34 -2
- package/lib/tasks/apiExtractorTask.d.ts +1 -1
- package/lib/tasks/apiExtractorTask.d.ts.map +1 -1
- package/lib/tasks/apiExtractorTask.js +7 -2
- package/lib/tasks/apiExtractorTask.js.map +1 -1
- package/lib/tasks/jestTask.d.ts +1 -0
- package/lib/tasks/jestTask.d.ts.map +1 -1
- package/lib/tasks/jestTask.js +4 -1
- package/lib/tasks/jestTask.js.map +1 -1
- package/package.json +2 -2
- package/src/tasks/apiExtractorTask.ts +11 -3
- package/src/tasks/jestTask.ts +6 -2
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,67 @@
|
|
|
2
2
|
"name": "just-scripts",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Mon,
|
|
5
|
+
"date": "Mon, 07 Feb 2022 19:43:38 GMT",
|
|
6
|
+
"tag": "just-scripts_v1.8.0",
|
|
7
|
+
"version": "1.8.0",
|
|
8
|
+
"comments": {
|
|
9
|
+
"minor": [
|
|
10
|
+
{
|
|
11
|
+
"author": "dzearing@microsoft.com",
|
|
12
|
+
"package": "just-scripts",
|
|
13
|
+
"comment": "Api extractor task now respects projectFolder option if provided.",
|
|
14
|
+
"commit": "93108b8e6f1032c912b383d356a19a528874d9e1"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Mon, 07 Feb 2022 17:05:34 GMT",
|
|
21
|
+
"tag": "just-scripts_v1.7.0",
|
|
22
|
+
"version": "1.7.0",
|
|
23
|
+
"comments": {
|
|
24
|
+
"minor": [
|
|
25
|
+
{
|
|
26
|
+
"author": "dzearing@microsoft.com",
|
|
27
|
+
"package": "just-scripts",
|
|
28
|
+
"comment": "Adding rootDir option to jest task.",
|
|
29
|
+
"commit": "8e7ba24884d089f69daf80a3396b3e4c3108421c"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Thu, 27 Jan 2022 23:06:07 GMT",
|
|
36
|
+
"tag": "just-scripts_v1.6.2",
|
|
37
|
+
"version": "1.6.2",
|
|
38
|
+
"comments": {
|
|
39
|
+
"patch": [
|
|
40
|
+
{
|
|
41
|
+
"author": "elcraig@microsoft.com",
|
|
42
|
+
"package": "just-scripts",
|
|
43
|
+
"commit": "61ff9720d4347a4d050615472eb658c8ade55573",
|
|
44
|
+
"comment": "Bump just-scripts to v1.6.2"
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"date": "Tue, 14 Dec 2021 18:46:49 GMT",
|
|
51
|
+
"tag": "just-scripts_v1.6.1",
|
|
52
|
+
"version": "1.6.1",
|
|
53
|
+
"comments": {
|
|
54
|
+
"patch": [
|
|
55
|
+
{
|
|
56
|
+
"author": "elcraig@microsoft.com",
|
|
57
|
+
"package": "just-scripts",
|
|
58
|
+
"comment": "jest: don't include positional args twice",
|
|
59
|
+
"commit": "f1c5a8d53353d3991c51902bb84cd99fa6ce32de"
|
|
60
|
+
}
|
|
61
|
+
]
|
|
62
|
+
}
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
"date": "Mon, 13 Dec 2021 23:44:49 GMT",
|
|
6
66
|
"tag": "just-scripts_v1.6.0",
|
|
7
67
|
"version": "1.6.0",
|
|
8
68
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,44 @@
|
|
|
1
1
|
# Change Log - just-scripts
|
|
2
2
|
|
|
3
|
-
This log was last generated on Mon,
|
|
3
|
+
This log was last generated on Mon, 07 Feb 2022 19:43:38 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 1.8.0
|
|
8
|
+
|
|
9
|
+
Mon, 07 Feb 2022 19:43:38 GMT
|
|
10
|
+
|
|
11
|
+
### Minor changes
|
|
12
|
+
|
|
13
|
+
- Api extractor task now respects projectFolder option if provided. (dzearing@microsoft.com)
|
|
14
|
+
|
|
15
|
+
## 1.7.0
|
|
16
|
+
|
|
17
|
+
Mon, 07 Feb 2022 17:05:34 GMT
|
|
18
|
+
|
|
19
|
+
### Minor changes
|
|
20
|
+
|
|
21
|
+
- Adding rootDir option to jest task. (dzearing@microsoft.com)
|
|
22
|
+
|
|
23
|
+
## 1.6.2
|
|
24
|
+
|
|
25
|
+
Thu, 27 Jan 2022 23:06:07 GMT
|
|
26
|
+
|
|
27
|
+
### Patches
|
|
28
|
+
|
|
29
|
+
- Bump just-scripts to v1.6.2 (elcraig@microsoft.com)
|
|
30
|
+
|
|
31
|
+
## 1.6.1
|
|
32
|
+
|
|
33
|
+
Tue, 14 Dec 2021 18:46:49 GMT
|
|
34
|
+
|
|
35
|
+
### Patches
|
|
36
|
+
|
|
37
|
+
- jest: don't include positional args twice (elcraig@microsoft.com)
|
|
38
|
+
|
|
7
39
|
## 1.6.0
|
|
8
40
|
|
|
9
|
-
Mon, 13 Dec 2021 23:44:
|
|
41
|
+
Mon, 13 Dec 2021 23:44:49 GMT
|
|
10
42
|
|
|
11
43
|
### Minor changes
|
|
12
44
|
|
|
@@ -4,7 +4,7 @@ import * as ApiExtractorTypes from './apiExtractorTypes';
|
|
|
4
4
|
* Options from `IExtractorConfigOptions` plus additional options specific to the task.
|
|
5
5
|
*/
|
|
6
6
|
export interface ApiExtractorOptions extends ApiExtractorTypes.IExtractorInvokeOptions {
|
|
7
|
-
/**
|
|
7
|
+
/** The project folder to be used for reporting output paths. */
|
|
8
8
|
projectFolder?: string;
|
|
9
9
|
/** The config file path */
|
|
10
10
|
configJsonFilePath?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiExtractorTask.d.ts","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,WAAW,CAAC;AAIjD,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AAIzD;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB,CAAC,uBAAuB;IACpF,
|
|
1
|
+
{"version":3,"file":"apiExtractorTask.d.ts","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,WAAW,CAAC;AAIjD,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AAIzD;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB,CAAC,uBAAuB;IACpF,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,2BAA2B;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,KAAK,IAAI,CAAC;IAExD;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC,WAAW,KAAK,IAAI,CAAC;CAClE;AAaD,aAAK,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEjE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC;AACnF,2CAA2C;AAC3C,wBAAgB,sBAAsB,CACpC,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,GAChE,YAAY,CAAC;AAsBhB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC;AACnF,2CAA2C;AAC3C,wBAAgB,sBAAsB,CACpC,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,GAChE,YAAY,CAAC;AAyGhB;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAc3H"}
|
|
@@ -86,11 +86,16 @@ function initApiExtractor(options) {
|
|
|
86
86
|
(_a = options.onConfigLoaded) === null || _a === void 0 ? void 0 : _a.call(options, rawConfig);
|
|
87
87
|
// This follows the logic from ExtractorConfig.loadFileAndPrepare
|
|
88
88
|
// https://github.com/microsoft/rushstack/blob/1eb3d8ccf2a87b90a1038bf464b0b73fb3c7fd78/apps/api-extractor/src/api/ExtractorConfig.ts#L455
|
|
89
|
-
const
|
|
89
|
+
const prepareConfig = {
|
|
90
90
|
configObject: rawConfig,
|
|
91
91
|
configObjectFullPath: path.resolve(configJsonFilePath),
|
|
92
92
|
packageJsonFullPath: path.resolve('package.json'),
|
|
93
|
-
}
|
|
93
|
+
};
|
|
94
|
+
// Respect projectFolder if provided.
|
|
95
|
+
if (options.projectFolder) {
|
|
96
|
+
prepareConfig.configObject.projectFolder = options.projectFolder;
|
|
97
|
+
}
|
|
98
|
+
const config = ExtractorConfig.prepare(prepareConfig);
|
|
94
99
|
return { apiExtractorModule, config, extractorOptions, options };
|
|
95
100
|
}
|
|
96
101
|
function apiExtractorWrapper({ apiExtractorModule, config, extractorOptions, options, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"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"}
|
package/lib/tasks/jestTask.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jestTask.d.ts","sourceRoot":"","sources":["../../src/tasks/jestTask.ts"],"names":[],"mappings":";AAAA,OAAO,EAA+B,YAAY,EAAQ,MAAM,WAAW,CAAC;AAK5E,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAEb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,wBAAgB,QAAQ,CAAC,OAAO,GAAE,eAAoB,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"jestTask.d.ts","sourceRoot":"","sources":["../../src/tasks/jestTask.ts"],"names":[],"mappings":";AAAA,OAAO,EAA+B,YAAY,EAAQ,MAAM,WAAW,CAAC;AAK5E,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAEb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,wBAAgB,QAAQ,CAAC,OAAO,GAAE,eAAoB,GAAG,YAAY,CAsDpE"}
|
package/lib/tasks/jestTask.js
CHANGED
|
@@ -31,6 +31,7 @@ function jestTask(options = {}) {
|
|
|
31
31
|
...(options.nodeArgs || []),
|
|
32
32
|
jestCmd,
|
|
33
33
|
...(configFileExists ? ['--config', configFile] : []),
|
|
34
|
+
...(options.rootDir ? ['--rootDir', options.rootDir] : []),
|
|
34
35
|
...(options.passWithNoTests ? ['--passWithNoTests'] : []),
|
|
35
36
|
...(options.clearCache ? ['--clearCache'] : []),
|
|
36
37
|
...(options.colors !== false && supportsColor.stdout ? ['--colors'] : []),
|
|
@@ -41,7 +42,9 @@ function jestTask(options = {}) {
|
|
|
41
42
|
...(options.testPathPattern ? ['--testPathPattern', options.testPathPattern] : []),
|
|
42
43
|
...(options.testNamePattern ? ['--testNamePattern', options.testNamePattern] : []),
|
|
43
44
|
...(options.u || options.updateSnapshot ? ['--updateSnapshot'] : ['']),
|
|
44
|
-
|
|
45
|
+
// Only include the positional args if `options._` wasn't specified
|
|
46
|
+
// (to avoid possibly including them twice)
|
|
47
|
+
...(options._ || positional),
|
|
45
48
|
].filter(arg => !!arg);
|
|
46
49
|
just_task_1.logger.info(cmd, just_scripts_utils_1.encodeArgs(args).join(' '));
|
|
47
50
|
return just_scripts_utils_1.spawn(cmd, args, { stdio: 'inherit', env: options.env });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jestTask.js","sourceRoot":"","sources":["../../src/tasks/jestTask.ts"],"names":[],"mappings":";;;AAAA,yCAA4E;AAC5E,2DAAwE;AACxE,2BAAgC;AAChC,gDAAgD;
|
|
1
|
+
{"version":3,"file":"jestTask.js","sourceRoot":"","sources":["../../src/tasks/jestTask.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "just-scripts",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "Just Stack Scripts",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"repository": {
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"diff-match-patch": "1.0.5",
|
|
27
27
|
"fs-extra": "^8.0.0",
|
|
28
28
|
"glob": "^7.1.3",
|
|
29
|
-
"just-scripts-utils": ">=1.1.
|
|
29
|
+
"just-scripts-utils": ">=1.1.5 <2.0.0",
|
|
30
30
|
"just-task": ">=1.4.2 <2.0.0",
|
|
31
31
|
"prompts": "^2.4.0",
|
|
32
32
|
"run-parallel-limit": "^1.0.6",
|
|
@@ -10,7 +10,7 @@ import * as ApiExtractorTypes from './apiExtractorTypes';
|
|
|
10
10
|
* Options from `IExtractorConfigOptions` plus additional options specific to the task.
|
|
11
11
|
*/
|
|
12
12
|
export interface ApiExtractorOptions extends ApiExtractorTypes.IExtractorInvokeOptions {
|
|
13
|
-
/**
|
|
13
|
+
/** The project folder to be used for reporting output paths. */
|
|
14
14
|
projectFolder?: string;
|
|
15
15
|
|
|
16
16
|
/** The config file path */
|
|
@@ -168,11 +168,19 @@ function initApiExtractor(options: ApiExtractorOptions): ApiExtractorContext | u
|
|
|
168
168
|
options.onConfigLoaded?.(rawConfig);
|
|
169
169
|
// This follows the logic from ExtractorConfig.loadFileAndPrepare
|
|
170
170
|
// https://github.com/microsoft/rushstack/blob/1eb3d8ccf2a87b90a1038bf464b0b73fb3c7fd78/apps/api-extractor/src/api/ExtractorConfig.ts#L455
|
|
171
|
-
|
|
171
|
+
|
|
172
|
+
const prepareConfig = {
|
|
172
173
|
configObject: rawConfig,
|
|
173
174
|
configObjectFullPath: path.resolve(configJsonFilePath),
|
|
174
175
|
packageJsonFullPath: path.resolve('package.json'),
|
|
175
|
-
}
|
|
176
|
+
};
|
|
177
|
+
|
|
178
|
+
// Respect projectFolder if provided.
|
|
179
|
+
if (options.projectFolder) {
|
|
180
|
+
prepareConfig.configObject.projectFolder = options.projectFolder;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
const config = ExtractorConfig.prepare(prepareConfig);
|
|
176
184
|
|
|
177
185
|
return { apiExtractorModule, config, extractorOptions, options };
|
|
178
186
|
}
|
package/src/tasks/jestTask.ts
CHANGED
|
@@ -5,6 +5,7 @@ import * as supportsColor from 'supports-color';
|
|
|
5
5
|
|
|
6
6
|
export interface JestTaskOptions {
|
|
7
7
|
config?: string;
|
|
8
|
+
rootDir?: string;
|
|
8
9
|
runInBand?: boolean;
|
|
9
10
|
coverage?: boolean;
|
|
10
11
|
updateSnapshot?: boolean;
|
|
@@ -59,6 +60,7 @@ export function jestTask(options: JestTaskOptions = {}): TaskFunction {
|
|
|
59
60
|
...(options.nodeArgs || []),
|
|
60
61
|
jestCmd,
|
|
61
62
|
...(configFileExists ? ['--config', configFile] : []),
|
|
63
|
+
...(options.rootDir ? ['--rootDir', options.rootDir] : []),
|
|
62
64
|
...(options.passWithNoTests ? ['--passWithNoTests'] : []),
|
|
63
65
|
...(options.clearCache ? ['--clearCache'] : []),
|
|
64
66
|
...(options.colors !== false && supportsColor.stdout ? ['--colors'] : []),
|
|
@@ -69,8 +71,10 @@ export function jestTask(options: JestTaskOptions = {}): TaskFunction {
|
|
|
69
71
|
...(options.testPathPattern ? ['--testPathPattern', options.testPathPattern] : []),
|
|
70
72
|
...(options.testNamePattern ? ['--testNamePattern', options.testNamePattern] : []),
|
|
71
73
|
...(options.u || options.updateSnapshot ? ['--updateSnapshot'] : ['']),
|
|
72
|
-
|
|
73
|
-
|
|
74
|
+
// Only include the positional args if `options._` wasn't specified
|
|
75
|
+
// (to avoid possibly including them twice)
|
|
76
|
+
...(options._ || positional),
|
|
77
|
+
].filter(arg => !!arg) as string[];
|
|
74
78
|
|
|
75
79
|
logger.info(cmd, encodeArgs(args).join(' '));
|
|
76
80
|
|