Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump yargs-parser to v13.1.2+ #77009

Merged
merged 3 commits into from
Sep 14, 2020
Merged

Bump yargs-parser to v13.1.2+ #77009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92809c0
Bump yargs-parser to v13.1.2+
watson Sep 9, 2020
3c3dd07
fix tests
watson Sep 10, 2020
1bf6607
Merge branch 'master' into bump-yargs-parser
elasticmachine Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/kbn-config-schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"typescript": "4.0.2",
"tsd": "^0.7.4"
"tsd": "^0.13.1"
},
"peerDependencies": {
"lodash": "^4.17.15",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-utility-types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"utility-types": "^3.10.0"
},
"devDependencies": {
"del-cli": "^3.0.0",
"tsd": "^0.7.4"
"del-cli": "^3.0.1",
"tsd": "^0.13.1"
}
}
4 changes: 2 additions & 2 deletions packages/kbn-utility-types/test-d/union_to_intersection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* under the License.
*/

import { expectType } from 'tsd';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewers: All the changes in these files from expectType to expectAssignable are because of this breaking change to tsd: tsdjs/tsd@e4c78c7

import { expectAssignable } from 'tsd';
import { UnionToIntersection } from '../index';

type INTERSECTED = UnionToIntersection<{ foo: 'bar' } | { baz: 'qux' }>;

expectType<INTERSECTED>({
expectAssignable<INTERSECTED>({
foo: 'bar',
baz: 'qux',
});
4 changes: 2 additions & 2 deletions packages/kbn-utility-types/test-d/unwrap_observable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* under the License.
*/

import { expectType } from 'tsd';
import { expectAssignable } from 'tsd';
import { UnwrapObservable, ObservableLike } from '../index';

type STRING = UnwrapObservable<ObservableLike<string>>;

expectType<STRING>('adf');
expectAssignable<STRING>('adf');
6 changes: 3 additions & 3 deletions packages/kbn-utility-types/test-d/unwrap_promise.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* under the License.
*/

import { expectType } from 'tsd';
import { expectAssignable } from 'tsd';
import { UnwrapPromise } from '../index';

type STRING = UnwrapPromise<Promise<string>>;
type TUPLE = UnwrapPromise<Promise<[number, number]>>;

expectType<STRING>('adf');
expectType<TUPLE>([1, 2]);
expectAssignable<STRING>('adf');
expectAssignable<TUPLE>([1, 2]);
14 changes: 7 additions & 7 deletions packages/kbn-utility-types/test-d/values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
* under the License.
*/

import { expectType } from 'tsd';
import { expectAssignable } from 'tsd';
import { Values } from '../index';

// Arrays
type STRING = Values<string[]>;
type ASDF_FOO = Values<Array<'asdf' | 'foo'>>;

expectType<STRING>('adf');
expectType<ASDF_FOO>('asdf');
expectType<ASDF_FOO>('foo');
expectAssignable<STRING>('adf');
expectAssignable<ASDF_FOO>('asdf');
expectAssignable<ASDF_FOO>('foo');

// Objects
type STRING2 = Values<Record<number, string>>;
type FOO = Values<Record<number, 'foo'>>;
type BAR = Values<{ foo: 'bar' }>;

expectType<STRING2>('adf');
expectType<FOO>('foo');
expectType<BAR>('bar');
expectAssignable<STRING2>('adf');
expectAssignable<FOO>('foo');
expectAssignable<BAR>('bar');
4 changes: 2 additions & 2 deletions x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"mocha": "^7.1.1",
"mocha-junit-reporter": "^1.23.1",
"mochawesome": "^4.1.0",
"mochawesome-merge": "^2.0.1",
"mochawesome-merge": "^4.1.0",
"mustache": "^2.3.0",
"mutation-observer": "^1.0.3",
"node-fetch": "^2.6.0",
Expand Down Expand Up @@ -268,7 +268,7 @@
"vinyl-fs": "^3.0.3",
"whatwg-fetch": "^3.0.0",
"xml-crypto": "^1.4.0",
"yargs": "4.8.1"
"yargs": "^15.4.1"
},
"dependencies": {
"@babel/core": "^7.11.1",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build-graphql-types": "node scripts/generate_types_from_graphql.js",
"cypress:open": "cypress open --config-file ./cypress/cypress.json",
"cypress:open-as-ci": "node ../../../scripts/functional_tests --config ../../test/security_solution_cypress/visual_config.ts",
"cypress:run": "cypress run --browser chrome --headless --spec ./cypress/integration/**/*.spec.ts --config-file ./cypress/cypress.json --reporter ../../node_modules/cypress-multi-reporters --reporter-options configFile=./cypress/reporter_config.json; status=$?; ../../node_modules/.bin/mochawesome-merge --reportDir ../../../target/kibana-security-solution/cypress/results > ../../../target/kibana-security-solution/cypress/results/output.json; ../../../node_modules/.bin/marge ../../../target/kibana-security-solution/cypress/results/output.json --reportDir ../../../target/kibana-security-solution/cypress/results; mkdir -p ../../../target/junit && cp ../../../target/kibana-security-solution/cypress/results/*.xml ../../../target/junit/ && exit $status;",
Copy link
Contributor Author

@watson watson Sep 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewers: I upgraded mochawesome-merge from v2.0.1 to v4.1.0. The new version has replaced the --reportDir command line flag with a glob syntax. Hence this change. See Antontelesh/mochawesome-merge#32 for details

"cypress:run": "cypress run --browser chrome --headless --spec ./cypress/integration/**/*.spec.ts --config-file ./cypress/cypress.json --reporter ../../node_modules/cypress-multi-reporters --reporter-options configFile=./cypress/reporter_config.json; status=$?; ../../node_modules/.bin/mochawesome-merge ../../../target/kibana-security-solution/cypress/results/mochawesome*.json > ../../../target/kibana-security-solution/cypress/results/output.json; ../../../node_modules/.bin/marge ../../../target/kibana-security-solution/cypress/results/output.json --reportDir ../../../target/kibana-security-solution/cypress/results; mkdir -p ../../../target/junit && cp ../../../target/kibana-security-solution/cypress/results/*.xml ../../../target/junit/ && exit $status;",
"cypress:run-as-ci": "node ../../../scripts/functional_tests --config ../../test/security_solution_cypress/cli_config.ts",
"test:generate": "node scripts/endpoint/resolver_generator"
},
Expand Down
Loading