[SIEM] apollo@3 (elastic#51926)

patrykkopycinski · Feb 27, 2020 · a3bd19d · a3bd19d
1 parent e5a53c9
commit a3bd19d
Show file tree

Hide file tree

Showing 228 changed files with 13,932 additions and 55,891 deletions.
diff --git a/package.json b/package.json
@@ -75,23 +75,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": [
@@ -320,7 +328,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",

diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -38,7 +38,6 @@ beforeAll(async () => {
   await cpy('**/*', MOCK_REPO_DIR, {
     cwd: MOCK_REPO_SRC,
     parents: true,
-    deep: true,
   });
 });
 

diff --git a/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts b/packages/kbn-optimizer/src/integration_tests/bundle_cache.test.ts
@@ -44,7 +44,6 @@ beforeEach(async () => {
   await cpy('**/*', MOCK_REPO_DIR, {
     cwd: MOCK_REPO_SRC,
     parents: true,
-    deep: true,
   });
 });
 

diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -213,7 +213,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'),
       },