Merge branch 'master' into expressions/dimension

elastic · Jul 29, 2021 · 7e51437 · 7e51437
2 parents 4d11ef0 + b140cb5
commit 7e51437
Show file tree

Hide file tree

Showing 506 changed files with 78,656 additions and 55,750 deletions.
diff --git a/.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh b/.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
@@ -10,4 +10,4 @@ export BUILD_TS_REFS_DISABLE=false
 .buildkite/scripts/bootstrap.sh
 
 echo "--- Build API Docs"
-node scripts/build_api_docs
+node --max-old-space-size=12000 scripts/build_api_docs
diff --git a/.ci/Jenkinsfile_baseline_capture b/.ci/Jenkinsfile_baseline_capture
@@ -35,7 +35,6 @@ kibanaPipeline(timeoutMinutes: 210) {
               kibanaPipeline.withCiTaskQueue([parallel: 2]) {
                 catchErrors {
                   tasks([
-                    kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
                     kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
                     kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/baseline_plugin_public_api_docs.sh'),
                   ])

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -895,7 +895,8 @@ module.exports = {
     {
       files: ['x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}'],
       rules: {
-        'no-duplicate-imports': 'error',
+        'no-duplicate-imports': 'off',
+        '@typescript-eslint/no-duplicate-imports': ['error'],
       },
     },
 
@@ -912,6 +913,8 @@ module.exports = {
       ],
       rules: {
         'import/no-nodejs-modules': 'error',
+        'no-duplicate-imports': 'off',
+        '@typescript-eslint/no-duplicate-imports': ['error'],
         'no-restricted-imports': [
           'error',
           {
@@ -954,7 +957,7 @@ module.exports = {
         'no-continue': 'error',
         'no-dupe-keys': 'error',
         'no-duplicate-case': 'error',
-        'no-duplicate-imports': 'error',
+        'no-duplicate-imports': 'off',
         'no-empty-character-class': 'error',
         'no-empty-pattern': 'error',
         'no-ex-assign': 'error',
@@ -1025,6 +1028,7 @@ module.exports = {
         'require-atomic-updates': 'error',
         'symbol-description': 'error',
         'vars-on-top': 'error',
+        '@typescript-eslint/no-duplicate-imports': ['error'],
       },
     },