Merge pull request #3706 from 10up/chore/update-some-node-packages

Update some node packages
10up · Oct 19, 2023 · c207db6 · c207db6
2 parents 6b24db4 + ff49856
commit c207db6
Show file tree

Hide file tree

Showing 17 changed files with 11,471 additions and 7,290 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -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",

diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css
@@ -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 {
@@ -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);
 	}
 }
 
@@ -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. */
 	}
 }
@@ -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 {

diff --git a/bin/wp-env-cli b/bin/wp-env-cli
@@ -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 = [
@@ -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(' ');