@salesforce/plugin-deploy-retrieve 1.8.5-beta.5 → 1.8.5-beta.7

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.5-beta.5",
+  "version": "1.8.5-beta.7",
   "commands": {
     "deploy": {
       "id": "deploy",
@@ -38,7 +38,6 @@
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
       "aliases": [
-        "force:mdapi:beta:convert",
         "force:mdapi:convert"
       ],
       "examples": [
@@ -169,6 +168,7 @@
         "api-version": {
           "name": "api-version",
           "type": "option",
+          "summary": "API Version to use in the generated project's manifest. By default, will use the version from sfdx-project.json",
           "description": "Override the api version used for api requests made by this command",
           "multiple": false,
           "deprecateAliases": true,
@@ -203,7 +203,7 @@
           "char": "d",
           "summary": "Output directory to store the Metadata API–formatted files in.",
           "multiple": false,
-          "default": "metadataPackage_1679670267737",
+          "default": "metadataPackage_1680031466306",
           "deprecateAliases": true,
           "aliases": [
             "outputdir"
@@ -450,7 +450,6 @@
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
       "aliases": [
-        "force:source:beta:tracking:clear",
         "force:source:tracking:clear"
       ],
       "examples": [],
@@ -521,7 +520,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:cancel"
       ],
@@ -593,7 +591,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:preview"
       ],
@@ -684,7 +681,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:quick"
       ],
@@ -832,7 +828,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:report"
       ],
@@ -850,22 +845,6 @@
           "allowNo": false,
           "deprecateAliases": true
         },
-        "target-org": {
-          "name": "target-org",
-          "type": "option",
-          "char": "o",
-          "summary": "Login username or alias for the target org.",
-          "required": true,
-          "multiple": false,
-          "deprecateAliases": true
-        },
-        "api-version": {
-          "name": "api-version",
-          "type": "option",
-          "description": "Override the api version used for api requests made by this command",
-          "multiple": false,
-          "deprecateAliases": true
-        },
         "job-id": {
           "name": "job-id",
           "type": "option",
@@ -925,8 +904,7 @@
         }
       },
       "args": {},
-      "requiresProject": true,
-      "hasDynamicHelp": true
+      "requiresProject": true
     },
     "project:deploy:resume": {
       "id": "project:deploy:resume",
@@ -936,7 +914,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:resume"
       ],
@@ -1095,7 +1072,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata"
       ],
@@ -1457,7 +1433,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "deploy:metadata:validate"
       ],
@@ -1664,50 +1639,10 @@
       },
       "hasDynamicHelp": true
     },
-    "project:list:ignored": {
-      "id": "project:list:ignored",
-      "summary": "check your local project package directories for forceignored files",
-      "description": "check your local project package directories for forceignored files",
-      "strict": true,
-      "pluginName": "@salesforce/plugin-deploy-retrieve",
-      "pluginAlias": "@salesforce/plugin-deploy-retrieve",
-      "pluginType": "core",
-      "aliases": [
-        "force:source:ignored:list"
-      ],
-      "examples": [
-        "$ <%= config.bin %> <%= command.id %>",
-        "$ <%= config.bin %> <%= command.id %> --source-dir force-app"
-      ],
-      "deprecateAliases": true,
-      "flags": {
-        "json": {
-          "name": "json",
-          "type": "boolean",
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "allowNo": false,
-          "deprecateAliases": true
-        },
-        "source-dir": {
-          "name": "source-dir",
-          "type": "option",
-          "char": "p",
-          "summary": "file or directory of files that the command checks for foreceignored files",
-          "multiple": false,
-          "deprecateAliases": true,
-          "aliases": [
-            "sourcepath"
-          ]
-        }
-      },
-      "args": {},
-      "requiresProject": true
-    },
-    "project:manifest:create": {
-      "id": "project:manifest:create",
+    "project:generate:manifest": {
+      "id": "project:generate:manifest",
       "summary": "Create a project manifest that lists the metadata components you want to deploy or retrieve.",
-      "description": "Create a manifest from a list of metadata components (--metadata) or from one or more local directories that contain source files (--source-dir). You can specify either of these parameters, not both.\n\nUse --manifest-type to specify the type of manifest you want to create. The resulting manifest files have specific names, such as the standard package.xml or destructiveChanges.xml to delete metadata. Valid values for this parameter, and their respective file names, are:\n\n    * package : package.xml (default)\n    * pre : destructiveChangesPre.xml\n    * post : destructiveChangesPost.xml\n    * destroy : destructiveChanges.xml\n\nSee https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deploy_deleting_files.htm for information about these destructive manifest files.\n\nUse --manifest-name to specify a custom name for the generated manifest if the pre-defined ones don’t suit your needs. You can specify either --manifest-type or --manifest-name, but not both.",
+      "description": "Create a manifest from a list of metadata components (--metadata) or from one or more local directories that contain source files (--source-dir). You can specify either of these parameters, not both.\n\nUse --type to specify the type of manifest you want to create. The resulting manifest files have specific names, such as the standard package.xml or destructiveChanges.xml to delete metadata. Valid values for this parameter, and their respective file names, are:\n\n    * package : package.xml (default)\n    * pre : destructiveChangesPre.xml\n    * post : destructiveChangesPost.xml\n    * destroy : destructiveChanges.xml\n\nSee https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deploy_deleting_files.htm for information about these destructive manifest files.\n\nUse --name to specify a custom name for the generated manifest if the pre-defined ones don’t suit your needs. You can specify either --type or --name, but not both.",
       "strict": true,
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
@@ -1717,8 +1652,8 @@
       ],
       "examples": [
         "Create a manifest for deploying or retrieving all Apex classes:\n$ <%= config.bin %> <%= command.id %> --metadata ApexClass",
-        "Create a manifest for deleting the specified Apex class:\n$ <%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --manifest-type destroy",
-        "Create a manifest for deploying or retrieving all the metadata components in the specified local directory; name the file myNewManifest.xml:\n$ <%= config.bin %> <%= command.id %> --source-dir force-app --manifest-name myNewManifest",
+        "Create a manifest for deleting the specified Apex class:\n$ <%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --type destroy",
+        "Create a manifest for deploying or retrieving all the metadata components in the specified local directory; name the file myNewManifest.xml:\n$ <%= config.bin %> <%= command.id %> --source-dir force-app --name myNewManifest",
         "Create a manifest from the metadata components in the specified org and include metadata in any unlocked packages:\n$ <%= config.bin %> <%= command.id %> --from-org test@myorg.com --include-packages unlocked"
       ],
       "deprecateAliases": true,
@@ -1772,22 +1707,22 @@
           ],
           "delimiter": ","
         },
-        "manifest-name": {
-          "name": "manifest-name",
+        "name": {
+          "name": "name",
           "type": "option",
           "char": "n",
           "summary": "Name of a custom manifest file to create.",
           "multiple": false,
           "exclusive": [
-            "manifest-type"
+            "type"
           ],
           "deprecateAliases": true,
           "aliases": [
             "manifestname"
           ]
         },
-        "manifest-type": {
-          "name": "manifest-type",
+        "type": {
+          "name": "type",
           "type": "option",
           "char": "t",
           "summary": "Type of manifest to create; the type determines the name of the created file.",
@@ -1798,6 +1733,9 @@
             "destroy",
             "package"
           ],
+          "exclusive": [
+            "name"
+          ],
           "deprecateAliases": true,
           "aliases": [
             "manifesttype"
@@ -1814,7 +1752,7 @@
             "unlocked"
           ],
           "dependsOn": [
-            "fromorg"
+            "from-org"
           ],
           "deprecateAliases": true,
           "aliases": [
@@ -1848,6 +1786,46 @@
       "args": {},
       "requiresProject": true
     },
+    "project:list:ignored": {
+      "id": "project:list:ignored",
+      "summary": "check your local project package directories for forceignored files",
+      "description": "check your local project package directories for forceignored files",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-deploy-retrieve",
+      "pluginAlias": "@salesforce/plugin-deploy-retrieve",
+      "pluginType": "core",
+      "aliases": [
+        "force:source:ignored:list"
+      ],
+      "examples": [
+        "$ <%= config.bin %> <%= command.id %>",
+        "$ <%= config.bin %> <%= command.id %> --source-dir force-app"
+      ],
+      "deprecateAliases": true,
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false,
+          "deprecateAliases": true
+        },
+        "source-dir": {
+          "name": "source-dir",
+          "type": "option",
+          "char": "p",
+          "summary": "file or directory of files that the command checks for foreceignored files",
+          "multiple": false,
+          "deprecateAliases": true,
+          "aliases": [
+            "sourcepath"
+          ]
+        }
+      },
+      "args": {},
+      "requiresProject": true
+    },
     "project:reset:tracking": {
       "id": "project:reset:tracking",
       "summary": "Reset local and remote source tracking.",
@@ -1857,7 +1835,6 @@
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
       "aliases": [
-        "force:source:beta:tracking:reset",
         "force:source:tracking:reset"
       ],
       "examples": [],
@@ -1936,7 +1913,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "retrieve:metadata:preview"
       ],
@@ -1986,7 +1962,6 @@
       "pluginName": "@salesforce/plugin-deploy-retrieve",
       "pluginAlias": "@salesforce/plugin-deploy-retrieve",
       "pluginType": "core",
-      "state": "beta",
       "aliases": [
         "retrieve:metadata"
       ],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@salesforce/plugin-deploy-retrieve",
     "description": "deploy and retrieve commands for sf",
-    "version": "1.8.5-beta.5",
+    "version": "1.8.5-beta.7",
     "author": "Salesforce",
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
@@ -11,7 +11,7 @@
         "@salesforce/kit": "^1.9.2",
         "@salesforce/sf-plugins-core": "^2.2.5",
         "@salesforce/source-deploy-retrieve": "^7.13.0",
-        "@salesforce/source-tracking": "^2.2.22",
+        "@salesforce/source-tracking": "^2.2.26",
         "chalk": "^4.1.2",
         "fs-extra": "^10.0.1",
         "shelljs": "^0.8.5",
@@ -118,7 +118,7 @@
                     "delete": {
                         "description": "Commands to delete metadata from a Salesforce org."
                     },
-                    "manifest": {
+                    "generate": {
                         "description": "Commands to create a manifest file."
                     },
                     "reset": {
@@ -144,6 +144,7 @@
         "test": "wireit",
         "test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 10",
         "test:nuts:convert": "nyc mocha \"test/nuts/convert/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
+        "test:nuts:deb": "nyc mocha \"test/nuts/digitalExperienceBundle/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:delete": "nyc mocha \"test/nuts/delete/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:manifest": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.manifest ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:metadata": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
@@ -269,7 +270,7 @@
         }
     },
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.5.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.5.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.7.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.7.sig"
     }
 }

package/schemas/{project-manifest-create.json → project-generate-manifest.json}

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$ref": "#/definitions/CreateCommandResult",
+  "$ref": "#/definitions/ManifestGenerateCommandResult",
   "definitions": {
-    "CreateCommandResult": {
+    "ManifestGenerateCommandResult": {
       "type": "object",
       "properties": {
         "name": {

package/lib/commands/project/manifest/create.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/project/manifest/create.ts"],"names":[],"mappings":"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"}