Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update some node packages #3706

Merged
merged 14 commits into from
Oct 19, 2023
Merged

Update some node packages #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fcae279
Update some node packages
felipeelia Oct 17, 2023
b48efac
Adjust lint package
felipeelia Oct 17, 2023
704669a
Adjust wp-env calls
felipeelia Oct 17, 2023
a1e5280
Update Cypress and fix lint
felipeelia Oct 17, 2023
1c5a831
Fix style lint errors
felipeelia Oct 17, 2023
7ec3774
Fix permalinks
felipeelia Oct 17, 2023
e57b420
Fix autosuggest e2e test
felipeelia Oct 17, 2023
9f1591f
Optimize wp-cli calls
felipeelia Oct 17, 2023
8270708
Merge branch '5.0.0' into chore/update-some-node-packages
felipeelia Oct 19, 2023
98e8cee
Fix lint
felipeelia Oct 19, 2023
65db8ca
Fix documents tests
felipeelia Oct 19, 2023
c5a1488
Fix Custom Results
felipeelia Oct 19, 2023
f220b8c
DB Soft reset
felipeelia Oct 19, 2023
ff49856
Fix Instant Results tests
felipeelia Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .wp-env.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"10up/elasticpress-proxy#develop"
],
"mappings": {
".htaccess": "./tests/cypress/wordpress-files/.htaccess",
"wp-content/mu-plugins/skip-wp-lookup.php": "./tests/cypress/wordpress-files/test-mu-plugins/skip-wp-lookup.php",
"wp-content/mu-plugins/unique-index-name.php": "./tests/cypress/wordpress-files/test-mu-plugins/unique-index-name.php",
"wp-content/mu-plugins/disable-welcome-guide.php": "./tests/cypress/wordpress-files/test-mu-plugins/disable-welcome-guide.php",
Expand Down
40 changes: 20 additions & 20 deletions assets/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import "@10up/component-tooltip";

:root {
--statusOk: #6aa000;
--statusWarning: #e3e600;
--statusError: #f00;
--ep-dashboard-status-ok: #6aa000;
--ep-dashboard-status-warning: #e3e600;
--ep-dashboard-status-error: #f00;
}

html.wp-toolbar {
Expand Down Expand Up @@ -206,43 +206,43 @@ h2.ep-list-features {

& .postbox .hndle .settings-button::after {
background-color: transparent;
border: 1px solid var(--statusError);
border: 1px solid var(--ep-dashboard-status-error);
}

& .settings .requirements-status-notice {
border-color: var(--statusError);
border-color: var(--ep-dashboard-status-error);
}
}

.feature-requirements-status-1.ep-feature {

& .postbox .hndle .settings-button::after {
background-color: transparent;
border: 1px solid var(--statusWarning);
border: 1px solid var(--ep-dashboard-status-warning);
}

&.feature-active .postbox .hndle .settings-button::after {
background-color: var(--statusWarning);
background-color: var(--ep-dashboard-status-warning);
}

& .settings .requirements-status-notice {
border-color: var(--statusWarning);
border-color: var(--ep-dashboard-status-warning);
}
}

.feature-requirements-status-0.ep-feature {

& .postbox .hndle .settings-button::after {
background-color: transparent;
border: 1px solid var(--statusOk);
border: 1px solid var(--ep-dashboard-status-ok);
}

&.feature-active .postbox .hndle .settings-button::after {
background-color: var(--statusOk);
background-color: var(--ep-dashboard-status-ok);
}

& .settings .requirements-status-notice {
border-color: var(--statusOk);
border-color: var(--ep-dashboard-status-ok);
}
}

Expand Down Expand Up @@ -306,17 +306,17 @@ h2.ep-list-features {

.ep-feature .settings .requirements-status-notice {
background-color: #efefef;
border-left: 4px solid var(--statusOk);
border-left: 4px solid var(--ep-dashboard-status-ok);
margin-bottom: 10px;
padding: 8px 12px;

&.requirements-status-notice--reindex {
border-color: var(--statusWarning);
border-color: var(--ep-dashboard-status-warning);
display: none; /* Controlled by JavaScript. */
}

&.requirements-status-notice--syncing {
border-color: var(--statusError);
border-color: var(--ep-dashboard-status-error);
display: none; /* Controlled by JavaScript. */
}
}
Expand Down Expand Up @@ -1082,27 +1082,27 @@ h2 .nav-tab.ep-credentials-tab {
}

.green-status {
color: var(--statusOk);
color: var(--ep-dashboard-status-ok);
}

.yellow-status {
color: var(--statusWarning);
color: var(--ep-dashboard-status-warning);
}

.red-status {
color: var(--statusError);
color: var(--ep-dashboard-status-error);
}

.green-status::after {
background-color: var(--statusOk);
background-color: var(--ep-dashboard-status-ok);
}

.yellow-status::after {
background-color: var(--statusWarning);
background-color: var(--ep-dashboard-status-warning);
}

.red-status::after {
background-color: var(--statusError);
background-color: var(--ep-dashboard-status-error);
}

.doc-chart {
Expand Down
6 changes: 3 additions & 3 deletions bin/wp-env-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const path = require('path');
const { spawn } = require('child_process');
const { readConfig } = require('@wordpress/env/lib/config');
const { loadConfig } = require('@wordpress/env/lib/config');

function spawnCommandDirectly({ container, command, dockerComposeConfigPath }) {
const composeCommand = [
Expand Down Expand Up @@ -32,8 +32,8 @@ function spawnCommandDirectly({ container, command, dockerComposeConfigPath }) {
}

const run = async () => {
const configPath = path.resolve('.wp-env.json');
const { dockerComposeConfigPath } = await readConfig(configPath);
const configPath = path.resolve();
const { dockerComposeConfigPath } = await loadConfig(configPath);

const container = process.argv[2];
const command = process.argv.splice(3).join(' ');
Expand Down
Loading