@electron-forge/publisher-electron-release-server 8.0.0-alpha.4 → 8.0.0-alpha.6
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.
- package/dist/Config.js +1 -2
- package/dist/PublisherERS.d.ts +1 -1
- package/dist/PublisherERS.d.ts.map +1 -1
- package/dist/PublisherERS.js +24 -34
- package/package.json +8 -8
- package/src/PublisherERS.ts +10 -10
package/dist/Config.js
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
1
|
+
export {};
|
|
3
2
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
package/dist/PublisherERS.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PublisherBase, PublisherOptions } from '@electron-forge/publisher-base';
|
|
2
2
|
import { ForgeArch, ForgePlatform } from '@electron-forge/shared-types';
|
|
3
|
-
import { PublisherERSConfig } from './Config';
|
|
3
|
+
import { PublisherERSConfig } from './Config.js';
|
|
4
4
|
export declare const ersPlatform: (platform: ForgePlatform, arch: ForgeArch) => string;
|
|
5
5
|
export default class PublisherERS extends PublisherBase<PublisherERSConfig> {
|
|
6
6
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublisherERS.d.ts","sourceRoot":"","sources":["../src/PublisherERS.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"PublisherERS.d.ts","sourceRoot":"","sources":["../src/PublisherERS.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAyCjD,eAAO,MAAM,WAAW,GACtB,UAAU,aAAa,EACvB,MAAM,SAAS,KACd,MAWF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,aAAa,CAAC,kBAAkB,CAAC;IACzE,IAAI,SAA6B;IAE3B,OAAO,CAAC,EACZ,WAAW,EACX,aAAa,GACd,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAoIpC;AAED,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAC"}
|
package/dist/PublisherERS.js
CHANGED
|
@@ -1,25 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
-
const publisher_base_1 = require("@electron-forge/publisher-base");
|
|
9
|
-
const debug_1 = __importDefault(require("debug"));
|
|
10
|
-
const form_data_1 = __importDefault(require("form-data"));
|
|
11
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
12
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
13
|
-
const d = (0, debug_1.default)('electron-forge:publish:ers');
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { PublisherBase, } from '@electron-forge/publisher-base';
|
|
3
|
+
import debug from 'debug';
|
|
4
|
+
import FormData from 'form-data';
|
|
5
|
+
import fs from 'fs-extra';
|
|
6
|
+
const d = debug('electron-forge:publish:ers');
|
|
14
7
|
const fetchAndCheckStatus = async (url, init) => {
|
|
15
|
-
const result = await (
|
|
8
|
+
const result = await fetch(url, init);
|
|
16
9
|
if (result.ok) {
|
|
17
10
|
// res.status >= 200 && res.status < 300
|
|
18
11
|
return result;
|
|
19
12
|
}
|
|
20
|
-
|
|
13
|
+
else {
|
|
14
|
+
throw new Error(`ERS publish failed with status code: ${result.status} (${result.url})`);
|
|
15
|
+
}
|
|
21
16
|
};
|
|
22
|
-
const ersPlatform = (platform, arch) => {
|
|
17
|
+
export const ersPlatform = (platform, arch) => {
|
|
23
18
|
switch (platform) {
|
|
24
19
|
case 'darwin':
|
|
25
20
|
return arch === 'arm64' ? 'osx_arm64' : 'osx_64';
|
|
@@ -31,12 +26,8 @@ const ersPlatform = (platform, arch) => {
|
|
|
31
26
|
return platform;
|
|
32
27
|
}
|
|
33
28
|
};
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
constructor() {
|
|
37
|
-
super(...arguments);
|
|
38
|
-
this.name = 'electron-release-server';
|
|
39
|
-
}
|
|
29
|
+
export default class PublisherERS extends PublisherBase {
|
|
30
|
+
name = 'electron-release-server';
|
|
40
31
|
async publish({ makeResults, setStatusLine, }) {
|
|
41
32
|
const { config } = this;
|
|
42
33
|
if (!(config.baseUrl && config.username && config.password)) {
|
|
@@ -44,7 +35,7 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
44
35
|
}
|
|
45
36
|
d('attempting to authenticate to ERS');
|
|
46
37
|
const api = (apiPath) => `${config.baseUrl}/${apiPath}`;
|
|
47
|
-
const { token } = await (await fetchAndCheckStatus(api('api/auth/login'), {
|
|
38
|
+
const { token } = (await (await fetchAndCheckStatus(api('api/auth/login'), {
|
|
48
39
|
method: 'POST',
|
|
49
40
|
body: JSON.stringify({
|
|
50
41
|
username: config.username,
|
|
@@ -53,7 +44,7 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
53
44
|
headers: {
|
|
54
45
|
'Content-Type': 'application/json',
|
|
55
46
|
},
|
|
56
|
-
})).json();
|
|
47
|
+
})).json());
|
|
57
48
|
const authFetch = (apiPath, options) => fetchAndCheckStatus(api(apiPath), {
|
|
58
49
|
...(options || {}),
|
|
59
50
|
headers: {
|
|
@@ -64,8 +55,8 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
64
55
|
const flavor = config.flavor || 'default';
|
|
65
56
|
for (const makeResult of makeResults) {
|
|
66
57
|
const { packageJSON } = makeResult;
|
|
67
|
-
const artifacts = makeResult.artifacts.filter((artifactPath) =>
|
|
68
|
-
const versions = await (await authFetch('versions/sorted')).json();
|
|
58
|
+
const artifacts = makeResult.artifacts.filter((artifactPath) => path.basename(artifactPath).toLowerCase() !== 'releases');
|
|
59
|
+
const versions = (await (await authFetch('versions/sorted')).json());
|
|
69
60
|
// Find the version with the same name and flavor
|
|
70
61
|
const existingVersion = versions['items'].find((version) => version.name === packageJSON.version &&
|
|
71
62
|
version.flavor.name === flavor);
|
|
@@ -101,9 +92,9 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
101
92
|
const updateStatusLine = () => setStatusLine(`Uploading distributable (${uploaded}/${artifacts.length})`);
|
|
102
93
|
updateStatusLine();
|
|
103
94
|
await Promise.all(artifacts.map(async (artifactPath) => {
|
|
104
|
-
const platform =
|
|
95
|
+
const platform = ersPlatform(makeResult.platform, makeResult.arch);
|
|
105
96
|
if (existingVersion) {
|
|
106
|
-
const existingAsset = existingVersion.assets.find((asset) => asset.name ===
|
|
97
|
+
const existingAsset = existingVersion.assets.find((asset) => asset.name === path.basename(artifactPath) &&
|
|
107
98
|
asset.platform === platform);
|
|
108
99
|
if (existingAsset) {
|
|
109
100
|
d('asset at path:', artifactPath, 'already exists on server');
|
|
@@ -113,15 +104,15 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
113
104
|
}
|
|
114
105
|
}
|
|
115
106
|
d('attempting to upload asset:', artifactPath);
|
|
116
|
-
const artifactForm = new
|
|
107
|
+
const artifactForm = new FormData();
|
|
117
108
|
artifactForm.append('token', token);
|
|
118
109
|
artifactForm.append('version', `${packageJSON.version}_${flavor}`);
|
|
119
110
|
artifactForm.append('platform', platform);
|
|
120
111
|
// see https://github.com/form-data/form-data/issues/426
|
|
121
112
|
const fileOptions = {
|
|
122
|
-
knownLength:
|
|
113
|
+
knownLength: fs.statSync(artifactPath).size,
|
|
123
114
|
};
|
|
124
|
-
artifactForm.append('file',
|
|
115
|
+
artifactForm.append('file', fs.createReadStream(artifactPath), fileOptions);
|
|
125
116
|
await authFetch('api/asset', {
|
|
126
117
|
method: 'POST',
|
|
127
118
|
body: artifactForm,
|
|
@@ -134,6 +125,5 @@ class PublisherERS extends publisher_base_1.PublisherBase {
|
|
|
134
125
|
}
|
|
135
126
|
}
|
|
136
127
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHVibGlzaGVyRVJTLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1B1Ymxpc2hlckVSUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwREFBNkI7QUFFN0IsbUVBR3dDO0FBRXhDLGtEQUEwQjtBQUMxQiwwREFBaUM7QUFDakMsd0RBQTBCO0FBQzFCLDREQUF1RTtBQUl2RSxNQUFNLENBQUMsR0FBRyxJQUFBLGVBQUssRUFBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBd0I5QyxNQUFNLG1CQUFtQixHQUFHLEtBQUssRUFDL0IsR0FBZ0IsRUFDaEIsSUFBa0IsRUFDQyxFQUFFO0lBQ3JCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxvQkFBSyxFQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUN0QyxJQUFJLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNkLHdDQUF3QztRQUN4QyxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FDYix3Q0FBd0MsTUFBTSxDQUFDLE1BQU0sS0FBSyxNQUFNLENBQUMsR0FBRyxHQUFHLENBQ3hFLENBQUM7QUFDSixDQUFDLENBQUM7QUFFSyxNQUFNLFdBQVcsR0FBRyxDQUN6QixRQUF1QixFQUN2QixJQUFlLEVBQ1AsRUFBRTtJQUNWLFFBQVEsUUFBUSxFQUFFLENBQUM7UUFDakIsS0FBSyxRQUFRO1lBQ1gsT0FBTyxJQUFJLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztRQUNuRCxLQUFLLE9BQU87WUFDVixPQUFPLElBQUksS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDO1FBQ25ELEtBQUssT0FBTztZQUNWLE9BQU8sSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUM7UUFDdkQ7WUFDRSxPQUFPLFFBQVEsQ0FBQztJQUNwQixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBZFcsUUFBQSxXQUFXLGVBY3RCO0FBRUYsTUFBcUIsWUFBYSxTQUFRLDhCQUFpQztJQUEzRTs7UUFDRSxTQUFJLEdBQUcseUJBQXlCLENBQUM7SUF5SW5DLENBQUM7SUF2SUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUNaLFdBQVcsRUFDWCxhQUFhLEdBQ0k7UUFDakIsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQztRQUV4QixJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxJQUFJLE1BQU0sQ0FBQyxRQUFRLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7WUFDNUQsTUFBTSxJQUFJLEtBQUssQ0FDYixnTkFBZ04sQ0FDak4sQ0FBQztRQUNKLENBQUM7UUFFRCxDQUFDLENBQUMsbUNBQW1DLENBQUMsQ0FBQztRQUV2QyxNQUFNLEdBQUcsR0FBRyxDQUFDLE9BQWUsRUFBRSxFQUFFLENBQUMsR0FBRyxNQUFNLENBQUMsT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBRWhFLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLENBQ3RCLE1BQU0sbUJBQW1CLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLEVBQUU7WUFDL0MsTUFBTSxFQUFFLE1BQU07WUFDZCxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQkFDbkIsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFRO2dCQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVE7YUFDMUIsQ0FBQztZQUNGLE9BQU8sRUFBRTtnQkFDUCxjQUFjLEVBQUUsa0JBQWtCO2FBQ25DO1NBQ0YsQ0FBQyxDQUNILENBQUMsSUFBSSxFQUFFLENBQUM7UUFFVCxNQUFNLFNBQVMsR0FBRyxDQUFDLE9BQWUsRUFBRSxPQUFxQixFQUFFLEVBQUUsQ0FDM0QsbUJBQW1CLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ2hDLEdBQUcsQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO1lBQ2xCLE9BQU8sRUFBRTtnQkFDUCxHQUFHLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU87Z0JBQzFCLGFBQWEsRUFBRSxVQUFVLEtBQUssRUFBRTthQUNqQztTQUNGLENBQUMsQ0FBQztRQUVMLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLElBQUksU0FBUyxDQUFDO1FBRTFDLEtBQUssTUFBTSxVQUFVLElBQUksV0FBVyxFQUFFLENBQUM7WUFDckMsTUFBTSxFQUFFLFdBQVcsRUFBRSxHQUFHLFVBQVUsQ0FBQztZQUNuQyxNQUFNLFNBQVMsR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FDM0MsQ0FBQyxZQUFZLEVBQUUsRUFBRSxDQUNmLG1CQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLFdBQVcsRUFBRSxLQUFLLFVBQVUsQ0FDM0QsQ0FBQztZQUVGLE1BQU0sUUFBUSxHQUFxQixNQUFNLENBQ3ZDLE1BQU0sU0FBUyxDQUFDLGlCQUFpQixDQUFDLENBQ25DLENBQUMsSUFBSSxFQUFFLENBQUM7WUFFVCxpREFBaUQ7WUFDakQsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FDNUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUNWLE9BQU8sQ0FBQyxJQUFJLEtBQUssV0FBVyxDQUFDLE9BQU87Z0JBQ3BDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FDakMsQ0FBQztZQUVGLElBQUksT0FBTyxHQUFHLFFBQVEsQ0FBQztZQUN2QixJQUFJLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDbkIsT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUM7WUFDM0IsQ0FBQztpQkFBTSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7Z0JBQzlDLE9BQU8sR0FBRyxJQUFJLENBQUM7WUFDakIsQ0FBQztpQkFBTSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7Z0JBQ2hELE9BQU8sR0FBRyxNQUFNLENBQUM7WUFDbkIsQ0FBQztpQkFBTSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQ2pELE9BQU8sR0FBRyxPQUFPLENBQUM7WUFDcEIsQ0FBQztZQUVELElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztnQkFDckIsTUFBTSxTQUFTLENBQUMsYUFBYSxFQUFFO29CQUM3QixNQUFNLEVBQUUsTUFBTTtvQkFDZCxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQzt3QkFDbkIsT0FBTyxFQUFFLE9BQU87d0JBQ2hCLE1BQU0sRUFBRSxNQUFNO3dCQUNkLElBQUksRUFBRSxXQUFXLENBQUMsT0FBTzt3QkFDekIsS0FBSyxFQUFFLEVBQUU7d0JBQ1QsRUFBRSxFQUFFLFdBQVcsQ0FBQyxPQUFPLEdBQUcsR0FBRyxHQUFHLE9BQU87cUJBQ3hDLENBQUM7b0JBQ0YsT0FBTyxFQUFFO3dCQUNQLGNBQWMsRUFBRSxrQkFBa0I7cUJBQ25DO2lCQUNGLENBQUMsQ0FBQztZQUNMLENBQUM7WUFFRCxJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7WUFDakIsTUFBTSxnQkFBZ0IsR0FBRyxHQUFHLEVBQUUsQ0FDNUIsYUFBYSxDQUNYLDRCQUE0QixRQUFRLElBQUksU0FBUyxDQUFDLE1BQU0sR0FBRyxDQUM1RCxDQUFDO1lBQ0osZ0JBQWdCLEVBQUUsQ0FBQztZQUVuQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsWUFBb0IsRUFBRSxFQUFFO2dCQUMzQyxNQUFNLFFBQVEsR0FBRyxJQUFBLG1CQUFXLEVBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ25FLElBQUksZUFBZSxFQUFFLENBQUM7b0JBQ3BCLE1BQU0sYUFBYSxHQUFHLGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUMvQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ1IsS0FBSyxDQUFDLElBQUksS0FBSyxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUM7d0JBQzFDLEtBQUssQ0FBQyxRQUFRLEtBQUssUUFBUSxDQUM5QixDQUFDO29CQUNGLElBQUksYUFBYSxFQUFFLENBQUM7d0JBQ2xCLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsMEJBQTBCLENBQUMsQ0FBQzt3QkFDOUQsUUFBUSxJQUFJLENBQUMsQ0FBQzt3QkFDZCxnQkFBZ0IsRUFBRSxDQUFDO3dCQUNuQixPQUFPO29CQUNULENBQUM7Z0JBQ0gsQ0FBQztnQkFDRCxDQUFDLENBQUMsNkJBQTZCLEVBQUUsWUFBWSxDQUFDLENBQUM7Z0JBQy9DLE1BQU0sWUFBWSxHQUFHLElBQUksbUJBQVEsRUFBRSxDQUFDO2dCQUNwQyxZQUFZLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDcEMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsR0FBRyxXQUFXLENBQUMsT0FBTyxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUM7Z0JBQ25FLFlBQVksQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUMxQyx3REFBd0Q7Z0JBQ3hELE1BQU0sV0FBVyxHQUFHO29CQUNsQixXQUFXLEVBQUUsa0JBQUUsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSTtpQkFDNUMsQ0FBQztnQkFDRixZQUFZLENBQUMsTUFBTSxDQUNqQixNQUFNLEVBQ04sa0JBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZLENBQUMsRUFDakMsV0FBVyxDQUNaLENBQUM7Z0JBRUYsTUFBTSxTQUFTLENBQUMsV0FBVyxFQUFFO29CQUMzQixNQUFNLEVBQUUsTUFBTTtvQkFDZCxJQUFJLEVBQUUsWUFBWTtvQkFDbEIsT0FBTyxFQUFFLFlBQVksQ0FBQyxVQUFVLEVBQUU7aUJBQ25DLENBQUMsQ0FBQztnQkFDSCxDQUFDLENBQUMsOEJBQThCLEVBQUUsWUFBWSxDQUFDLENBQUM7Z0JBQ2hELFFBQVEsSUFBSSxDQUFDLENBQUM7Z0JBQ2QsZ0JBQWdCLEVBQUUsQ0FBQztZQUNyQixDQUFDLENBQUMsQ0FDSCxDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7Q0FDRjtBQTFJRCwrQkEwSUM7QUFFUSxvQ0FBWSJ9
|
|
128
|
+
export { PublisherERS };
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHVibGlzaGVyRVJTLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1B1Ymxpc2hlckVSUy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFFN0IsT0FBTyxFQUNMLGFBQWEsR0FFZCxNQUFNLGdDQUFnQyxDQUFDO0FBRXhDLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLFFBQVEsTUFBTSxXQUFXLENBQUM7QUFDakMsT0FBTyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBSTFCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBd0I5QyxNQUFNLG1CQUFtQixHQUFHLEtBQUssRUFDL0IsR0FBZ0MsRUFDaEMsSUFBa0IsRUFDQyxFQUFFO0lBQ3JCLE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUN0QyxJQUFJLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNkLHdDQUF3QztRQUN4QyxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0NBQXdDLE1BQU0sQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLEdBQUcsR0FBRyxDQUN4RSxDQUFDO0lBQ0osQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUN6QixRQUF1QixFQUN2QixJQUFlLEVBQ1AsRUFBRTtJQUNWLFFBQVEsUUFBUSxFQUFFLENBQUM7UUFDakIsS0FBSyxRQUFRO1lBQ1gsT0FBTyxJQUFJLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztRQUNuRCxLQUFLLE9BQU87WUFDVixPQUFPLElBQUksS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMs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
|
package/package.json
CHANGED
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron-forge/publisher-electron-release-server",
|
|
3
|
-
"version": "8.0.0-alpha.
|
|
3
|
+
"version": "8.0.0-alpha.6",
|
|
4
|
+
"type": "module",
|
|
4
5
|
"description": "Electron release server publisher for Electron Forge",
|
|
5
6
|
"repository": "https://github.com/electron/forge",
|
|
6
7
|
"author": "Samuel Attard",
|
|
7
8
|
"license": "MIT",
|
|
8
|
-
"
|
|
9
|
+
"exports": "./dist/PublisherERS.js",
|
|
9
10
|
"typings": "dist/PublisherERS.d.ts",
|
|
10
11
|
"devDependencies": {
|
|
11
12
|
"msw": "^2.7.0",
|
|
12
13
|
"vitest": "^4.0.14"
|
|
13
14
|
},
|
|
14
15
|
"engines": {
|
|
15
|
-
"node": ">=
|
|
16
|
+
"node": ">= 22.12.0"
|
|
16
17
|
},
|
|
17
18
|
"dependencies": {
|
|
18
|
-
"@electron-forge/publisher-base": "8.0.0-alpha.
|
|
19
|
-
"@electron-forge/shared-types": "8.0.0-alpha.
|
|
19
|
+
"@electron-forge/publisher-base": "8.0.0-alpha.6",
|
|
20
|
+
"@electron-forge/shared-types": "8.0.0-alpha.6",
|
|
20
21
|
"debug": "^4.3.1",
|
|
21
22
|
"form-data": "^4.0.0",
|
|
22
|
-
"fs-extra": "^10.0.0"
|
|
23
|
-
"node-fetch": "^2.6.7"
|
|
23
|
+
"fs-extra": "^10.0.0"
|
|
24
24
|
},
|
|
25
25
|
"publishConfig": {
|
|
26
26
|
"access": "public"
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"dist",
|
|
30
30
|
"src"
|
|
31
31
|
],
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "5663b5277a9be2506f2b605be5f4cc1143a4b670"
|
|
33
33
|
}
|
package/src/PublisherERS.ts
CHANGED
|
@@ -8,9 +8,8 @@ import { ForgeArch, ForgePlatform } from '@electron-forge/shared-types';
|
|
|
8
8
|
import debug from 'debug';
|
|
9
9
|
import FormData from 'form-data';
|
|
10
10
|
import fs from 'fs-extra';
|
|
11
|
-
import fetch, { RequestInfo, RequestInit, Response } from 'node-fetch';
|
|
12
11
|
|
|
13
|
-
import { PublisherERSConfig } from './Config';
|
|
12
|
+
import { PublisherERSConfig } from './Config.js';
|
|
14
13
|
|
|
15
14
|
const d = debug('electron-forge:publish:ers');
|
|
16
15
|
|
|
@@ -37,17 +36,18 @@ interface ERSVersionSorted {
|
|
|
37
36
|
}
|
|
38
37
|
|
|
39
38
|
const fetchAndCheckStatus = async (
|
|
40
|
-
url:
|
|
39
|
+
url: Parameters<typeof fetch>[0],
|
|
41
40
|
init?: RequestInit,
|
|
42
41
|
): Promise<Response> => {
|
|
43
42
|
const result = await fetch(url, init);
|
|
44
43
|
if (result.ok) {
|
|
45
44
|
// res.status >= 200 && res.status < 300
|
|
46
45
|
return result;
|
|
46
|
+
} else {
|
|
47
|
+
throw new Error(
|
|
48
|
+
`ERS publish failed with status code: ${result.status} (${result.url})`,
|
|
49
|
+
);
|
|
47
50
|
}
|
|
48
|
-
throw new Error(
|
|
49
|
-
`ERS publish failed with status code: ${result.status} (${result.url})`,
|
|
50
|
-
);
|
|
51
51
|
};
|
|
52
52
|
|
|
53
53
|
export const ersPlatform = (
|
|
@@ -85,7 +85,7 @@ export default class PublisherERS extends PublisherBase<PublisherERSConfig> {
|
|
|
85
85
|
|
|
86
86
|
const api = (apiPath: string) => `${config.baseUrl}/${apiPath}`;
|
|
87
87
|
|
|
88
|
-
const { token } = await (
|
|
88
|
+
const { token } = (await (
|
|
89
89
|
await fetchAndCheckStatus(api('api/auth/login'), {
|
|
90
90
|
method: 'POST',
|
|
91
91
|
body: JSON.stringify({
|
|
@@ -96,7 +96,7 @@ export default class PublisherERS extends PublisherBase<PublisherERSConfig> {
|
|
|
96
96
|
'Content-Type': 'application/json',
|
|
97
97
|
},
|
|
98
98
|
})
|
|
99
|
-
).json();
|
|
99
|
+
).json()) as { token: string };
|
|
100
100
|
|
|
101
101
|
const authFetch = (apiPath: string, options?: RequestInit) =>
|
|
102
102
|
fetchAndCheckStatus(api(apiPath), {
|
|
@@ -116,9 +116,9 @@ export default class PublisherERS extends PublisherBase<PublisherERSConfig> {
|
|
|
116
116
|
path.basename(artifactPath).toLowerCase() !== 'releases',
|
|
117
117
|
);
|
|
118
118
|
|
|
119
|
-
const versions
|
|
119
|
+
const versions = (await (
|
|
120
120
|
await authFetch('versions/sorted')
|
|
121
|
-
).json();
|
|
121
|
+
).json()) as ERSVersionSorted;
|
|
122
122
|
|
|
123
123
|
// Find the version with the same name and flavor
|
|
124
124
|
const existingVersion = versions['items'].find(
|