Skip to content

Commit f561cac

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into remote_clusters/np
2 parents 9d834a3 + b46a335 commit f561cac

376 files changed

Lines changed: 58550 additions & 15225 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,23 @@
7777
"url": "https://github.com/elastic/kibana.git"
7878
},
7979
"resolutions": {
80-
"**/@apollo/client": "^3.0.0-beta.37",
81-
"**/@graphql-toolkit/common": "^0.9.7",
82-
"**/@graphql-toolkit/core": "^0.9.7",
83-
"**/@graphql-toolkit/graphql-file-loader": "^0.9.7",
84-
"**/@graphql-toolkit/json-file-loader": "^0.9.7",
85-
"**/@graphql-toolkit/schema-merging": "^0.9.7",
86-
"**/@graphql-toolkit/url-loader": "^0.9.7",
8780
"**/@types/node": "10.12.27",
8881
"**/@types/react": "^16.9.19",
8982
"**/@types/react-router": "^5.1.3",
9083
"**/@types/hapi": "^17.0.18",
9184
"**/@types/angular": "^1.6.56",
9285
"**/@types/hoist-non-react-statics": "^3.3.1",
93-
"**/apollo-link": "^1.2.13",
94-
"**/deepmerge": "^4.2.2",
95-
"**/fast-deep-equal": "^3.1.1",
96-
"**/fast-glob": "3.1.1",
86+
"**/typescript": "3.7.2",
87+
"**/graphql-toolkit/lodash": "^4.17.13",
9788
"**/hoist-non-react-statics": "^3.3.2",
9889
"**/isomorphic-git/**/base64-js": "^1.2.1",
9990
"**/image-diff/gm/debug": "^2.6.9",
10091
"**/react-dom": "^16.12.0",
10192
"**/react": "^16.12.0",
10293
"**/react-test-renderer": "^16.12.0",
94+
"**/deepmerge": "^4.2.2",
10395
"**/serialize-javascript": "^2.1.1",
104-
"**/typescript": "3.7.2"
96+
"**/fast-deep-equal": "^3.1.1"
10597
},
10698
"workspaces": {
10799
"packages": [
@@ -333,6 +325,7 @@
333325
"@types/getopts": "^2.0.1",
334326
"@types/glob": "^7.1.1",
335327
"@types/globby": "^8.0.0",
328+
"@types/graphql": "^0.13.2",
336329
"@types/hapi": "^17.0.18",
337330
"@types/hapi-auth-cookie": "^9.1.0",
338331
"@types/has-ansi": "^3.0.0",

‎packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ beforeAll(async () => {
3838
await cpy('**/*', MOCK_REPO_DIR, {
3939
cwd: MOCK_REPO_SRC,
4040
parents: true,
41+
deep: true,
4142
});
4243
});
4344

‎packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ beforeEach(async () => {
4444
await cpy('**/*', MOCK_REPO_DIR, {
4545
cwd: MOCK_REPO_SRC,
4646
parents: true,
47+
deep: true,
4748
});
4849
});
4950

‎packages/kbn-optimizer/src/worker/webpack.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
217217
},
218218

219219
resolve: {
220-
extensions: ['.mjs', '.js', '.ts', '.tsx', '.json'],
220+
extensions: ['.js', '.ts', '.tsx', '.json'],
221221
alias: {
222222
tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
223223
},

0 commit comments

Comments
 (0)