zapier-platform-cli 16.0.0 → 16.1.0

package/oclif.manifest.json

@@ -1526,88 +1526,6 @@
         "clear.js"
       ]
     },
-    "delete:integration": {
-      "aliases": [
-        "delete:app"
-      ],
-      "args": {},
-      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:integration",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "integration.js"
-      ]
-    },
-    "delete:version": {
-      "aliases": [],
-      "args": {
-        "version": {
-          "description": "Specify the version to delete. It must have no users or Zaps.",
-          "name": "version",
-          "required": true
-        }
-      },
-      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:version",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "version.js"
-      ]
-    },
     "canary:create": {
       "aliases": [],
       "args": {
@@ -1771,37 +1689,55 @@
         "list.js"
       ]
     },
-    "team:add": {
+    "delete:integration": {
       "aliases": [
-        "team:invite"
+        "delete:app"
       ],
-      "args": {
-        "email": {
-          "description": "The user to be invited. If they don't have a Zapier account, they'll be prompted to create one.",
-          "name": "email",
-          "required": true
+      "args": {},
+      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "role": {
-          "description": "The level the invited team member should be at. Admins can edit everything and get email updates. Collaborators have read-access to the app and get email updates. Subscribers only get email updates.",
-          "name": "role",
-          "options": [
-            "admin",
-            "collaborator",
-            "subscriber"
-          ],
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete:integration",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "delete",
+        "integration.js"
+      ]
+    },
+    "delete:version": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "Specify the version to delete. It must have no users or Zaps.",
+          "name": "version",
           "required": true
-        },
-        "message": {
-          "description": "A message sent in the email to your team member, if you need to provide context. Wrap the message in quotes to ensure spaces get saved.",
-          "name": "message"
         }
       },
-      "description": "Add a team member to your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nTeam members can be freely added and removed.",
-      "examples": [
-        "zapier team:add bruce@wayne.com admin",
-        "zapier team:add robin@wayne.com collaborator \"Hey Robin, check out this app.\"",
-        "zapier team:add alfred@wayne.com subscriber \"Hey Alfred, check out this app.\""
-      ],
+      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
       "flags": {
         "debug": {
           "char": "d",
@@ -1819,7 +1755,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:add",
+      "id": "delete:version",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -1831,16 +1767,23 @@
         "src",
         "oclif",
         "commands",
-        "team",
-        "add.js"
+        "delete",
+        "version.js"
       ]
     },
-    "team:get": {
-      "aliases": [
-        "team:list"
+    "env:get": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "The version to get the environment for.",
+          "name": "version",
+          "required": true
+        }
+      },
+      "description": "Get environment variables for a version.",
+      "examples": [
+        "zapier env:get 1.2.3"
       ],
-      "args": {},
-      "description": "Get team members involved with your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nUse the `zapier team:add` and `zapier team:remove` commands to modify your team.\n",
       "flags": {
         "debug": {
           "char": "d",
@@ -1874,7 +1817,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:get",
+      "id": "env:get",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -1886,16 +1829,27 @@
         "src",
         "oclif",
         "commands",
-        "team",
+        "env",
         "get.js"
       ]
     },
-    "team:remove": {
-      "aliases": [
-        "team:delete"
+    "env:set": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "The version to set the environment for. Values are copied forward when a new version is created, but this command will only ever affect the specified version.",
+          "name": "version",
+          "required": true
+        },
+        "key-value pairs...": {
+          "description": "The key-value pairs to set. Keys are case-insensitive. Each pair should be space separated and pairs should be separated by an `=`. For example: `A=123 B=456`",
+          "name": "key-value pairs..."
+        }
+      },
+      "description": "Set environment variables for a version.",
+      "examples": [
+        "zapier env:set 1.2.3 SECRET=12345 OTHER=4321"
       ],
-      "args": {},
-      "description": "Remove a team member from all versions of your integration.\n\nAdmins will immediately lose write access to the integration.\nCollaborators will immediately lose read access to the integration.\nSubscribers won't receive future email updates.",
       "flags": {
         "debug": {
           "char": "d",
@@ -1913,11 +1867,11 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:remove",
+      "id": "env:set",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
-      "strict": true,
+      "strict": false,
       "enableJsonFlag": false,
       "skipValidInstallCheck": true,
       "isESM": false,
@@ -1925,13 +1879,63 @@
         "src",
         "oclif",
         "commands",
-        "team",
-        "remove.js"
+        "env",
+        "set.js"
       ]
     },
-    "users:add": {
+    "env:unset": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "The version to set the environment for.",
+          "name": "version",
+          "required": true
+        },
+        "keys...": {
+          "description": "The keys to unset. Keys are case-insensitive.",
+          "name": "keys..."
+        }
+      },
+      "description": "Unset environment variables for a version.",
+      "examples": [
+        "zapier env:unset 1.2.3 SECRET OTHER"
+      ],
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "env:unset",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": false,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "env",
+        "unset.js"
+      ]
+    },
+    "team:add": {
       "aliases": [
-        "users:invite"
+        "team:invite"
       ],
       "args": {
         "email": {
@@ -1939,24 +1943,28 @@
           "name": "email",
           "required": true
         },
-        "version": {
-          "description": "A version string (like 1.2.3). Optional, used only if you want to invite a user to a specific version instead of all versions.",
-          "name": "version"
+        "role": {
+          "description": "The level the invited team member should be at. Admins can edit everything and get email updates. Collaborators have read-access to the app and get email updates. Subscribers only get email updates.",
+          "name": "role",
+          "options": [
+            "admin",
+            "collaborator",
+            "subscriber"
+          ],
+          "required": true
+        },
+        "message": {
+          "description": "A message sent in the email to your team member, if you need to provide context. Wrap the message in quotes to ensure spaces get saved.",
+          "name": "message"
         }
       },
-      "description": "Add a user to some or all versions of your integration.\n\nWhen this command is run, we'll send an email to the user inviting them to try your integration. You can track the status of that invite using the `zapier users:get` command.\n\nInvited users will be able to see your integration's name, logo, and description. They'll also be able to create Zaps using any available triggers and actions.",
+      "description": "Add a team member to your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nTeam members can be freely added and removed.",
       "examples": [
-        "zapier users:add bruce@wayne.com",
-        "zapier users:add alfred@wayne.com 1.2.3"
+        "zapier team:add bruce@wayne.com admin",
+        "zapier team:add robin@wayne.com collaborator \"Hey Robin, check out this app.\"",
+        "zapier team:add alfred@wayne.com subscriber \"Hey Alfred, check out this app.\""
       ],
       "flags": {
-        "force": {
-          "char": "f",
-          "description": "Skip confirmation. Useful for running programatically.",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -1973,7 +1981,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:add",
+      "id": "team:add",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -1985,16 +1993,16 @@
         "src",
         "oclif",
         "commands",
-        "users",
+        "team",
         "add.js"
       ]
     },
-    "users:get": {
+    "team:get": {
       "aliases": [
-        "users:list"
+        "team:list"
       ],
       "args": {},
-      "description": "Get a list of users who have been invited to your integration.\n\nNote that this list of users is NOT a comprehensive list of everyone who is using your integration. It only includes users who were invited directly by email (using the `\u001b[36mzapier users:add\u001b[39m` command or the web UI). Users who joined by clicking links generated using the `\u001b[36mzapier user:links\u001b[39m` command won't show up here.",
+      "description": "Get team members involved with your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nUse the `zapier team:add` and `zapier team:remove` commands to modify your team.\n",
       "flags": {
         "debug": {
           "char": "d",
@@ -2028,7 +2036,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:get",
+      "id": "team:get",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2040,14 +2048,16 @@
         "src",
         "oclif",
         "commands",
-        "users",
+        "team",
         "get.js"
       ]
     },
-    "users:links": {
-      "aliases": [],
+    "team:remove": {
+      "aliases": [
+        "team:delete"
+      ],
       "args": {},
-      "description": "Get a list of links that are used to invite users to your integration.",
+      "description": "Remove a team member from all versions of your integration.\n\nAdmins will immediately lose write access to the integration.\nCollaborators will immediately lose read access to the integration.\nSubscribers won't receive future email updates.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2056,22 +2066,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "format": {
-          "char": "f",
-          "description": "Change the way structured data is presented. If \"json\" or \"raw\", you can pipe the output of the command into other tools, such as jq.",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "plain",
-            "json",
-            "raw",
-            "row",
-            "table"
-          ],
-          "type": "option"
-        },
         "invokedFromAnotherCommand": {
           "hidden": true,
           "name": "invokedFromAnotherCommand",
@@ -2081,7 +2075,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:links",
+      "id": "team:remove",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2093,26 +2087,34 @@
         "src",
         "oclif",
         "commands",
-        "users",
-        "links.js"
+        "team",
+        "remove.js"
       ]
     },
-    "users:remove": {
+    "users:add": {
       "aliases": [
-        "users:delete"
+        "users:invite"
       ],
       "args": {
         "email": {
-          "description": "The user to be removed.",
+          "description": "The user to be invited. If they don't have a Zapier account, they'll be prompted to create one.",
           "name": "email",
           "required": true
+        },
+        "version": {
+          "description": "A version string (like 1.2.3). Optional, used only if you want to invite a user to a specific version instead of all versions.",
+          "name": "version"
         }
       },
-      "description": "Remove a user from all versions of your integration.\n\nWhen this command is run, their Zaps will immediately turn off. They won't be able to use your app again until they're re-invited or it has gone public. In practice, this command isn't run often as it's very disruptive to users.",
+      "description": "Add a user to some or all versions of your integration.\n\nWhen this command is run, we'll send an email to the user inviting them to try your integration. You can track the status of that invite using the `zapier users:get` command.\n\nInvited users will be able to see your integration's name, logo, and description. They'll also be able to create Zaps using any available triggers and actions.",
+      "examples": [
+        "zapier users:add bruce@wayne.com",
+        "zapier users:add alfred@wayne.com 1.2.3"
+      ],
       "flags": {
         "force": {
           "char": "f",
-          "description": "Skips confirmation. Useful for running programatically.",
+          "description": "Skip confirmation. Useful for running programatically.",
           "name": "force",
           "allowNo": false,
           "type": "boolean"
@@ -2133,7 +2135,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:remove",
+      "id": "users:add",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2146,22 +2148,15 @@
         "oclif",
         "commands",
         "users",
-        "remove.js"
+        "add.js"
       ]
     },
-    "env:get": {
-      "aliases": [],
-      "args": {
-        "version": {
-          "description": "The version to get the environment for.",
-          "name": "version",
-          "required": true
-        }
-      },
-      "description": "Get environment variables for a version.",
-      "examples": [
-        "zapier env:get 1.2.3"
+    "users:get": {
+      "aliases": [
+        "users:list"
       ],
+      "args": {},
+      "description": "Get a list of users who have been invited to your integration.\n\nNote that this list of users is NOT a comprehensive list of everyone who is using your integration. It only includes users who were invited directly by email (using the `\u001b[36mzapier users:add\u001b[39m` command or the web UI). Users who joined by clicking links generated using the `\u001b[36mzapier user:links\u001b[39m` command won't show up here.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2195,7 +2190,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "env:get",
+      "id": "users:get",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2207,27 +2202,14 @@
         "src",
         "oclif",
         "commands",
-        "env",
+        "users",
         "get.js"
       ]
     },
-    "env:set": {
+    "users:links": {
       "aliases": [],
-      "args": {
-        "version": {
-          "description": "The version to set the environment for. Values are copied forward when a new version is created, but this command will only ever affect the specified version.",
-          "name": "version",
-          "required": true
-        },
-        "key-value pairs...": {
-          "description": "The key-value pairs to set. Keys are case-insensitive. Each pair should be space separated and pairs should be separated by an `=`. For example: `A=123 B=456`",
-          "name": "key-value pairs..."
-        }
-      },
-      "description": "Set environment variables for a version.",
-      "examples": [
-        "zapier env:set 1.2.3 SECRET=12345 OTHER=4321"
-      ],
+      "args": {},
+      "description": "Get a list of links that are used to invite users to your integration.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2236,6 +2218,22 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "format": {
+          "char": "f",
+          "description": "Change the way structured data is presented. If \"json\" or \"raw\", you can pipe the output of the command into other tools, such as jq.",
+          "name": "format",
+          "default": "table",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "plain",
+            "json",
+            "raw",
+            "row",
+            "table"
+          ],
+          "type": "option"
+        },
         "invokedFromAnotherCommand": {
           "hidden": true,
           "name": "invokedFromAnotherCommand",
@@ -2245,11 +2243,11 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "env:set",
+      "id": "users:links",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": false,
       "skipValidInstallCheck": true,
       "isESM": false,
@@ -2257,28 +2255,30 @@
         "src",
         "oclif",
         "commands",
-        "env",
-        "set.js"
+        "users",
+        "links.js"
       ]
     },
-    "env:unset": {
-      "aliases": [],
+    "users:remove": {
+      "aliases": [
+        "users:delete"
+      ],
       "args": {
-        "version": {
-          "description": "The version to set the environment for.",
-          "name": "version",
+        "email": {
+          "description": "The user to be removed.",
+          "name": "email",
           "required": true
-        },
-        "keys...": {
-          "description": "The keys to unset. Keys are case-insensitive.",
-          "name": "keys..."
         }
       },
-      "description": "Unset environment variables for a version.",
-      "examples": [
-        "zapier env:unset 1.2.3 SECRET OTHER"
-      ],
+      "description": "Remove a user from all versions of your integration.\n\nWhen this command is run, their Zaps will immediately turn off. They won't be able to use your app again until they're re-invited or it has gone public. In practice, this command isn't run often as it's very disruptive to users.",
       "flags": {
+        "force": {
+          "char": "f",
+          "description": "Skips confirmation. Useful for running programatically.",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -2295,11 +2295,11 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "env:unset",
+      "id": "users:remove",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
-      "strict": false,
+      "strict": true,
       "enableJsonFlag": false,
       "skipValidInstallCheck": true,
       "isESM": false,
@@ -2307,10 +2307,10 @@
         "src",
         "oclif",
         "commands",
-        "env",
-        "unset.js"
+        "users",
+        "remove.js"
       ]
     }
   },
-  "version": "16.0.0"
+  "version": "16.1.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-cli",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "description": "The CLI for managing integrations in Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",

package/src/constants.js

@@ -26,7 +26,7 @@ const BLOCKLISTED_PATHS = [
 ];
 const NODE_VERSION = versionStore[versionStore.length - 1].nodeVersion;
 const LAMBDA_VERSION = `v${NODE_VERSION}`;
-const NODE_VERSION_CLI_REQUIRES = '>=16'; // should be the oldest non-ETL version
+const NODE_VERSION_CLI_REQUIRES = '>=18'; // should be the oldest non-ETL version
 const AUTH_KEY = 'deployKey';
 const ANALYTICS_KEY = 'analyticsMode';
 const ANALYTICS_MODES = {
@@ -42,7 +42,7 @@ const PACKAGE_VERSION = packageJson.version;
 const UPDATE_NOTIFICATION_INTERVAL = 1000 * 60 * 60 * 24 * 7; // one week
 
 const CHECK_REF_DOC_LINK =
-  'https://platform.zapier.com/docs/integration-checks-reference';
+  'https://docs.zapier.com/platform/publish/integration-checks-reference#integration-check-reference';
 
 const ISSUES_URL =
   'https://github.com/zapier/zapier-platform/issues/new/choose';

package/src/generators/templates/dynamic-dropdown/README.md

@@ -1,5 +1,5 @@
 # The "dynamic-dropdown" Template
 
-This example integration uses the [Star Wars API](https://swapi.dev/) to provide a dynamic listing of choices for an `inputField` in a trigger.
+This example integration uses the [Star Wars API](https://swapi.info/) to provide a dynamic listing of choices for an `inputField` in a trigger.
 
 ![](https://cdn.zappy.app/d985065c5098089795d9b60c77791e12.png)

package/src/generators/templates/dynamic-dropdown/triggers/people.js

@@ -5,8 +5,8 @@ const perform = async (z, bundle) => {
   // Ideally, we should poll through all the pages of results, but in this
   // example we're going to omit that part. Thus, this trigger only "see" the
   // people in their first page of results.
-  const response = await z.request({ url: 'https://swapi.dev/api/people/' });
-  let peopleArray = response.data.results;
+  const response = await z.request({ url: 'https://swapi.info/api/people/' });
+  let peopleArray = response.data;
 
   if (bundle.inputData.species_id) {
     // The Zap's setup has requested a specific species of person. Since the

package/src/generators/templates/dynamic-dropdown/triggers/species.js

@@ -3,7 +3,7 @@ const { extractID } = require('../utils');
 // Fetches a list of records from the endpoint
 const perform = async (z, bundle) => {
   const request = {
-    url: 'https://swapi.dev/api/species/',
+    url: 'https://swapi.info/api/species/',
     params: {},
   };
 
@@ -13,7 +13,7 @@ const perform = async (z, bundle) => {
   }
 
   const response = await z.request(request);
-  const speciesArray = response.data.results;
+  const speciesArray = response.data;
   return speciesArray.map((species) => {
     species.id = extractID(species.url);
     return species;

package/src/oclif/ZapierBaseCommand.js

@@ -346,7 +346,7 @@ class ZapierBaseCommand extends Command {
     if (!this.args) {
       throw new Error('unable to record analytics until args are parsed');
     }
-    return recordAnalytics(this.id, true, Object.keys(this.args), this.flags);
+    return recordAnalytics(this.id, true, this.args, this.flags);
   }
 }
 

package/src/oclif/commands/history.js

@@ -15,6 +15,7 @@ class HistoryCommand extends BaseCommand {
         ['What', 'action'],
         ['Message', 'message'],
         ['Who', 'customuser'],
+        ['Version', 'version'],
         ['Timestamp', 'date'],
       ],
       emptyMessage: 'No historical actions found',

package/src/oclif/hooks/renderMarkdownHelp.js

@@ -1,22 +1,22 @@
 const chalk = require('chalk');
 const { marked } = require('marked');
-const TerminalRenderer = require('marked-terminal');
+const { markedTerminal } = require('marked-terminal');
 
-marked.setOptions({
-  renderer: new TerminalRenderer({
+marked.use(
+  markedTerminal({
     tab: 2,
     width: process.stdout.getWindowSize()[0] - 2,
     reflowText: true,
     codespan: chalk.underline.bold,
   }),
-});
+);
 
 module.exports = (options) => {
   const cmdId = options.id === 'help' ? options.argv[0] : options.id;
   const cmd = options.config.findCommand(cmdId);
   if (cmd) {
     if (cmd.description) {
-      cmd.description = marked(cmd.description).trim();
+      cmd.description = marked.parse(cmd.description).trim();
     }
     // TODO: Do the same for flag descriptions?
   }

package/src/utils/analytics.js

@@ -2,6 +2,7 @@ const { callAPI } = require('./api');
 // const { readFile } = require('./files');
 const debug = require('debug')('zapier:analytics');
 const pkg = require('../../package.json');
+const { getLinkedAppConfig } = require('../utils/api');
 const { ANALYTICS_KEY, ANALYTICS_MODES, IS_TESTING } = require('../constants');
 const { readUserConfig, writeUserConfig } = require('./userConfig');
 
@@ -20,25 +21,37 @@ const shouldSkipAnalytics = (mode) =>
   process.env.DISABLE_ZAPIER_ANALYTICS ||
   mode === ANALYTICS_MODES.disabled;
 
-const recordAnalytics = async (command, isValidCommand, argNames, flags) => {
+const recordAnalytics = async (command, isValidCommand, args, flags) => {
   const analyticsMode = await currentAnalyticsMode();
 
   if (shouldSkipAnalytics(analyticsMode)) {
     debug('skipping analytics');
     return;
   }
-
+  const argKeys = Object.keys(args);
+  const flagKeys = Object.keys(flags);
   const shouldRecordAnonymously = analyticsMode === ANALYTICS_MODES.anonymous;
 
+  const integrationIDKey = argKeys.find(
+    (key) => key.toLowerCase() === 'integrationid',
+  );
+  const integrationID = integrationIDKey ? args[integrationIDKey] : undefined;
+
+  // Some commands ( like "zapier convert" ) won't have an app directory when called.
+  // Instead, having the app ID in the arguments.
+  // In this case, we fallback to using "integrationid" in arguments ( if it's there )
+  // and don't want to "explode" if appID is missing
+  const linkedAppId =
+    (await getLinkedAppConfig(undefined, false))?.id || integrationID;
+
   // to make this more testable, we should split this out into its own function
   const analyticsBody = {
     command,
     isValidCommand,
-    numArgs: argNames.length,
-    flags: {
-      ...flags,
-      ...(command === 'help' ? { helpCommand: argNames[0] } : {}), // include the beginning of args so we know what they want help on
-    },
+    numArgs: argKeys.length,
+    appId: linkedAppId,
+    argsKeys: argKeys,
+    flagKeys: flagKeys,
     cliVersion: pkg.version,
     os: shouldRecordAnonymously ? undefined : process.platform,
   };

package/src/utils/api.js

@@ -95,7 +95,7 @@ const callAPI = async (
     }
   }
 
-  debug(`>> ${requestOptions.method} ${requestOptions.url}`);
+  debug(`>> ${requestOptions.method} ${requestOptions.url || res.url}`);
 
   if (requestOptions.body) {
     const replacementStr = 'raw zip removed in logs';

package/src/version-store.js

@@ -17,4 +17,5 @@ module.exports = [
   { nodeVersion: '14', npmVersion: '>=5.6.0' }, // 12.x
   { nodeVersion: '16', npmVersion: '>=5.6.0' }, // 13.x
   { nodeVersion: '18', npmVersion: '>=5.6.0' }, // 15.x
+  { nodeVersion: '18', npmVersion: '>=10.7.0' }, // 16.x
 ];