@electron-forge/publisher-nucleus 6.0.0-beta.7 → 6.0.0-beta.70

package/README.md

@@ -1,23 +1,28 @@
-# Nucleus
+## publisher-nucleus
 
-The Nucleus target publishes all your artifacts to an instance of Nucleus Update Server, this update service supports all three platforms.  Check out the README at [`atlassian/github`](https://github.com/atlassian/nucleus) for more information on this project.
+`@electron-forge/publisher-nucleus` publishes all your artifacts to an instance of Nucleus Update Server where users will be able to download them. This update service supports all three platforms.
 
-Configuration options are documented in [`PublisherNucleusConfig`](https://js.electronforge.io/publisher/nucleus/interfaces/publishernucleusconfig.html)
+Check out the README at [`atlassian/nucleus`](https://github.com/atlassian/nucleus) for more information on this project.
 
-⚠️ <b>We recommend you set the `token` option using an environment variable, don't hard code it into your config
-</b>
+Configuration options are documented in [`Publisher
+NucleusConfig](https://js.electronforge.io/interfaces/_electron_forge_publisher_nucleus.PublisherNucleusConfig.html).
 
-### Usage
 
-```javascript
-{
-  name: '@electron-forge/publisher-nucleus',
-  config: {
-    host: 'https://my-nucleus.mysite.com'
-    appId: 1,
-    channelId: 'abcdefg',
-    token: 'my-token'
-  }
+```javascript title=forge.config.js
+module.exports = {
+  // ...
+  publishers: [
+    {
+      name: '@electron-forge/publisher-nucleus',
+      config: {
+        host: 'https://my-nucleus.mysite.com',
+        appId: 1,
+        channelId: 'abcdefg',
+        token: 'my-token'
+      }
+    }
+  ]
 }
 ```
 
+We recommend you set the `token`option using an environment variable, don't hard code into in your config.

package/dist/Config.d.ts

@@ -16,3 +16,4 @@ export interface PublisherNucleusConfig {
      */
     token: string;
 }
+//# sourceMappingURL=Config.d.ts.map

package/dist/Config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf"}

package/dist/Config.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
 
-require("source-map-support/register");
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/PublisherNucleus.d.ts

@@ -1,6 +1,9 @@
-import PublisherBase, { PublisherOptions } from '@electron-forge/publisher-base';
+import { PublisherBase, PublisherOptions } from '@electron-forge/publisher-base';
 import { PublisherNucleusConfig } from './Config';
 export default class PublisherNucleus extends PublisherBase<PublisherNucleusConfig> {
     name: string;
-    publish({makeResults}: PublisherOptions): Promise<void>;
+    private collapseMakeResults;
+    publish({ makeResults }: PublisherOptions): Promise<void>;
 }
+export { PublisherNucleus, PublisherNucleusConfig };
+//# sourceMappingURL=PublisherNucleus.d.ts.map

package/dist/PublisherNucleus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PublisherNucleus.d.ts","sourceRoot":"","sources":["../src/PublisherNucleus.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAIlD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC;IACjF,IAAI,SAAa;IAEjB,OAAO,CAAC,mBAAmB,CAazB;IAEI,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqChE;AAED,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/PublisherNucleus.js

@@ -1,137 +1,81 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _publisherBase = _interopRequireDefault(require("@electron-forge/publisher-base"));
-
+Object.defineProperty(exports, "PublisherNucleusConfig", {
+    enumerable: true,
+    get: function() {
+        return _config.PublisherNucleusConfig;
+    }
+});
+exports.PublisherNucleus = exports.default = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
 var _asyncOra = require("@electron-forge/async-ora");
-
+var _publisherBase = require("@electron-forge/publisher-base");
 var _debug = _interopRequireDefault(require("debug"));
-
 var _formData = _interopRequireDefault(require("form-data"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; }
-
-const d = (0, _debug.default)('electron-forge:publish:nucleus');
-
-class PublisherNucleus extends _publisherBase.default {
-  constructor(...args) {
-    var _temp;
-
-    return _temp = super(...args), Object.defineProperty(this, "name", {
-      configurable: true,
-      enumerable: true,
-      writable: true,
-      value: 'nucleus'
-    }), _temp;
-  }
-
-  publish({
-    makeResults
-  }) {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      const config = _this.config;
-      var _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
-
-      try {
-        for (var _iterator = makeResults.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          const _step$value = _slicedToArray(_step.value, 2),
-                i = _step$value[0],
-                makeResult = _step$value[1];
-
-          const msg = `Uploading result (${i}/${makeResults.length})`;
-          d(msg);
-          yield (0, _asyncOra.asyncOra)(msg,
-          /*#__PURE__*/
-          _asyncToGenerator(function* () {
-            const data = new _formData.default();
-            data.append('platform', makeResult.platform);
-            data.append('arch', makeResult.arch);
-            data.append('version', makeResult.packageJSON.version);
-            let i = 0;
-            var _iteratorNormalCompletion2 = true;
-            var _didIteratorError2 = false;
-            var _iteratorError2 = undefined;
-
-            try {
-              for (var _iterator2 = makeResult.artifacts[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-                const artifactPath = _step2.value;
-                // Skip the RELEASES file, it is automatically generated on the server
-                if (_path.default.basename(artifactPath).toLowerCase() === 'releases') continue;
-                data.append('file' + i, _fs.default.createReadStream(artifactPath));
-                i += 1;
-              }
-            } catch (err) {
-              _didIteratorError2 = true;
-              _iteratorError2 = err;
-            } finally {
-              try {
-                if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-                  _iterator2.return();
+var _config = require("./Config");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const d = (0, _debug).default('electron-forge:publish:nucleus');
+class PublisherNucleus extends _publisherBase.PublisherBase {
+    async publish({ makeResults  }) {
+        const { config  } = this;
+        const collapsedResults = this.collapseMakeResults(makeResults);
+        for (const [resultIdx, makeResult] of collapsedResults.entries()){
+            const msg = `Uploading result (${resultIdx + 1}/${collapsedResults.length})`;
+            d(msg);
+            await (0, _asyncOra).asyncOra(msg, async ()=>{
+                const data = new _formData.default();
+                data.append('platform', makeResult.platform);
+                data.append('arch', makeResult.arch);
+                data.append('version', makeResult.packageJSON.version);
+                let artifactIdx = 0;
+                for (const artifactPath of makeResult.artifacts){
+                    // Skip the RELEASES file, it is automatically generated on the server
+                    if (_path.default.basename(artifactPath).toLowerCase() === 'releases') continue;
+                    data.append(`file${artifactIdx}`, _fs.default.createReadStream(artifactPath));
+                    artifactIdx += 1;
                 }
-              } finally {
-                if (_didIteratorError2) {
-                  throw _iteratorError2;
+                const response = await (0, _nodeFetch).default(`${config.host}/rest/app/${config.appId}/channel/${config.channelId}/upload`, {
+                    headers: {
+                        Authorization: config.token
+                    },
+                    method: 'POST',
+                    body: data
+                });
+                if (response.status !== 200) {
+                    throw new Error(`Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${await response.text()}`);
                 }
-              }
-            }
-
-            const response = yield (0, _nodeFetch.default)(`${config.host}/rest/app/${config.appId}/channel/${config.channelId}/upload`, {
-              headers: {
-                Authorization: config.token
-              },
-              method: 'POST',
-              body: data
             });
-
-            if (response.status !== 200) {
-              throw `Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${yield response.text()}`;
-            }
-          }));
         }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
-      }
-    })();
-  }
-
+    }
+    constructor(...args){
+        super(...args);
+        this.name = 'nucleus';
+        this.collapseMakeResults = (makeResults)=>{
+            const newMakeResults = [];
+            for (const result of makeResults){
+                const existingResult = newMakeResults.find((nResult)=>nResult.arch === result.arch && nResult.platform === result.platform && nResult.packageJSON.version === result.packageJSON.version
+                );
+                if (existingResult) {
+                    existingResult.artifacts.push(...result.artifacts);
+                } else {
+                    newMakeResults.push({
+                        ...result
+                    });
+                }
+            }
+            return newMakeResults;
+        };
+    }
 }
-
 exports.default = PublisherNucleus;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9QdWJsaXNoZXJOdWNsZXVzLnRzIl0sIm5hbWVzIjpbImQiLCJQdWJsaXNoZXJOdWNsZXVzIiwiUHVibGlzaGVyQmFzZSIsInB1Ymxpc2giLCJtYWtlUmVzdWx0cyIsImNvbmZpZyIsImVudHJpZXMiLCJpIiwibWFrZVJlc3VsdCIsIm1zZyIsImxlbmd0aCIsImRhdGEiLCJGb3JtRGF0YSIsImFwcGVuZCIsInBsYXRmb3JtIiwiYXJjaCIsInBhY2thZ2VKU09OIiwidmVyc2lvbiIsImFydGlmYWN0cyIsImFydGlmYWN0UGF0aCIsInBhdGgiLCJiYXNlbmFtZSIsInRvTG93ZXJDYXNlIiwiZnMiLCJjcmVhdGVSZWFkU3RyZWFtIiwicmVzcG9uc2UiLCJob3N0IiwiYXBwSWQiLCJjaGFubmVsSWQiLCJoZWFkZXJzIiwiQXV0aG9yaXphdGlvbiIsInRva2VuIiwibWV0aG9kIiwiYm9keSIsInN0YXR1cyIsInRleHQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUVBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOzs7Ozs7Ozs7Ozs7OztBQUlBLE1BQU1BLElBQUksb0JBQU0sZ0NBQU4sQ0FBVjs7QUFFZSxNQUFNQyxnQkFBTixTQUErQkMsc0JBQS9CLENBQXFFO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLGFBQzNFO0FBRDJFO0FBQUE7O0FBRzVFQyxTQUFOLENBQWM7QUFBRUM7QUFBRixHQUFkLEVBQWlEO0FBQUE7O0FBQUE7QUFBQSxZQUN2Q0MsTUFEdUMsR0FDNUIsS0FENEIsQ0FDdkNBLE1BRHVDO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBRy9DLDZCQUE4QkQsWUFBWUUsT0FBWixFQUE5Qiw4SEFBcUQ7QUFBQTtBQUFBLGdCQUF6Q0MsQ0FBeUM7QUFBQSxnQkFBdENDLFVBQXNDOztBQUNuRCxnQkFBTUMsTUFBTyxxQkFBb0JGLENBQUUsSUFBR0gsWUFBWU0sTUFBTyxHQUF6RDtBQUNBVixZQUFFUyxHQUFGO0FBRUEsZ0JBQU0sd0JBQVNBLEdBQVQ7QUFBQTtBQUFBLDRCQUFjLGFBQVk7QUFDOUIsa0JBQU1FLE9BQU8sSUFBSUMsaUJBQUosRUFBYjtBQUNBRCxpQkFBS0UsTUFBTCxDQUFZLFVBQVosRUFBd0JMLFdBQVdNLFFBQW5DO0FBQ0FILGlCQUFLRSxNQUFMLENBQVksTUFBWixFQUFvQkwsV0FBV08sSUFBL0I7QUFDQUosaUJBQUtFLE1BQUwsQ0FBWSxTQUFaLEVBQXVCTCxXQUFXUSxXQUFYLENBQXVCQyxPQUE5QztBQUVBLGdCQUFJVixJQUFJLENBQVI7QUFOOEI7QUFBQTtBQUFBOztBQUFBO0FBTzlCLG9DQUEyQkMsV0FBV1UsU0FBdEMsbUlBQWlEO0FBQUEsc0JBQXRDQyxZQUFzQztBQUMvQztBQUNBLG9CQUFJQyxjQUFLQyxRQUFMLENBQWNGLFlBQWQsRUFBNEJHLFdBQTVCLE9BQThDLFVBQWxELEVBQThEO0FBQzlEWCxxQkFBS0UsTUFBTCxDQUFZLFNBQVNOLENBQXJCLEVBQXdCZ0IsWUFBR0MsZ0JBQUgsQ0FBb0JMLFlBQXBCLENBQXhCO0FBQ0FaLHFCQUFLLENBQUw7QUFDRDtBQVo2QjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOztBQWM5QixrQkFBTWtCLGlCQUFpQix3QkFBTyxHQUFFcEIsT0FBT3FCLElBQUssYUFBWXJCLE9BQU9zQixLQUFNLFlBQVd0QixPQUFPdUIsU0FBVSxTQUExRSxFQUFvRjtBQUN6R0MsdUJBQVM7QUFDUEMsK0JBQWV6QixPQUFPMEI7QUFEZixlQURnRztBQUl6R0Msc0JBQVEsTUFKaUc7QUFLekdDLG9CQUFNdEI7QUFMbUcsYUFBcEYsQ0FBdkI7O0FBUUEsZ0JBQUljLFNBQVNTLE1BQVQsS0FBb0IsR0FBeEIsRUFBNkI7QUFDM0Isb0JBQU8sMENBQXlDVCxTQUFTUyxNQUFPLGNBQTFELE1BQTZFVCxTQUFTVSxJQUFULEVBQWdCLEVBQW5HO0FBQ0Q7QUFDRixXQXpCSyxFQUFOO0FBMEJEO0FBakM4QztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFrQ2hEOztBQXJDaUYiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUHVibGlzaGVyQmFzZSwgeyBQdWJsaXNoZXJPcHRpb25zIH0gZnJvbSAnQGVsZWN0cm9uLWZvcmdlL3B1Ymxpc2hlci1iYXNlJztcbmltcG9ydCB7IGFzeW5jT3JhIH0gZnJvbSAnQGVsZWN0cm9uLWZvcmdlL2FzeW5jLW9yYSc7XG5pbXBvcnQgeyBGb3JnZVBsYXRmb3JtLCBGb3JnZUFyY2ggfSBmcm9tICdAZWxlY3Ryb24tZm9yZ2Uvc2hhcmVkLXR5cGVzJztcbmltcG9ydCBkZWJ1ZyBmcm9tICdkZWJ1Zyc7XG5pbXBvcnQgRm9ybURhdGEgZnJvbSAnZm9ybS1kYXRhJztcbmltcG9ydCBmcyBmcm9tICdmcyc7XG5pbXBvcnQgZmV0Y2ggZnJvbSAnbm9kZS1mZXRjaCc7XG5pbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcblxuaW1wb3J0IHsgUHVibGlzaGVyTnVjbGV1c0NvbmZpZyB9IGZyb20gJy4vQ29uZmlnJztcblxuY29uc3QgZCA9IGRlYnVnKCdlbGVjdHJvbi1mb3JnZTpwdWJsaXNoOm51Y2xldXMnKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgUHVibGlzaGVyTnVjbGV1cyBleHRlbmRzIFB1Ymxpc2hlckJhc2U8UHVibGlzaGVyTnVjbGV1c0NvbmZpZz4ge1xuICBuYW1lID0gJ251Y2xldXMnO1xuXG4gIGFzeW5jIHB1Ymxpc2goeyBtYWtlUmVzdWx0cyB9OiBQdWJsaXNoZXJPcHRpb25zKSB7XG4gICAgY29uc3QgeyBjb25maWcgfSA9IHRoaXM7XG5cbiAgICBmb3IgKGNvbnN0IFtpLCBtYWtlUmVzdWx0XSBvZiBtYWtlUmVzdWx0cy5lbnRyaWVzKCkpIHtcbiAgICAgIGNvbnN0IG1zZyA9IGBVcGxvYWRpbmcgcmVzdWx0ICgke2l9LyR7bWFrZVJlc3VsdHMubGVuZ3RofSlgO1xuICAgICAgZChtc2cpO1xuXG4gICAgICBhd2FpdCBhc3luY09yYShtc2csIGFzeW5jICgpID0+IHtcbiAgICAgICAgY29uc3QgZGF0YSA9IG5ldyBGb3JtRGF0YSgpO1xuICAgICAgICBkYXRhLmFwcGVuZCgncGxhdGZvcm0nLCBtYWtlUmVzdWx0LnBsYXRmb3JtKTtcbiAgICAgICAgZGF0YS5hcHBlbmQoJ2FyY2gnLCBtYWtlUmVzdWx0LmFyY2gpO1xuICAgICAgICBkYXRhLmFwcGVuZCgndmVyc2lvbicsIG1ha2VSZXN1bHQucGFja2FnZUpTT04udmVyc2lvbik7XG5cbiAgICAgICAgbGV0IGkgPSAwO1xuICAgICAgICBmb3IgKGNvbnN0IGFydGlmYWN0UGF0aCBvZiBtYWtlUmVzdWx0LmFydGlmYWN0cykge1xuICAgICAgICAgIC8vIFNraXAgdGhlIFJFTEVBU0VTIGZpbGUsIGl0IGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIG9uIHRoZSBzZXJ2ZXJcbiAgICAgICAgICBpZiAocGF0aC5iYXNlbmFtZShhcnRpZmFjdFBhdGgpLnRvTG93ZXJDYXNlKCkgPT09ICdyZWxlYXNlcycpIGNvbnRpbnVlO1xuICAgICAgICAgIGRhdGEuYXBwZW5kKCdmaWxlJyArIGksIGZzLmNyZWF0ZVJlYWRTdHJlYW0oYXJ0aWZhY3RQYXRoKSk7XG4gICAgICAgICAgaSArPSAxO1xuICAgICAgICB9XG4gICAgXG4gICAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZmV0Y2goYCR7Y29uZmlnLmhvc3R9L3Jlc3QvYXBwLyR7Y29uZmlnLmFwcElkfS9jaGFubmVsLyR7Y29uZmlnLmNoYW5uZWxJZH0vdXBsb2FkYCwge1xuICAgICAgICAgIGhlYWRlcnM6IHtcbiAgICAgICAgICAgIEF1dGhvcml6YXRpb246IGNvbmZpZy50b2tlbixcbiAgICAgICAgICB9LFxuICAgICAgICAgIG1ldGhvZDogJ1BPU1QnLFxuICAgICAgICAgIGJvZHk6IGRhdGEsXG4gICAgICAgIH0pO1xuICAgICAgICBcbiAgICAgICAgaWYgKHJlc3BvbnNlLnN0YXR1cyAhPT0gMjAwKSB7XG4gICAgICAgICAgdGhyb3cgYFVuZXhwZWN0ZWQgcmVzcG9uc2UgY29kZSBmcm9tIE51Y2xldXM6ICR7cmVzcG9uc2Uuc3RhdHVzfVxcblxcbkJvZHk6XFxuJHthd2FpdCByZXNwb25zZS50ZXh0KCl9YDtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfVxuICB9XG59XG4iXX0=
+exports.PublisherNucleus = PublisherNucleus;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9QdWJsaXNoZXJOdWNsZXVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBmcyBmcm9tICdmcyc7XG5pbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcblxuaW1wb3J0IHsgYXN5bmNPcmEgfSBmcm9tICdAZWxlY3Ryb24tZm9yZ2UvYXN5bmMtb3JhJztcbmltcG9ydCB7IFB1Ymxpc2hlckJhc2UsIFB1Ymxpc2hlck9wdGlvbnMgfSBmcm9tICdAZWxlY3Ryb24tZm9yZ2UvcHVibGlzaGVyLWJhc2UnO1xuaW1wb3J0IGRlYnVnIGZyb20gJ2RlYnVnJztcbmltcG9ydCBGb3JtRGF0YSBmcm9tICdmb3JtLWRhdGEnO1xuaW1wb3J0IGZldGNoIGZyb20gJ25vZGUtZmV0Y2gnO1xuXG5pbXBvcnQgeyBQdWJsaXNoZXJOdWNsZXVzQ29uZmlnIH0gZnJvbSAnLi9Db25maWcnO1xuXG5jb25zdCBkID0gZGVidWcoJ2VsZWN0cm9uLWZvcmdlOnB1Ymxpc2g6bnVjbGV1cycpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBQdWJsaXNoZXJOdWNsZXVzIGV4dGVuZHMgUHVibGlzaGVyQmFzZTxQdWJsaXNoZXJOdWNsZXVzQ29uZmlnPiB7XG4gIG5hbWUgPSAnbnVjbGV1cyc7XG5cbiAgcHJpdmF0ZSBjb2xsYXBzZU1ha2VSZXN1bHRzID0gKG1ha2VSZXN1bHRzOiBQdWJsaXNoZXJPcHRpb25zWydtYWtlUmVzdWx0cyddKSA9PiB7XG4gICAgY29uc3QgbmV3TWFrZVJlc3VsdHM6IHR5cGVvZiBtYWtlUmVzdWx0cyA9IFtdO1xuICAgIGZvciAoY29uc3QgcmVzdWx0IG9mIG1ha2VSZXN1bHRzKSB7XG4gICAgICBjb25zdCBleGlzdGluZ1Jlc3VsdCA9IG5ld01ha2VSZXN1bHRzLmZpbmQoXG4gICAgICAgIChuUmVzdWx0KSA9PiBuUmVzdWx0LmFyY2ggPT09IHJlc3VsdC5hcmNoICYmIG5SZXN1bHQucGxhdGZvcm0gPT09IHJlc3VsdC5wbGF0Zm9ybSAmJiBuUmVzdWx0LnBhY2thZ2VKU09OLnZlcnNpb24gPT09IHJlc3VsdC5wYWNrYWdlSlNPTi52ZXJzaW9uXG4gICAgICApO1xuICAgICAgaWYgKGV4aXN0aW5nUmVzdWx0KSB7XG4gICAgICAgIGV4aXN0aW5nUmVzdWx0LmFydGlmYWN0cy5wdXNoKC4uLnJlc3VsdC5hcnRpZmFjdHMpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgbmV3TWFrZVJlc3VsdHMucHVzaCh7IC4uLnJlc3VsdCB9KTtcbiAgICAgIH1cbiAgICB9XG4gICAgcmV0dXJuIG5ld01ha2VSZXN1bHRzO1xuICB9O1xuXG4gIGFzeW5jIHB1Ymxpc2goeyBtYWtlUmVzdWx0cyB9OiBQdWJsaXNoZXJPcHRpb25zKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgY29uc3QgeyBjb25maWcgfSA9IHRoaXM7XG5cbiAgICBjb25zdCBjb2xsYXBzZWRSZXN1bHRzID0gdGhpcy5jb2xsYXBzZU1ha2VSZXN1bHRzKG1ha2VSZXN1bHRzKTtcblxuICAgIGZvciAoY29uc3QgW3Jlc3VsdElkeCwgbWFrZVJlc3VsdF0gb2YgY29sbGFwc2VkUmVzdWx0cy5lbnRyaWVzKCkpIHtcbiAgICAgIGNvbnN0IG1zZyA9IGBVcGxvYWRpbmcgcmVzdWx0ICgke3Jlc3VsdElkeCArIDF9LyR7Y29sbGFwc2VkUmVzdWx0cy5sZW5ndGh9KWA7XG4gICAgICBkKG1zZyk7XG5cbiAgICAgIGF3YWl0IGFzeW5jT3JhKG1zZywgYXN5bmMgKCkgPT4ge1xuICAgICAgICBjb25zdCBkYXRhID0gbmV3IEZvcm1EYXRhKCk7XG4gICAgICAgIGRhdGEuYXBwZW5kKCdwbGF0Zm9ybScsIG1ha2VSZXN1bHQucGxhdGZvcm0pO1xuICAgICAgICBkYXRhLmFwcGVuZCgnYXJjaCcsIG1ha2VSZXN1bHQuYXJjaCk7XG4gICAgICAgIGRhdGEuYXBwZW5kKCd2ZXJzaW9uJywgbWFrZVJlc3VsdC5wYWNrYWdlSlNPTi52ZXJzaW9uKTtcblxuICAgICAgICBsZXQgYXJ0aWZhY3RJZHggPSAwO1xuICAgICAgICBmb3IgKGNvbnN0IGFydGlmYWN0UGF0aCBvZiBtYWtlUmVzdWx0LmFydGlmYWN0cykge1xuICAgICAgICAgIC8vIFNraXAgdGhlIFJFTEVBU0VTIGZpbGUsIGl0IGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIG9uIHRoZSBzZXJ2ZXJcbiAgICAgICAgICBpZiAocGF0aC5iYXNlbmFtZShhcnRpZmFjdFBhdGgpLnRvTG93ZXJDYXNlKCkgPT09ICdyZWxlYXNlcycpIGNvbnRpbnVlO1xuICAgICAgICAgIGRhdGEuYXBwZW5kKGBmaWxlJHthcnRpZmFjdElkeH1gLCBmcy5jcmVhdGVSZWFkU3RyZWFtKGFydGlmYWN0UGF0aCkpO1xuICAgICAgICAgIGFydGlmYWN0SWR4ICs9IDE7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKGAke2NvbmZpZy5ob3N0fS9yZXN0L2FwcC8ke2NvbmZpZy5hcHBJZH0vY2hhbm5lbC8ke2NvbmZpZy5jaGFubmVsSWR9L3VwbG9hZGAsIHtcbiAgICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICAgICBBdXRob3JpemF0aW9uOiBjb25maWcudG9rZW4sXG4gICAgICAgICAgfSxcbiAgICAgICAgICBtZXRob2Q6ICdQT1NUJyxcbiAgICAgICAgICBib2R5OiBkYXRhLFxuICAgICAgICB9KTtcblxuICAgICAgICBpZiAocmVzcG9uc2Uuc3RhdHVzICE9PSAyMDApIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYFVuZXhwZWN0ZWQgcmVzcG9uc2UgY29kZSBmcm9tIE51Y2xldXM6ICR7cmVzcG9uc2Uuc3RhdHVzfVxcblxcbkJvZHk6XFxuJHthd2FpdCByZXNwb25zZS50ZXh0KCl9YCk7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgeyBQdWJsaXNoZXJOdWNsZXVzLCBQdWJsaXNoZXJOdWNsZXVzQ29uZmlnIH07XG4iXSwibmFtZXMiOlsiUHVibGlzaGVyTnVjbGV1c0NvbmZpZyIsImQiLCJkZWJ1ZyIsIlB1Ymxpc2hlck51Y2xldXMiLCJQdWJsaXNoZXJCYXNlIiwicHVibGlzaCIsIm1ha2VSZXN1bHRzIiwiY29uZmlnIiwiY29sbGFwc2VkUmVzdWx0cyIsImNvbGxhcHNlTWFrZVJlc3VsdHMiLCJyZXN1bHRJZHgiLCJtYWtlUmVzdWx0IiwiZW50cmllcyIsIm1zZyIsImxlbmd0aCIsImFzeW5jT3JhIiwiZGF0YSIsIkZvcm1EYXRhIiwiYXBwZW5kIiwicGxhdGZvcm0iLCJhcmNoIiwicGFja2FnZUpTT04iLCJ2ZXJzaW9uIiwiYXJ0aWZhY3RJZHgiLCJhcnRpZmFjdFBhdGgiLCJhcnRpZmFjdHMiLCJwYXRoIiwiYmFzZW5hbWUiLCJ0b0xvd2VyQ2FzZSIsImZzIiwiY3JlYXRlUmVhZFN0cmVhbSIsInJlc3BvbnNlIiwiZmV0Y2giLCJob3N0IiwiYXBwSWQiLCJjaGFubmVsSWQiLCJoZWFkZXJzIiwiQXV0aG9yaXphdGlvbiIsInRva2VuIiwibWV0aG9kIiwiYm9keSIsInN0YXR1cyIsIkVycm9yIiwidGV4dCIsIm5hbWUiLCJuZXdNYWtlUmVzdWx0cyIsInJlc3VsdCIsImV4aXN0aW5nUmVzdWx0IiwiZmluZCIsIm5SZXN1bHQiLCJwdXNoIl0sIm1hcHBpbmdzIjoiOzs7OytCQXNFMkJBLENBQXNCOzs7ZUFBdEJBLE9BQXNCOzs7O0FBdEVsQyxHQUFJLENBQUosR0FBSTtBQUNGLEdBQU0sQ0FBTixLQUFNO0FBRUUsR0FBMkIsQ0FBM0IsU0FBMkI7QUFDSixHQUFnQyxDQUFoQyxjQUFnQztBQUM5RCxHQUFPLENBQVAsTUFBTztBQUNKLEdBQVcsQ0FBWCxTQUFXO0FBQ2QsR0FBWSxDQUFaLFVBQVk7QUFFUyxHQUFVLENBQVYsT0FBVTs7Ozs7O0FBRWpELEtBQUssQ0FBQ0MsQ0FBQyxPQUFHQyxNQUFLLFVBQUMsQ0FBZ0M7TUFFM0JDLGdCQUFnQixTQUFTQyxjQUFhO1VBa0JuREMsT0FBTyxDQUFDLENBQUMsQ0FBQ0MsV0FBVyxFQUFtQixDQUFDLEVBQWlCLENBQUM7UUFDL0Qs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

package/index.ts

@@ -0,0 +1,5 @@
+// ⚠️ AUTOGENERATED ⚠️ AUTOGENERATED ⚠️ AUTOGENERATED ⚠️
+// This file was automatically generated by `tools/gen-ts-glue.ts`. Do not modify directly if you want to keep your changes.
+export * from "./src/PublisherNucleus";
+import defaultExport from "./src/PublisherNucleus";
+export default defaultExport;

package/package.json

@@ -1,28 +1,25 @@
 {
   "name": "@electron-forge/publisher-nucleus",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.70",
   "description": "Nucleus publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherNucleus.js",
   "typings": "dist/PublisherNucleus.d.ts",
-  "scripts": {
-    "test": "exit 0"
-  },
   "devDependencies": {
-    "chai": "^4.0.0",
-    "mocha": "^5.0.0"
+    "chai": "^4.3.3",
+    "mocha": "^9.0.1"
   },
   "engines": {
-    "node": ">= 6.0"
+    "node": ">= 14.17.5"
   },
   "dependencies": {
-    "@electron-forge/async-ora": "6.0.0-beta.7",
-    "@electron-forge/publisher-base": "6.0.0-beta.7",
-    "@electron-forge/shared-types": "6.0.0-beta.7",
-    "debug": "^3.0.0",
-    "form-data": "^2.1.4",
-    "node-fetch": "^2.0.0"
+    "@electron-forge/async-ora": "6.0.0-beta.70",
+    "@electron-forge/publisher-base": "6.0.0-beta.70",
+    "@electron-forge/shared-types": "6.0.0-beta.70",
+    "debug": "^4.3.1",
+    "form-data": "^4.0.0",
+    "node-fetch": "^2.6.7"
   }
 }

package/src/PublisherNucleus.ts

@@ -1,11 +1,11 @@
-import PublisherBase, { PublisherOptions } from '@electron-forge/publisher-base';
+import fs from 'fs';
+import path from 'path';
+
 import { asyncOra } from '@electron-forge/async-ora';
-import { ForgePlatform, ForgeArch } from '@electron-forge/shared-types';
+import { PublisherBase, PublisherOptions } from '@electron-forge/publisher-base';
 import debug from 'debug';
 import FormData from 'form-data';
-import fs from 'fs';
 import fetch from 'node-fetch';
-import path from 'path';
 
 import { PublisherNucleusConfig } from './Config';
 
@@ -14,11 +14,28 @@ const d = debug('electron-forge:publish:nucleus');
 export default class PublisherNucleus extends PublisherBase<PublisherNucleusConfig> {
   name = 'nucleus';
 
-  async publish({ makeResults }: PublisherOptions) {
+  private collapseMakeResults = (makeResults: PublisherOptions['makeResults']) => {
+    const newMakeResults: typeof makeResults = [];
+    for (const result of makeResults) {
+      const existingResult = newMakeResults.find(
+        (nResult) => nResult.arch === result.arch && nResult.platform === result.platform && nResult.packageJSON.version === result.packageJSON.version
+      );
+      if (existingResult) {
+        existingResult.artifacts.push(...result.artifacts);
+      } else {
+        newMakeResults.push({ ...result });
+      }
+    }
+    return newMakeResults;
+  };
+
+  async publish({ makeResults }: PublisherOptions): Promise<void> {
     const { config } = this;
 
-    for (const [i, makeResult] of makeResults.entries()) {
-      const msg = `Uploading result (${i}/${makeResults.length})`;
+    const collapsedResults = this.collapseMakeResults(makeResults);
+
+    for (const [resultIdx, makeResult] of collapsedResults.entries()) {
+      const msg = `Uploading result (${resultIdx + 1}/${collapsedResults.length})`;
       d(msg);
 
       await asyncOra(msg, async () => {
@@ -27,14 +44,14 @@ export default class PublisherNucleus extends PublisherBase<PublisherNucleusConf
         data.append('arch', makeResult.arch);
         data.append('version', makeResult.packageJSON.version);
 
-        let i = 0;
+        let artifactIdx = 0;
         for (const artifactPath of makeResult.artifacts) {
           // Skip the RELEASES file, it is automatically generated on the server
           if (path.basename(artifactPath).toLowerCase() === 'releases') continue;
-          data.append('file' + i, fs.createReadStream(artifactPath));
-          i += 1;
+          data.append(`file${artifactIdx}`, fs.createReadStream(artifactPath));
+          artifactIdx += 1;
         }
-    
+
         const response = await fetch(`${config.host}/rest/app/${config.appId}/channel/${config.channelId}/upload`, {
           headers: {
             Authorization: config.token,
@@ -42,11 +59,13 @@ export default class PublisherNucleus extends PublisherBase<PublisherNucleusConf
           method: 'POST',
           body: data,
         });
-        
+
         if (response.status !== 200) {
-          throw `Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${await response.text()}`;
+          throw new Error(`Unexpected response code from Nucleus: ${response.status}\n\nBody:\n${await response.text()}`);
         }
       });
     }
   }
 }
+
+export { PublisherNucleus, PublisherNucleusConfig };

package/tsconfig.json

@@ -1,23 +1,42 @@
 {
-	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es6",
-		"outDir": "dist",
-		"lib": [
-			"es6",
-			"dom",
-			"es7"
-		],
-		"sourceMap": true,
-		"rootDir": "src",
-		"experimentalDecorators": true,
-		"strict": true,
-		"esModuleInterop": true,
-		"declaration": true
-	},
-	"exclude": [
-		"node_modules",
-		"dist",
-		"test"
-	]
+  "//": "⚠️ AUTOGENERATED ⚠️ This file was automatically generated by tools/gen-tsconfigs.ts, do not edit manually.",
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2019",
+    "outDir": "dist",
+    "lib": [
+      "dom",
+      "es2019"
+    ],
+    "sourceMap": true,
+    "rootDir": "src",
+    "experimentalDecorators": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "declaration": true,
+    "composite": true,
+    "declarationMap": true,
+    "typeRoots": [
+      "../../../typings",
+      "../../../node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "test",
+    "index.ts",
+    "tmpl"
+  ],
+  "references": [
+    {
+      "path": "../../utils/async-ora"
+    },
+    {
+      "path": "../base"
+    },
+    {
+      "path": "../../utils/types"
+    }
+  ]
 }