@automattic/vip 3.9.2 → 3.9.3

package/dist/commands/dev-env-sync-sql.js

@@ -172,6 +172,8 @@ class DevEnvSyncSQLCommand {
     }
     const networkSites = this.env.wpSitesSDS?.nodes;
     if (!networkSites) return;
+    const primaryUrl = networkSites.find(site => site?.blogId === 1)?.homeUrl;
+    const primaryDomain = primaryUrl ? new URL(primaryUrl).hostname : '';
     for (const site of networkSites) {
       if (!site?.blogId || site.blogId === 1) continue;
       const url = site?.homeUrl;
@@ -179,7 +181,7 @@ class DevEnvSyncSQLCommand {
       const strippedUrl = stripProtocol(url);
       if (!this.searchReplaceMap[strippedUrl]) continue;
       const domain = new URL(url).hostname;
-      const newDomain = `${this.slugifyDomain(domain)}.${this.landoDomain}`;
+      const newDomain = primaryDomain === domain ? this.landoDomain : `${this.slugifyDomain(domain)}.${this.landoDomain}`;
       this.searchReplaceMap[stripProtocol(url)] = stripProtocol(replaceDomain(url, newDomain));
     }
   }
@@ -227,13 +229,15 @@ DELIMITER ;
 CALL vip_sync_update_blog_domains();
 DROP PROCEDURE vip_sync_update_blog_domains;
 `;
+    const primaryUrl = networkSites.find(site => site?.blogId === 1)?.homeUrl;
+    const primaryDomain = primaryUrl ? new URL(primaryUrl).hostname : '';
     const queries = [];
     for (const site of networkSites) {
       if (!site?.blogId || !site?.homeUrl) {
         continue;
       }
       const oldDomain = new URL(site.homeUrl).hostname;
-      const newDomain = site.blogId !== 1 ? `${this.slugifyDomain(oldDomain)}.${this.landoDomain}` : this.landoDomain;
+      const newDomain = primaryDomain !== oldDomain ? `${this.slugifyDomain(oldDomain)}.${this.landoDomain}` : this.landoDomain;
       queries.push(`        UPDATE wp_blogs SET domain = '${newDomain}' WHERE blog_id = ${Number(site.blogId)};`);
     }
     if (queries.length) {

package/docs/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+### 3.9.3
+
+* security: update `cross-spawn` to fix a high-severity CVE-2024-21538
+* chore: fix issues in `package.json`
+* fix(dev-env) sync: don't slugify domain if it matches the primary domain
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.9.2...3.9.3
+
 ### 3.9.2
 
 * Fix `vip app`

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.9.2",
+      "version": "3.9.3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -31,7 +31,7 @@
         "ini": "5.0.0",
         "js-yaml": "^4.1.0",
         "jwt-decode": "4.0.0",
-        "lando": "github:automattic/lando-cli.git#6ca2668",
+        "lando": "github:automattic/lando-cli#6ca2668",
         "node-fetch": "^2.6.1",
         "node-stream-zip": "1.15.0",
         "open": "^10.0.0",
@@ -5549,9 +5549,10 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -17277,9 +17278,9 @@
       }
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "requires": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -20180,7 +20181,7 @@
     },
     "lando": {
       "version": "git+ssh://git@github.com/automattic/lando-cli.git#4d8465ece983ee6242528b54de6738f00804ca0d",
-      "from": "lando@github:automattic/lando-cli.git#6ca2668",
+      "from": "lando@github:automattic/lando-cli#6ca2668",
       "requires": {
         "@lando/compose": "1.0.0",
         "axios": "^1.7.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -86,7 +86,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/Automattic/vip-cli"
+    "url": "git+https://github.com/Automattic/vip-cli.git"
   },
   "keywords": [
     "cli",
@@ -161,7 +161,7 @@
     "ini": "5.0.0",
     "js-yaml": "^4.1.0",
     "jwt-decode": "4.0.0",
-    "lando": "github:automattic/lando-cli.git#6ca2668",
+    "lando": "github:automattic/lando-cli#6ca2668",
     "node-fetch": "^2.6.1",
     "node-stream-zip": "1.15.0",
     "open": "^10.0.0",