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.

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

[SIEM] apollo@3 #51926

Merged
merged 53 commits into from
Feb 27, 2020
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
cd9e8b5
WIP
patrykkopycinski Dec 16, 2019
a1d6da7
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Dec 16, 2019
1a17ecb
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Jan 4, 2020
a1a3081
update kbn-pm/dist
patrykkopycinski Jan 4, 2020
58076a0
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Jan 5, 2020
07e050c
fix dependencies
patrykkopycinski Jan 5, 2020
87cc67a
Fix lint
patrykkopycinski Jan 5, 2020
b3ec5ad
WIP
patrykkopycinski Jan 6, 2020
2d8ede4
cleanup
patrykkopycinski Jan 6, 2020
9d3a4e9
cleanup
patrykkopycinski Jan 6, 2020
0f7210b
fix types
patrykkopycinski Jan 6, 2020
3c954c9
cleanup
patrykkopycinski Jan 6, 2020
d572a33
fix unit tests
patrykkopycinski Jan 6, 2020
bd467a6
Merge branch 'master' into chore/apollo-3
elasticmachine Jan 6, 2020
2269d16
bump
patrykkopycinski Feb 16, 2020
6cae564
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 17, 2020
5958764
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 17, 2020
35ca61b
no message
patrykkopycinski Feb 17, 2020
b8056ce
cleanup
patrykkopycinski Feb 17, 2020
c0ac7e6
cleanup
patrykkopycinski Feb 17, 2020
48998f3
dist
patrykkopycinski Feb 17, 2020
1ddee7e
cleanup
patrykkopycinski Feb 17, 2020
7251171
lock
patrykkopycinski Feb 17, 2020
2938c65
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 18, 2020
d520878
cleanup
patrykkopycinski Feb 18, 2020
f0b79fe
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 18, 2020
e89d991
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 18, 2020
1e822bd
cleanup
patrykkopycinski Feb 18, 2020
61cb28f
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 19, 2020
13fbd9a
update unit tests
patrykkopycinski Feb 19, 2020
2714a6e
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 19, 2020
3d0f977
Merge branch 'master' into chore/apollo-3
elasticmachine Feb 19, 2020
447b10a
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 20, 2020
3ccb591
bump apollo client
patrykkopycinski Feb 20, 2020
81c260e
WIP
patrykkopycinski Feb 20, 2020
db21ed8
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 21, 2020
070b8cf
Fix TimelineItem caching
patrykkopycinski Feb 21, 2020
8908665
revert cache
patrykkopycinski Feb 21, 2020
cfd9064
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 22, 2020
fa4dffe
update unit tests
patrykkopycinski Feb 23, 2020
3413c99
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 23, 2020
77ca8e5
fix types
patrykkopycinski Feb 23, 2020
73bb40f
fix tests
patrykkopycinski Feb 23, 2020
8bd093a
Update index.test.tsx.snap
patrykkopycinski Feb 23, 2020
e72deb3
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 24, 2020
ea1a065
cleanup
patrykkopycinski Feb 24, 2020
588feda
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 25, 2020
04f4975
Merge branch 'master' into chore/apollo-3
elasticmachine Feb 26, 2020
91f98ec
Update x-pack/legacy/plugins/siem/public/containers/global_time/index…
patrykkopycinski Feb 26, 2020
bd5ec41
Update index.tsx
patrykkopycinski Feb 26, 2020
13a9281
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 26, 2020
043bc9e
Merge branch 'master' of github.com:elastic/kibana into chore/apollo-3
patrykkopycinski Feb 26, 2020
a7afdc9
snap
patrykkopycinski Feb 26, 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
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,31 @@
"url": "https://github.com/elastic/kibana.git"
},
"resolutions": {
"**/@apollo/client": "^3.0.0-beta.37",
"**/@graphql-toolkit/common": "^0.9.7",
"**/@graphql-toolkit/core": "^0.9.7",
"**/@graphql-toolkit/graphql-file-loader": "^0.9.7",
"**/@graphql-toolkit/json-file-loader": "^0.9.7",
"**/@graphql-toolkit/schema-merging": "^0.9.7",
"**/@graphql-toolkit/url-loader": "^0.9.7",
"**/@types/node": "10.12.27",
"**/@types/react": "^16.9.19",
"**/@types/react-router": "^5.1.3",
"**/@types/hapi": "^17.0.18",
"**/@types/angular": "^1.6.56",
"**/@types/hoist-non-react-statics": "^3.3.1",
"**/typescript": "3.7.2",
"**/graphql-toolkit/lodash": "^4.17.13",
"**/apollo-link": "^1.2.13",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
"**/fast-glob": "3.1.1",
"**/hoist-non-react-statics": "^3.3.2",
"**/isomorphic-git/**/base64-js": "^1.2.1",
"**/image-diff/gm/debug": "^2.6.9",
"**/react-dom": "^16.12.0",
"**/react": "^16.12.0",
"**/react-test-renderer": "^16.12.0",
"**/deepmerge": "^4.2.2",
"**/serialize-javascript": "^2.1.1",
"**/fast-deep-equal": "^3.1.1"
"**/typescript": "3.7.2"
},
"workspaces": {
"packages": [
Expand Down Expand Up @@ -325,7 +333,6 @@
"@types/getopts": "^2.0.1",
"@types/glob": "^7.1.1",
"@types/globby": "^8.0.0",
"@types/graphql": "^0.13.2",
"@types/hapi": "^17.0.18",
"@types/hapi-auth-cookie": "^9.1.0",
"@types/has-ansi": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ beforeAll(async () => {
await cpy('**/*', MOCK_REPO_DIR, {
cwd: MOCK_REPO_SRC,
parents: true,
deep: true,
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ beforeEach(async () => {
await cpy('**/*', MOCK_REPO_DIR, {
cwd: MOCK_REPO_SRC,
parents: true,
deep: true,
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/src/worker/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
},

resolve: {
extensions: ['.js', '.ts', '.tsx', '.json'],
extensions: ['.mjs', '.js', '.ts', '.tsx', '.json'],
alias: {
tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
},
Expand Down
Loading