Newplatform/timefilter/ts

.i18nrc.json

@@ -26,7 +26,8 @@
     "tsvb": "src/legacy/core_plugins/metrics",
     "kbnESQuery": "packages/kbn-es-query",
     "inspector": "src/plugins/inspector",
-    "kibana-react": "src/plugins/kibana_react"
+    "kibana-react": "src/plugins/kibana_react",
+    "esUi": "src/plugins/es_ui_shared"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []

.sass-lint.yml

@@ -7,32 +7,29 @@ files:
     - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
+  ignore:
+    - 'x-pack/legacy/plugins/canvas/external_runtime/**/*.s+(a|c)ss'
 rules:
   quotes:
     - 2
-    -
-      style: 'single'
+    - style: 'single'
   # } else { style on one line, like our JS
   brace-style:
     - 2
-    -
-      style: '1tbs'
+    - style: '1tbs'
   variable-name-format:
     - 2
-    -
-      convention: 'camelcase'
+    - convention: 'camelcase'
   # Needs regex, right now we ignore
   class-name-format: 0
   # Order how you please
   property-sort-order: 0
   hex-notation:
     - 2
-    -
-      style: 'uppercase'
+    - style: 'uppercase'
   mixin-name-format:
     - 2
-    -
-      allow-leading-underscore: false
+    - allow-leading-underscore: false
       convention: 'camelcase'
   # Use none instead of 0 for no border
   border-zero:
@@ -47,8 +44,7 @@ rules:
   indentation: 2
   function-name-format:
     - 2
-    -
-      allow-leading-underscore: false
+    - allow-leading-underscore: false
       convention: 'camelcase'
   # This removes the need for ::hover
   pseudo-element: 0
@@ -62,23 +58,20 @@ rules:
   force-attribute-nesting: 0
   no-qualifying-elements:
     - 2
-    -
-      # Allows input[type=search]
+    - # Allows input[type=search]
       allow-element-with-attribute: 1
   # Files can end without a newline
   final-newline: 0
   # We use some rare duplicate property values for browser variance
   no-duplicate-properties:
     - 2
-    -
-      exclude:
+    - exclude:
         - 'font-size'
         - 'word-break'
   # Put a line-break between sections of CSS, but allow quicky one-liners for legibility
   empty-line-between-blocks:
     - 2
-    -
-      allow-single-line-rulesets: 1
+    - allow-single-line-rulesets: 1
   # Warns are nice for deprecations and development
   no-warn: 0
   # Transition all is useful in certain situations and there's no recent info to suggest slowdown

package.json

@@ -102,9 +102,9 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.5.5",
-    "@elastic/charts": "^10.2.0",
+    "@elastic/charts": "^11.1.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.3.0",
+    "@elastic/eui": "13.6.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -124,7 +124,7 @@
     "@types/react-grid-layout": "^0.16.7",
     "@types/recompose": "^0.30.5",
     "JSONStream": "1.3.5",
-    "abortcontroller-polyfill": "^1.1.9",
+    "abortcontroller-polyfill": "^1.3.0",
     "angular": "1.6.9",
     "angular-aria": "1.6.6",
     "angular-elastic": "2.5.1",
@@ -138,7 +138,7 @@
     "boom": "^7.2.0",
     "brace": "0.11.1",
     "cache-loader": "^4.1.0",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "check-disk-space": "^2.1.0",
     "color": "1.0.3",
     "commander": "3.0.0",
@@ -266,7 +266,7 @@
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.1",
     "@elastic/github-checks-reporter": "0.0.20b3",
-    "@elastic/makelogs": "^4.4.0",
+    "@elastic/makelogs": "^4.5.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/eslint-import-resolver-kibana": "2.0.0",
@@ -345,10 +345,10 @@
     "@typescript-eslint/parser": "1.13.0",
     "angular-mocks": "1.4.7",
     "archiver": "^3.0.0",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "babel-plugin-dynamic-import-node": "^2.3.0",
-    "backport": "4.6.4",
+    "backport": "4.6.5",
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
@@ -381,6 +381,7 @@
     "geckodriver": "1.16.2",
     "getopts": "^2.2.4",
     "grunt": "1.0.4",
+    "grunt-available-tasks": "^0.6.3",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-karma": "2.0.0",
@@ -417,6 +418,7 @@
     "nock": "10.0.6",
     "node-sass": "^4.9.4",
     "normalize-path": "^3.0.0",
+    "null-loader": "^3.0.0",
     "nyc": "^14.1.1",
     "pixelmatch": "4.0.2",
     "pkg-up": "^2.0.0",

packages/eslint-config-kibana/package.json

@@ -17,7 +17,7 @@
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "1.13.0",
     "@typescript-eslint/parser": "1.13.0",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "eslint": "5.16.0",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-ban": "1.2.0",

packages/kbn-babel-preset/webpack_preset.js

@@ -25,13 +25,11 @@ module.exports = () => {
         {
           useBuiltIns: 'entry',
           modules: 'cjs',
-          corejs: 2,
+          corejs: 3,
         },
       ],
       require('./common_preset'),
     ],
-    plugins: [
-      '@babel/plugin-syntax-dynamic-import'
-    ]
+    plugins: [require.resolve('@babel/plugin-syntax-dynamic-import')],
   };
 };

packages/kbn-dev-utils/package.json

@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "dedent": "^0.7.0",
     "execa": "^1.0.0",
     "exit-hook": "^2.2.0",

packages/kbn-es/package.json

@@ -8,7 +8,7 @@
     "@elastic/elasticsearch": "^7.3.0",
     "@kbn/dev-utils": "1.0.0",
     "abort-controller": "^2.0.3",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "dedent": "^0.7.0",
     "del": "^4.0.0",
     "execa": "^1.0.0",

packages/kbn-eslint-plugin-eslint/package.json

@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "peerDependencies": {
     "eslint": "5.16.0",
-    "babel-eslint": "^10.0.2"
+    "babel-eslint": "^10.0.3"
   },
   "dependencies": {
     "micromatch": "3.1.10",

packages/kbn-i18n/src/react/provider.test.tsx

@@ -19,7 +19,6 @@
 
 import { mount, shallow } from 'enzyme';
 import * as React from 'react';
-import { intlShape } from 'react-intl';
 import { injectI18n } from './inject';
 import { I18nProvider } from './provider';
 
@@ -46,7 +45,7 @@ describe('I18nProvider', () => {
       </I18nProvider>,
       {
         childContextTypes: {
-          intl: intlShape,
+          intl: { formatMessage: jest.fn() },
         },
       }
     );

packages/kbn-i18n/src/react/provider.tsx

@@ -22,47 +22,7 @@ import * as React from 'react';
 import { IntlProvider } from 'react-intl';
 
 import * as i18n from '../core';
-import { isPseudoLocale, translateUsingPseudoLocale } from '../core/pseudo_locale';
-import { injectI18n } from './inject';
-
-/**
- * To translate label that includes nested `FormattedMessage` instances React Intl
- * replaces them with special placeholders (@__uid__@ELEMENT-uid-counter@__uid__@)
- * and maps them back with nested translations after `formatMessage` processes
- * original string, so we shouldn't modify these special placeholders with pseudo
- * translations otherwise React Intl won't be able to properly replace placeholders.
- * It's implementation detail of the React Intl, but since pseudo localization is dev
- * only feature we should be fine here.
- * @param message
- */
-function translateFormattedMessageUsingPseudoLocale(message: string) {
-  const formattedMessageDelimiter = message.match(/@__.{10}__@/);
-  if (formattedMessageDelimiter !== null) {
-    return message
-      .split(formattedMessageDelimiter[0])
-      .map(part => (part.startsWith('ELEMENT-') ? part : translateUsingPseudoLocale(part)))
-      .join(formattedMessageDelimiter[0]);
-  }
-
-  return translateUsingPseudoLocale(message);
-}
-
-/**
- * If pseudo locale is detected, default intl.formatMessage should be decorated
- * with the pseudo localization function.
- * @param child I18nProvider child component.
- */
-function wrapIntlFormatMessage(child: React.ReactElement) {
-  return React.createElement(
-    injectI18n(({ intl }) => {
-      const formatMessage = intl.formatMessage;
-      intl.formatMessage = (...args) =>
-        translateFormattedMessageUsingPseudoLocale(formatMessage(...args));
-
-      return React.Children.only(child);
-    })
-  );
-}
+import { PseudoLocaleWrapper } from './pseudo_locale_wrapper';
 
 /**
  * The library uses the provider pattern to scope an i18n context to a tree
@@ -81,9 +41,7 @@ export class I18nProvider extends React.PureComponent {
         formats={i18n.getFormats()}
         textComponent={React.Fragment}
       >
-        {isPseudoLocale(i18n.getLocale()) && React.isValidElement(this.props.children)
-          ? wrapIntlFormatMessage(this.props.children)
-          : this.props.children}
+        <PseudoLocaleWrapper>{this.props.children}</PseudoLocaleWrapper>
       </IntlProvider>
     );
   }

packages/kbn-i18n/src/react/pseudo_locale_wrapper.tsx

@@ -0,0 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as PropTypes from 'prop-types';
+import * as React from 'react';
+import * as i18n from '../core';
+import { isPseudoLocale, translateUsingPseudoLocale } from '../core/pseudo_locale';
+
+/**
+ * To translate label that includes nested `FormattedMessage` instances React Intl
+ * replaces them with special placeholders (@__uid__@ELEMENT-uid-counter@__uid__@)
+ * and maps them back with nested translations after `formatMessage` processes
+ * original string, so we shouldn't modify these special placeholders with pseudo
+ * translations otherwise React Intl won't be able to properly replace placeholders.
+ * It's implementation detail of the React Intl, but since pseudo localization is dev
+ * only feature we should be fine here.
+ * @param message
+ */
+function translateFormattedMessageUsingPseudoLocale(message: string) {
+  const formattedMessageDelimiter = message.match(/@__.{10}__@/);
+  if (formattedMessageDelimiter !== null) {
+    return message
+      .split(formattedMessageDelimiter[0])
+      .map(part => (part.startsWith('ELEMENT-') ? part : translateUsingPseudoLocale(part)))
+      .join(formattedMessageDelimiter[0]);
+  }
+
+  return translateUsingPseudoLocale(message);
+}
+
+/**
+ * If the locale is our pseudo locale (e.g. en-xa), we override the
+ * intl.formatMessage function to display scrambled characters. We are
+ * overriding the context rather than using injectI18n, because the
+ * latter creates a new React component, which causes React diffs to
+ * be inefficient in some cases, and can cause React hooks to lose
+ * their state.
+ */
+export class PseudoLocaleWrapper extends React.PureComponent {
+  public static propTypes = { children: PropTypes.element.isRequired };
+
+  public static contextTypes = {
+    intl: PropTypes.object.isRequired,
+  };
+
+  constructor(props: { children: React.ReactNode }, context: any) {
+    super(props, context);
+
+    if (isPseudoLocale(i18n.getLocale())) {
+      const formatMessage = context.intl.formatMessage;
+      context.intl.formatMessage = (...args: any[]) =>
+        translateFormattedMessageUsingPseudoLocale(formatMessage(...args));
+    }
+  }
+
+  public render() {
+    return this.props.children;
+  }
+}

packages/kbn-plugin-generator/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "version": "1.0.0",
   "dependencies": {
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "dedent": "^0.7.0",
     "execa": "^1.0.0",
     "getopts": "^2.2.4",