Skip to content

Commit 1d19b32

Browse files
committed
chore: consistent use of Forge/Electron Forge in messages
1 parent 6158329 commit 1d19b32

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

packages/api/cli/src/electron-forge-init.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import workingDir from './util/working-dir';
1212
program
1313
.version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
1414
.arguments('[name]')
15-
.option('-t, --template [name]', 'Name of the forge template to use')
15+
.option('-t, --template [name]', 'Name of the Forge template to use')
1616
.option('-c, --copy-ci-files', 'Whether to copy the templated CI files (defaults to false)', false)
1717
.action((name) => { dir = workingDir(dir, name, false); })
1818
.parse(process.argv);

packages/plugin/webpack/src/WebpackPlugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export default class WebpackPlugin extends PluginBase<WebpackPluginConfig> {
147147
forgeConfig.packagerConfig = {};
148148
}
149149
if (forgeConfig.packagerConfig.ignore) {
150-
console.error(`You have set packagerConfig.ignore, the electron forge webpack plugin normally sets this automatically.
150+
console.error(`You have set packagerConfig.ignore, the Electron Forge webpack plugin normally sets this automatically.
151151
152152
Your packaged app may be larger than expected if you dont ignore everything other than the '.webpack' folder`.red);
153153
return forgeConfig;

packages/publisher/bitbucket/src/PublisherBitbucket.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ export default class PublisherBitbucket extends PublisherBase<PublisherBitbucket
2222
const encodedUserAndPass = Buffer.from(`${auth.username}:${auth.appPassword}`).toString('base64');
2323

2424
if (!(hasRepositoryConfig && config.repository.owner && config.repository.name)) {
25-
throw new Error('In order to publish to Bitbucket you must set the "repository.owner" and "repository.name" properties in your forge config. See the docs for more info');
25+
throw new Error('In order to publish to Bitbucket you must set the "repository.owner" and "repository.name" properties in your Forge config. See the docs for more info');
2626
}
2727

2828
if (!auth.appPassword || !auth.username) {
29-
throw new Error('In order to publish to Bitbucket provide credentials, either through "auth.appPassword" and "auth.username" properties in your forge config or using BITBUCKET_APP_PASSWORD and BITBUCKET_USERNAME environment variables');
29+
throw new Error('In order to publish to Bitbucket provide credentials, either through "auth.appPassword" and "auth.username" properties in your Forge config or using BITBUCKET_APP_PASSWORD and BITBUCKET_USERNAME environment variables');
3030
}
3131

3232
for (const [index, makeResult] of makeResults.entries()) {
@@ -54,7 +54,7 @@ export default class PublisherBitbucket extends PublisherBase<PublisherBitbucket
5454
});
5555

5656
if (response.status === 302) {
57-
throw new Error(`Unable to publish "${fileName}" as it has been published previously. Use the "replaceExistingFiles" property in your forge config to override this.`);
57+
throw new Error(`Unable to publish "${fileName}" as it has been published previously. Use the "replaceExistingFiles" property in your Forge config to override this.`);
5858
}
5959
}
6060
});

packages/publisher/electron-release-server/src/PublisherERS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default class PublisherERS extends PublisherBase<PublisherERSConfig> {
3737
const { config } = this;
3838

3939
if (!(config.baseUrl && config.username && config.password)) {
40-
throw new Error('In order to publish to ERS you must set the "electronReleaseServer.baseUrl", "electronReleaseServer.username" and "electronReleaseServer.password" properties in your forge config. See the docs for more info');
40+
throw new Error('In order to publish to ERS you must set the "electronReleaseServer.baseUrl", "electronReleaseServer.username" and "electronReleaseServer.password" properties in your Forge config. See the docs for more info');
4141
}
4242

4343
d('attempting to authenticate to ERS');

packages/publisher/github/src/PublisherGithub.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default class PublisherGithub extends PublisherBase<PublisherGitHubConfig
4040

4141
if (!(config.repository && typeof config.repository === 'object'
4242
&& config.repository.owner && config.repository.name)) {
43-
throw new Error('In order to publish to github you must set the "github_repository.owner" and "github_repository.name" properties in your forge config. See the docs for more info');
43+
throw new Error('In order to publish to github you must set the "github_repository.owner" and "github_repository.name" properties in your Forge config. See the docs for more info');
4444
}
4545

4646
const github = new GitHub(config.authToken, true, config.octokitOptions);

packages/publisher/s3/src/PublisherS3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class PublisherS3 extends PublisherBase<PublisherS3Config> {
4747
});
4848

4949
if (!s3Client.config.credentials || !config.bucket) {
50-
throw new Error('In order to publish to s3 you must set the "s3.accessKeyId", "process.env.ELECTRON_FORGE_S3_SECRET_ACCESS_KEY" and "s3.bucket" properties in your forge config. See the docs for more info');
50+
throw new Error('In order to publish to s3 you must set the "s3.accessKeyId", "process.env.ELECTRON_FORGE_S3_SECRET_ACCESS_KEY" and "s3.bucket" properties in your Forge config. See the docs for more info');
5151
}
5252

5353
d('creating s3 client with options:', config);

packages/template/webpack/src/WebpackTemplate.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class WebpackTemplate implements ForgeTemplate {
1717
];
1818

1919
public initializeTemplate = async (directory: string) => {
20-
await asyncOra('Setting up forge configuration', async () => {
20+
await asyncOra('Setting up Forge configuration', async () => {
2121
const pjPath = path.resolve(directory, 'package.json');
2222
const currentPJ = await fs.readJson(pjPath);
2323
currentPJ.main = '.webpack/main';

packages/utils/async-ora/src/ora-handler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const asyncOra: AsyncOraMethod = (initialOraValue, asyncFn, processExitFn = proc
4343
console.error(colors.red(err.message));
4444
console.error(colors.red(err.stack));
4545
} else {
46-
console.error('\nElectron forge was terminated:'.red);
46+
console.error('\nElectron Forge was terminated:'.red);
4747
console.error(colors.red(typeof err === 'string' ? err : JSON.stringify(err)));
4848
}
4949
processExitFn(1);

packages/utils/types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@electron-forge/shared-types",
33
"version": "6.0.0-beta.41",
4-
"description": "Shared types across forge",
4+
"description": "Shared types across Electron Forge",
55
"repository": "https://github.com/electron-userland/electron-forge",
66
"author": "Samuel Attard",
77
"license": "MIT",

0 commit comments

Comments
 (0)