@jbrowse/img 1.6.5 → 1.6.6

package/dist/index.js

@@ -16,10 +16,24 @@ var _renderRegion = require("./renderRegion");
 
 var _tmp = _interopRequireDefault(require("tmp"));
 
+require("abortcontroller-polyfill/dist/abortcontroller-polyfill-only");
+
 var _child_process = require("child_process");
 
 /* eslint-disable no-console */
-// eslint-disable-next-line no-unused-expressions
+var err = console.error;
+
+console.error = function () {
+  var _args$;
+
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  return (_args$ = args[0]) !== null && _args$ !== void 0 && _args$.match('useLayoutEffect') ? null : err(args);
+}; // eslint-disable-next-line no-unused-expressions
+
+
 _yargs.default.command('jb2export', 'Creates a jbrowse 2 image snapshot').option('config', {
   description: 'Path to config file',
   type: 'string'
@@ -94,67 +108,96 @@ function time(_x) {
 }
 
 function _time() {
-  _time = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(cb) {
+  _time = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(cb) {
     var start, ret;
-    return _regenerator.default.wrap(function _callee$(_context) {
+    return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context.prev = _context.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
             start = +Date.now();
-            _context.next = 3;
+            _context2.next = 3;
             return cb();
 
           case 3:
-            ret = _context.sent;
+            ret = _context2.sent;
             console.log("Finished rendering: ".concat((+Date.now() - start) / 1000, "s"));
-            return _context.abrupt("return", ret);
+            return _context2.abrupt("return", ret);
 
           case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee);
+    }, _callee2);
   }));
   return _time.apply(this, arguments);
 }
 
 var args = (0, _parseArgv.standardizeArgv)((0, _parseArgv.parseArgv)(process.argv.slice(2)), ['bam', 'cram', 'vcfgz', 'hic', 'bigwig', 'bigbed', 'bedgz', 'gffgz', 'configtracks']);
-time(function () {
-  return (0, _renderRegion.renderRegion)(args).then(function (result) {
-    var outfile = args.out || 'out.svg';
-
-    if (outfile.endsWith('.png')) {
-      var tmpobj = _tmp.default.fileSync({
-        mode: 420,
-        prefix: 'prefix-',
-        postfix: '.svg'
-      });
-
-      _fs.default.writeFileSync(tmpobj.name, result);
-
-      var ls = (0, _child_process.spawnSync)('rsvg-convert', ['-w', args.pngwidth || 2048, tmpobj.name, '-o', outfile]);
-      console.log("rsvg-convert stderr: ".concat(ls.stderr.toString()));
-      console.log("rsvg-convert stdout: ".concat(ls.stdout.toString()));
-
-      _fs.default.unlinkSync(tmpobj.name);
-    } else if (outfile.endsWith('.pdf')) {
-      var _tmpobj = _tmp.default.fileSync({
-        mode: 420,
-        prefix: 'prefix-',
-        postfix: '.svg'
-      });
-
-      _fs.default.writeFileSync(_tmpobj.name, result);
-
-      var _ls = (0, _child_process.spawnSync)('rsvg-convert', ['-w', args.pngwidth || 2048, _tmpobj.name, '-f', 'pdf', '-o', outfile]);
-
-      console.log("rsvg-convert stderr: ".concat(_ls.stderr.toString()));
-      console.log("rsvg-convert stdout: ".concat(_ls.stdout.toString()));
-
-      _fs.default.unlinkSync(_tmpobj.name);
-    } else {
-      _fs.default.writeFileSync(outfile, result);
+time( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+  var result, outfile, tmpobj, ls, _tmpobj, _ls;
+
+  return _regenerator.default.wrap(function _callee$(_context) {
+    while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return (0, _renderRegion.renderRegion)(args);
+
+        case 3:
+          result = _context.sent;
+          outfile = args.out || 'out.svg';
+
+          if (outfile.endsWith('.png')) {
+            tmpobj = _tmp.default.fileSync({
+              mode: 420,
+              prefix: 'prefix-',
+              postfix: '.svg'
+            });
+
+            _fs.default.writeFileSync(tmpobj.name, result);
+
+            ls = (0, _child_process.spawnSync)('rsvg-convert', ['-w', args.pngwidth || 2048, tmpobj.name, '-o', outfile]);
+            console.log("rsvg-convert stderr: ".concat(ls.stderr.toString()));
+            console.log("rsvg-convert stdout: ".concat(ls.stdout.toString()));
+
+            _fs.default.unlinkSync(tmpobj.name);
+          } else if (outfile.endsWith('.pdf')) {
+            _tmpobj = _tmp.default.fileSync({
+              mode: 420,
+              prefix: 'prefix-',
+              postfix: '.svg'
+            });
+
+            _fs.default.writeFileSync(_tmpobj.name, result);
+
+            _ls = (0, _child_process.spawnSync)('rsvg-convert', ['-w', args.pngwidth || 2048, _tmpobj.name, '-f', 'pdf', '-o', outfile]);
+            console.log("rsvg-convert stderr: ".concat(_ls.stderr.toString()));
+            console.log("rsvg-convert stdout: ".concat(_ls.stdout.toString()));
+
+            _fs.default.unlinkSync(_tmpobj.name);
+          } else {
+            _fs.default.writeFileSync(outfile, result);
+          } // manually exit the process after done rendering because autoruns or
+          // something similar otherwise keeps the nodejs process alive xref
+          // https://github.com/GMOD/jb2export/issues/6
+
+
+          process.exit(0);
+          _context.next = 13;
+          break;
+
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](0);
+          console.error(_context.t0);
+          process.exit(1);
+
+        case 13:
+        case "end":
+          return _context.stop();
+      }
     }
-  }, console.error);
-});
+  }, _callee, null, [[0, 9]]);
+})));

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@jbrowse/img",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "main": "index.js",
   "author": "JBrowse Team",
   "license": "Apache-2.0",
-  "engines": ">=16",
+  "engines": {
+    "node": ">=14"
+  },
   "bin": {
     "jb2export": "./dist/bin.js"
   },
@@ -26,8 +28,9 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@jbrowse/plugin-linear-genome-view": "^1.6.5",
-    "@jbrowse/react-linear-genome-view": "^1.6.5",
+    "@jbrowse/plugin-linear-genome-view": "^1.6.6",
+    "@jbrowse/react-linear-genome-view": "^1.6.6",
+    "abortcontroller-polyfill": "^1.7.3",
     "mobx": "^5.10.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
@@ -37,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab41f017840ffef09f5d60b008281cedaa5abe26"
+  "gitHead": "9fcca7793af0df2d6e527ddaace2b368c8ed2879"
 }