Skip to content

Commit

Permalink
Merge pull request #4039 from 10up/chore/packages-update
Browse files Browse the repository at this point in the history
Chore/packages update
  • Loading branch information
felipeelia authored Dec 11, 2024
2 parents 40e4b0e + e82c130 commit 2385b63
Show file tree
Hide file tree
Showing 157 changed files with 15,932 additions and 17,984 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: composer install
run: composer install

- name: install node v18
- name: install node v20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Build
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ jobs:
wp package install felipeelia/cli-command-docs:dev-trunk
wp cli-command-docs elasticpress --custom-order=sync,activate-feature,deactivate-feature,list-features,get-algorithm-version,set-algorithm-version --remove=delete_transient_on_int,custom_get_transient,stop_on_failed_mapping,call_ep_cli_put_mapping,should_interrupt_sync,index_output,get-indexes,get-cluster-indexes,index,clear-index,get-indexing-status,get-last-cli-index,stop-indexing --custom-intro='The following WP-CLI commands are supported by ElasticPress:' > wp-content/plugins/elasticpress/docs/wp-cli.md
- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: npm ci, and build docs
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-with-vendor-prefixed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- name: composer install
run: composer install

- name: install node v18
- name: install node v20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: E2E Test
env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
NODE_VERSION: "18"
NODE_VERSION: "20"
NODE_CACHE: "${{ github.workspace }}/node_modules_cache"

on:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linting
env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
NODE_VERSION: "18"
NODE_VERSION: "20"
NODE_CACHE: "${{ github.workspace }}/node_modules_cache"

on:
Expand Down Expand Up @@ -82,4 +82,4 @@ jobs:
run: composer install

- name: PHPCS check
run: './vendor/bin/phpcs . -q --report=checkstyle --runtime-set testVersion 7.4- | cs2pr'
run: './vendor/bin/phpcs . -q --report=checkstyle --warning-severity=6 --runtime-set testVersion 7.4- | cs2pr'
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
}
],
"font-family-no-missing-generic-family-keyword": null,
"declaration-property-unit-allowed-list": null
"declaration-property-unit-allowed-list": null,
"at-rule-disallowed-list": null
}

}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Simply downloading the repository files is not enough to have the plugin working

`npm install && npm run build`

[Node.js](https://nodejs.org/en/) (v18) and [npm](https://www.npmjs.com/) (v8) are required.
[Node.js](https://nodejs.org/en/) (v20) and [npm](https://www.npmjs.com/) (v9) are required.

## React Components

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ export default ({ attributes }) => {
? __(
'Preview unavailable. The selected taxonomy has no terms assigned to searchable content.',
'elasticpress',
)
)
: __(
'Preview unavailable. There is no searchable content available with the selected metadata.',
'elasticpress',
)}
)}
</Warning>
);
};
6 changes: 3 additions & 3 deletions assets/js/features/components/control.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default ({
value: o.value,
label: <span dangerouslySetInnerHTML={{ __html: safeHTML(o.label) }} />, // eslint-disable-line react/no-danger
};
})
})
: [];

/**
Expand All @@ -85,9 +85,9 @@ export default ({
const requiredFeatureNotice =
name === 'active'
? /* translators: Feature name */
__('The %s feature must be enabled to use this feature.', 'elasticpress')
__('The %s feature must be enabled to use this feature.', 'elasticpress')
: /* translators: Feature name */
__('The %s feature must be enabled to use the following setting.', 'elasticpress');
__('The %s feature must be enabled to use the following setting.', 'elasticpress');

/**
* The notice to display if a sync is required.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export default ({ disabled, label, locale, options, onChange, selected, sortBy }
'elasticpress',
),
options.length - optionsLimit,
)}
)}
</SmallButton>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default ({ defaultIsOpen, label, postTypes, name }) => {
__('%1$s (%2$s)', 'elasticpress'),
label,
typeLabels.join(typeSeparator),
)
)
: label;
}, [label, postTypes, name]);

Expand Down
4 changes: 2 additions & 2 deletions assets/js/ordering/pointers.js
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ export class Pointers extends Component {
const searchResults = searchResultsFromState[searchText]
? searchResultsFromState[searchText].filter(
(item) => renderedIds.indexOf(item.ID) === -1,
)
)
: false;

return (
Expand Down Expand Up @@ -370,7 +370,7 @@ export class Pointers extends Component {
: __(
'Remove custom result from results list',
'elasticpress',
);
);

return (
<Fragment key={item.ID}>
Expand Down
4 changes: 2 additions & 2 deletions assets/js/sync-ui/apps/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default () => {
? __(
'If you are missing data in your search results or have recently added custom content types to your site, you should run a sync to reflect these changes.',
'elasticpress',
)
)
: sprintf(
/* translators: %s: Index type. ElasticPress.io or Elasticsearch. */
__(
Expand All @@ -121,7 +121,7 @@ export default () => {
isEpio
? __('on ElasticPress.io', 'elasticpress')
: __('in Elasticsearch', 'elasticpress'),
)}
)}
</p>
<Panel className="ep-sync-panel">
<PanelBody className="ep-sync-panel__controls">
Expand Down
4 changes: 2 additions & 2 deletions assets/js/sync-ui/components/previous-sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default ({ failures, method, stateDatetime, status, trigger }) => {
'elasticpress',
),
failures,
)
)
: __('Completed with errors.', 'elasticpress');
case 'aborted':
return __('Stopped.', 'elasticpress');
Expand Down Expand Up @@ -119,7 +119,7 @@ export default ({ failures, method, stateDatetime, status, trigger }) => {
),
when,
why,
)
)
: when}
</div>
<div className="ep-previous-sync__help">{how}</div>
Expand Down
5 changes: 3 additions & 2 deletions assets/js/sync-ui/components/progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,20 @@ export default () => {
})}
>
<Icon icon={sync} />
<div className="ep-sync-progress__details">
<div id="ep-sync-progress-details" className="ep-sync-progress__details">
<strong>{label}</strong>
{syncStartDateTime
? createInterpolateElement(
sprintf(why, dateI18n('g:ia l F jS, Y', syncStartDateTime)),
{
time: <time dateTime={dateI18n('c', syncStartDateTime)} />,
},
)
)
: null}
</div>
<div className="ep-sync-progress__progress-bar">
<div
aria-labelledby="ep-sync-progress-details"
aria-valuemax={100}
aria-valuemin={0}
aria-valuenow={now}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/sync/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export const SyncProvider = ({
isEpio
? __('ElasticPress.io', 'elasticpress')
: __('Elasticsearch', 'elasticpress'),
)
)
: __('Sync interrupted by WP-CLI command.', 'elasticpress');

logMessage(message, 'info');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default ({ children, id, isBusy, onSelect, ...props }) => {
'elasticpress',
),
children.length,
)
)
: '';
}, [children, isBusy]);

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"psr/container": "1.0.0"
},
"require-dev": {
"10up/phpcs-composer": "dev-master",
"10up/phpcs-composer": "dev-trunk",
"wpackagist-plugin/woocommerce":"*",
"phpcompatibility/phpcompatibility-wp": "*",
"yoast/phpunit-polyfills": "^1.0",
Expand Down
Loading

0 comments on commit 2385b63

Please sign in to comment.