This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/odyssey-stats/src/page-middleware/layout.tsx b/apps/odyssey-stats/src/page-middleware/layout.tsx | |
index 515d261a0e..3061f45cf3 100644 | |
--- a/apps/odyssey-stats/src/page-middleware/layout.tsx | |
+++ b/apps/odyssey-stats/src/page-middleware/layout.tsx | |
@@ -30,7 +30,9 @@ export const ProviderWrappedLayout: FunctionComponent< ProviderWrappedLayoutProp | |
} ) => { | |
return ( | |
<CalypsoI18nProvider> | |
- { /* Editor might show errors here, but it's fine as `RouteProvider` is in JavaScript. */ } | |
+ { /* TS incorrectly infers RouteProvider types; ignore errors here. */ } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client/my-sites/stats/subscribers-section/index.jsx b/client/my-sites/stats/subscribers-section/index.jsx | |
index 1c43d100b2..01a5962a05 100644 | |
--- a/client/my-sites/stats/subscribers-section/index.jsx | |
+++ b/client/my-sites/stats/subscribers-section/index.jsx | |
@@ -63,6 +63,25 @@ function transformData( data ) { | |
return [ processedData.reverse() ]; | |
} | |
+function useSubscriberCounts() { | |
+ const [ counts, setCounts ] = useState( [] ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/packages/components/src/mobile-promo-card/index.tsx b/packages/components/src/mobile-promo-card/index.tsx | |
index f255345793..fab8506012 100644 | |
--- a/packages/components/src/mobile-promo-card/index.tsx | |
+++ b/packages/components/src/mobile-promo-card/index.tsx | |
@@ -29,14 +29,13 @@ const REDIRECT_SLUGS = { | |
// Generate a Jetpack Redirect URL based on the provided slug. | |
// Similar to getRedirectUrl from '@automattic/jetpack-components'. | |
-function getRedirectUrlFromSlug( slug: string ) { | |
+function getRedirectUrl( key: string ): string | null { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/packages/search/src/customberg/components/sidebar/styles.scss b/projects/packages/search/src/customberg/components/sidebar/styles.scss | |
index a059e095a6..cac8e72536 100644 | |
--- a/projects/packages/search/src/customberg/components/sidebar/styles.scss | |
+++ b/projects/packages/search/src/customberg/components/sidebar/styles.scss | |
@@ -100,7 +100,7 @@ | |
&.components-checkbox-control, | |
&.components-toggle-control { | |
- margin-bottom: 0; | |
+ margin-bottom: $grid-unit-10; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/packages/search/src/dashboard/components/record-meter/index.jsx b/projects/packages/search/src/dashboard/components/record-meter/index.jsx | |
index f8c0e2a13b..cae56063b8 100644 | |
--- a/projects/packages/search/src/dashboard/components/record-meter/index.jsx | |
+++ b/projects/packages/search/src/dashboard/components/record-meter/index.jsx | |
@@ -23,12 +23,7 @@ export default function RecordMeter( { | |
tierMaximumRecords, | |
lastIndexedDate, | |
} ) { | |
- const recordInfo = getRecordInfo( | |
- postCount, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/packages/search/src/customberg/class-customberg.php b/projects/packages/search/src/customberg/class-customberg.php | |
index c745acda4..aadecfa1e 100644 | |
--- a/projects/packages/search/src/customberg/class-customberg.php | |
+++ b/projects/packages/search/src/customberg/class-customberg.php | |
@@ -127,18 +127,6 @@ class Customberg { | |
* @param string $plugin_base_path - Base path for plugin files. | |
*/ | |
public function load_assets_with_parameters( $path_prefix, $plugin_base_path ) { | |
- // | |
- // Load styles. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/plugins/jetpack/modules/search/instant-search/lib/api.js b/projects/plugins/jetpack/modules/search/instant-search/lib/api.js | |
index 178d59acc..afa0f21b0 100644 | |
--- a/projects/plugins/jetpack/modules/search/instant-search/lib/api.js | |
+++ b/projects/plugins/jetpack/modules/search/instant-search/lib/api.js | |
@@ -388,6 +388,10 @@ export function search( options ) { | |
} | |
return response; | |
} ) | |
+ .then( r => { | |
+ const delay = ms => new Promise( resolve => setTimeout( resolve, ms ) ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php b/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php | |
index 27917c031..afa583fa4 100644 | |
--- a/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php | |
+++ b/projects/plugins/jetpack/modules/search/class-jetpack-instant-search.php | |
@@ -65,12 +65,10 @@ class Jetpack_Instant_Search extends Jetpack_Search { | |
public function load_assets_with_parameters( $path_prefix, $plugin_base_path ) { | |
$polyfill_relative_path = $path_prefix . '_inc/build/instant-search/jp-search-ie11-polyfill-loader.bundle.js'; | |
$script_relative_path = $path_prefix . '_inc/build/instant-search/jp-search-main.bundle.js'; | |
- $style_relative_path = $path_prefix . '_inc/build/instant-search/jp-search-main.bundle.css'; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/projects/plugins/jetpack/modules/search/instant-search/components/search-app.jsx b/projects/plugins/jetpack/modules/search/instant-search/components/search-app.jsx | |
index 1b08ce5fa..470bafed0 100644 | |
--- a/projects/plugins/jetpack/modules/search/instant-search/components/search-app.jsx | |
+++ b/projects/plugins/jetpack/modules/search/instant-search/components/search-app.jsx | |
@@ -69,12 +69,12 @@ class SearchApp extends Component { | |
} | |
componentDidUpdate( prevProps ) { | |
- if ( prevProps.searchQuery !== this.props.searchQuery ) { | |
- this.onChangeSearchQuery(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/client/blocks/product-plan-overlap-notices/index.jsx b/client/blocks/product-plan-overlap-notices/index.jsx | |
index 3aa71bc71c..53b6f813e3 100644 | |
--- a/client/blocks/product-plan-overlap-notices/index.jsx | |
+++ b/client/blocks/product-plan-overlap-notices/index.jsx | |
@@ -4,7 +4,7 @@ | |
import React, { Component, Fragment } from 'react'; | |
import PropTypes from 'prop-types'; | |
import { connect } from 'react-redux'; | |
-import { includes, some } from 'lodash'; | |
+import { includes } from 'lodash'; |
NewerOlder