@salesforce/plugin-org 2.6.13 → 2.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,6 +23,10 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
23
23
  'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
24
24
  'client-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
25
25
  'track-source': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
26
+ username: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
27
+ description: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
28
+ name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
29
+ release: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
26
30
  };
27
31
  run(): Promise<ScratchCreateResponse>;
28
32
  private clientSecretPrompt;
@@ -23,9 +23,16 @@ class EnvCreateScratch extends sf_plugins_core_1.SfCommand {
23
23
  if (!baseUrl) {
24
24
  throw new core_1.SfError('No instance URL found for the dev hub');
25
25
  }
26
- const orgConfig = flags['definition-file']
27
- ? JSON.parse(await fs.promises.readFile(flags['definition-file'], 'utf-8'))
28
- : { edition: flags.edition };
26
+ const orgConfig = {
27
+ ...(flags['definition-file']
28
+ ? JSON.parse(await fs.promises.readFile(flags['definition-file'], 'utf-8'))
29
+ : {}),
30
+ ...(flags.edition ? { edition: flags.edition } : {}),
31
+ ...(flags.username ? { username: flags.username } : {}),
32
+ ...(flags.description ? { description: flags.description } : {}),
33
+ ...(flags.name ? { orgName: flags.name } : {}),
34
+ ...(flags.release ? { release: flags.release } : {}),
35
+ };
29
36
  const createCommandOptions = {
30
37
  hubOrg: flags['target-dev-hub'],
31
38
  clientSecret: flags['client-id'] ? await this.clientSecretPrompt() : undefined,
@@ -114,7 +121,6 @@ EnvCreateScratch.flags = {
114
121
  char: 'f',
115
122
  summary: messages.getMessage('flags.definition-file.summary'),
116
123
  description: messages.getMessage('flags.definition-file.description'),
117
- exactlyOne: ['definition-file', 'edition'],
118
124
  }),
119
125
  'target-dev-hub': sf_plugins_core_1.Flags.requiredHub({
120
126
  char: 'v',
@@ -141,7 +147,6 @@ EnvCreateScratch.flags = {
141
147
  'partner-group',
142
148
  'partner-professional',
143
149
  ],
144
- exactlyOne: ['definition-file', 'edition'],
145
150
  }),
146
151
  'no-namespace': sf_plugins_core_1.Flags.boolean({
147
152
  char: 'm',
@@ -178,5 +183,20 @@ EnvCreateScratch.flags = {
178
183
  description: messages.getMessage('flags.track-source.description'),
179
184
  allowNo: true,
180
185
  }),
186
+ username: sf_plugins_core_1.Flags.string({
187
+ summary: messages.getMessage('flags.username.summary'),
188
+ description: messages.getMessage('flags.username.description'),
189
+ }),
190
+ description: sf_plugins_core_1.Flags.string({
191
+ summary: messages.getMessage('flags.description.summary'),
192
+ }),
193
+ name: sf_plugins_core_1.Flags.string({
194
+ summary: messages.getMessage('flags.name.summary'),
195
+ }),
196
+ release: sf_plugins_core_1.Flags.string({
197
+ summary: messages.getMessage('flags.release.summary'),
198
+ description: messages.getMessage('flags.release.description'),
199
+ options: ['preview', 'previous'],
200
+ }),
181
201
  };
182
202
  //# sourceMappingURL=scratch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scratch.js","sourceRoot":"","sources":["../../../../src/commands/org/create/scratch.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,17 @@ Create a scratch org.
4
4
 
5
5
  # description
6
6
 
7
- There are two ways to create a scratch org: specify a definition file that contains the options or use the --edition flag to specify the one required option. If you want to set options other than the edition, such as org features or settings, you must use a definition file.
7
+ There are two ways to create a scratch org: either specify a definition file that contains the options or use the --edition flag to specify the one required option.
8
+
9
+ For either method, you can also use these flags; if you use them with --definition-file, they override their equivalent option in the scratch org definition file:
10
+
11
+ * --description
12
+ * --name (equivalent to the "orgName" option)
13
+ * --username
14
+ * --release
15
+ * --edition
16
+
17
+ If you want to set options other than the preceding ones, such as org features or settings, you must use a definition file.
8
18
 
9
19
  You must specify a Dev Hub to create a scratch org, either with the --target-dev-hub flag or by setting your default Dev Hub with the target-dev-hub configuration variable.
10
20
 
@@ -14,9 +24,13 @@ You must specify a Dev Hub to create a scratch org, either with the --target-dev
14
24
 
15
25
  <%= config.bin %> <%= command.id %> --edition=developer --alias my-scratch-org
16
26
 
17
- - Specify the Dev Hub using its alias and a scratch org definition file. Set the scratch org as your default and specify that it expires in 3 days:
27
+ - Create a scratch org with a definition file. Specify the Dev Hub using its alias, set the scratch org as your default, and specify that it expires in 3 days:
28
+
29
+ <%= config.bin %> <%= command.id %> --target-dev-hub MyHub --definition-file config/project-scratch-def.json --set-default --duration-days 3
30
+
31
+ - Create a preview Enterprise edition scratch org; for use only during Salesforce release transition periods:
18
32
 
19
- <%= config.bin %> <%= command.id %> --target-dev-hub=MyHub --definition-file config/project-scratch-def.json --set-default --duration-days 3
33
+ <%= config.bin %> <%= command.id %> --edition=enterprise --alias my-scratch-org --target-dev-hub MyHub --release preview
20
34
 
21
35
  # flags.target-hub.summary
22
36
 
@@ -44,7 +58,7 @@ Don't include second-generation managed package (2GP) ancestors in the scratch o
44
58
 
45
59
  # flags.edition.summary
46
60
 
47
- Salesforce edition of the scratch org.
61
+ Salesforce edition of the scratch org. Overrides the value of the "edition" option in the definition file, if set.
48
62
 
49
63
  # flags.async.summary
50
64
 
@@ -96,6 +110,32 @@ Create the scratch org with no namespace, even if the Dev Hub has a namespace.
96
110
 
97
111
  Number of days before the org expires.
98
112
 
113
+ # flags.username.summary
114
+
115
+ Username of the scratch org admin user. Overrides the value of the "username" option in the definition file, if set.
116
+
117
+ # flags.username.description
118
+
119
+ The username must be unique within the entire scratch org and sandbox universe. You must add your own logic to ensure uniqueness.
120
+
121
+ Omit this flag to have Salesforce generate a unique username for your org.
122
+
123
+ # flags.description.summary
124
+
125
+ Description of the scratch org in the Dev Hub. Overrides the value of the "description" option in the definition file, if set.
126
+
127
+ # flags.name.summary
128
+
129
+ Name of the org, such as "Acme Company". Overrides the value of the "orgName" option in the definition file, if set.
130
+
131
+ # flags.release.summary
132
+
133
+ Release of the scratch org as compared to the Dev Hub release.
134
+
135
+ # flags.release.description
136
+
137
+ By default, scratch orgs are on the same release as the Dev Hub. During Salesforce release transition periods, you can override this default behavior and opt in or out of the new release.
138
+
99
139
  # prompt.secret
100
140
 
101
141
  OAuth client secret of your personal connected app
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "2.6.13",
2
+ "version": "2.7.1",
3
3
  "commands": {
4
4
  "org:display": {
5
5
  "id": "org:display",
@@ -852,7 +852,7 @@
852
852
  "org:create:scratch": {
853
853
  "id": "org:create:scratch",
854
854
  "summary": "Create a scratch org.",
855
- "description": "There are two ways to create a scratch org: specify a definition file that contains the options or use the --edition flag to specify the one required option. If you want to set options other than the edition, such as org features or settings, you must use a definition file.\n\nYou must specify a Dev Hub to create a scratch org, either with the --target-dev-hub flag or by setting your default Dev Hub with the target-dev-hub configuration variable.",
855
+ "description": "There are two ways to create a scratch org: either specify a definition file that contains the options or use the --edition flag to specify the one required option.\n\nFor either method, you can also use these flags; if you use them with --definition-file, they override their equivalent option in the scratch org definition file:\n\n * --description\n * --name (equivalent to the \"orgName\" option)\n * --username\n * --release\n * --edition\n\nIf you want to set options other than the preceding ones, such as org features or settings, you must use a definition file.\n\nYou must specify a Dev Hub to create a scratch org, either with the --target-dev-hub flag or by setting your default Dev Hub with the target-dev-hub configuration variable.",
856
856
  "strict": true,
857
857
  "pluginName": "@salesforce/plugin-org",
858
858
  "pluginAlias": "@salesforce/plugin-org",
@@ -862,7 +862,8 @@
862
862
  ],
863
863
  "examples": [
864
864
  "Create a Developer edition scratch org using your default Dev Hub and give the scratch org an alias:\n<%= config.bin %> <%= command.id %> --edition=developer --alias my-scratch-org",
865
- "Specify the Dev Hub using its alias and a scratch org definition file. Set the scratch org as your default and specify that it expires in 3 days:\n<%= config.bin %> <%= command.id %> --target-dev-hub=MyHub --definition-file config/project-scratch-def.json --set-default --duration-days 3"
865
+ "Create a scratch org with a definition file. Specify the Dev Hub using its alias, set the scratch org as your default, and specify that it expires in 3 days:\n<%= config.bin %> <%= command.id %> --target-dev-hub MyHub --definition-file config/project-scratch-def.json --set-default --duration-days 3",
866
+ "Create a preview Enterprise edition scratch org; for use only during Salesforce release transition periods:\n<%= config.bin %> <%= command.id %> --edition=enterprise --alias my-scratch-org --target-dev-hub MyHub --release preview"
866
867
  ],
867
868
  "deprecateAliases": true,
868
869
  "flags": {
@@ -931,7 +932,7 @@
931
932
  "name": "edition",
932
933
  "type": "option",
933
934
  "char": "e",
934
- "summary": "Salesforce edition of the scratch org.",
935
+ "summary": "Salesforce edition of the scratch org. Overrides the value of the \"edition\" option in the definition file, if set.",
935
936
  "description": "The editions that begin with \"partner-\" are available only if the Dev Hub org is a Partner Business Org.",
936
937
  "multiple": false,
937
938
  "options": [
@@ -997,6 +998,40 @@
997
998
  "description": "We recommend you enable source tracking in scratch orgs, which is why it's the default behavior. Source tracking allows you to track the changes you make to your metadata, both in your local project and in the scratch org, and to detect any conflicts between the two.\n\nTo disable source tracking in the new scratch org, specify the --no-track-source flag. The main reason to disable source tracking is for performance. For example, while you probably want to deploy metadata and run Apex tests in your CI/CD jobs, you probably don't want to incur the costs of source tracking (checking for conflicts, polling the SourceMember object, various file system operations.) This is a good use case for disabling source tracking in the scratch org.",
998
999
  "allowNo": true,
999
1000
  "deprecateAliases": true
1001
+ },
1002
+ "username": {
1003
+ "name": "username",
1004
+ "type": "option",
1005
+ "summary": "Username of the scratch org admin user. Overrides the value of the \"username\" option in the definition file, if set.",
1006
+ "description": "The username must be unique within the entire scratch org and sandbox universe. You must add your own logic to ensure uniqueness.\n\nOmit this flag to have Salesforce generate a unique username for your org.",
1007
+ "multiple": false,
1008
+ "deprecateAliases": true
1009
+ },
1010
+ "description": {
1011
+ "name": "description",
1012
+ "type": "option",
1013
+ "summary": "Description of the scratch org in the Dev Hub. Overrides the value of the \"description\" option in the definition file, if set.",
1014
+ "multiple": false,
1015
+ "deprecateAliases": true
1016
+ },
1017
+ "name": {
1018
+ "name": "name",
1019
+ "type": "option",
1020
+ "summary": "Name of the org, such as \"Acme Company\". Overrides the value of the \"orgName\" option in the definition file, if set.",
1021
+ "multiple": false,
1022
+ "deprecateAliases": true
1023
+ },
1024
+ "release": {
1025
+ "name": "release",
1026
+ "type": "option",
1027
+ "summary": "Release of the scratch org as compared to the Dev Hub release.",
1028
+ "description": "By default, scratch orgs are on the same release as the Dev Hub. During Salesforce release transition periods, you can override this default behavior and opt in or out of the new release.",
1029
+ "multiple": false,
1030
+ "options": [
1031
+ "preview",
1032
+ "previous"
1033
+ ],
1034
+ "deprecateAliases": true
1000
1035
  }
1001
1036
  },
1002
1037
  "args": {},
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-org",
3
3
  "description": "Commands to interact with Salesforce orgs",
4
- "version": "2.6.13",
4
+ "version": "2.7.1",
5
5
  "author": "Salesforce",
6
6
  "main": "lib/index.js",
7
7
  "bugs": "https://github.com/forcedotcom/cli/issues",
@@ -16,7 +16,7 @@
16
16
  },
17
17
  "devDependencies": {
18
18
  "@oclif/plugin-command-snapshot": "^3.3.10",
19
- "@salesforce/cli-plugins-testkit": "^3.3.1",
19
+ "@salesforce/cli-plugins-testkit": "^3.3.2",
20
20
  "@salesforce/dev-config": "^3.1.0",
21
21
  "@salesforce/dev-scripts": "^4.3.0",
22
22
  "@salesforce/plugin-command-reference": "^2.2.9",
@@ -26,11 +26,11 @@
26
26
  "@swc/core": "1.3.39",
27
27
  "@types/shelljs": "^0.8.10",
28
28
  "@typescript-eslint/eslint-plugin": "^5.57.0",
29
- "@typescript-eslint/parser": "^5.57.1",
29
+ "@typescript-eslint/parser": "^5.58.0",
30
30
  "chai": "^4.3.7",
31
31
  "eslint": "^8.38.0",
32
- "eslint-config-prettier": "^8.6.0",
33
- "eslint-config-salesforce": "^1.1.1",
32
+ "eslint-config-prettier": "^8.8.0",
33
+ "eslint-config-salesforce": "^1.2.0",
34
34
  "eslint-config-salesforce-license": "^0.2.0",
35
35
  "eslint-config-salesforce-typescript": "^1.1.1",
36
36
  "eslint-plugin-header": "^3.0.0",
@@ -41,7 +41,7 @@
41
41
  "mocha": "^10.2.0",
42
42
  "moment": "^2.29.1",
43
43
  "nyc": "^15.1.0",
44
- "oclif": "^3.7.3",
44
+ "oclif": "^3.8.1",
45
45
  "prettier": "^2.8.7",
46
46
  "pretty-quick": "^3.1.0",
47
47
  "shelljs": "^0.8.5",
@@ -235,7 +235,7 @@
235
235
  }
236
236
  },
237
237
  "sfdx": {
238
- "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.6.13.crt",
239
- "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.6.13.sig"
238
+ "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.7.1.crt",
239
+ "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-org/2.7.1.sig"
240
240
  }
241
241
  }