Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
fix ipaddrjs
Browse files Browse the repository at this point in the history
  • Loading branch information
Dustin Blackman committed Feb 13, 2018
1 parent ff619f0 commit bad77be
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"engines": {
"node": "6.9.1",
"npm": "3.10.9"
"npm": "3.10.10"
},
"author": "Dustin Blackman",
"license": "MIT",
Expand All @@ -38,7 +38,7 @@
"express": "4.16.2",
"fs-extra": "0.24.0",
"glob": "5.0.15",
"ipaddr.js": "1.5.4",
"ipaddr.js": "1.6.0",
"jquery": "3.1.1",
"marko": "3.12.1",
"moment": "^2.17.0",
Expand Down
7 changes: 7 additions & 0 deletions tasks/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ gulp.task('electron:deps', function(cb) {
const download_url = `https://raw.githubusercontent.com/dustinblackman/electron-runas-builds/master/compiled/${pkg.devDependencies.electron}/win32/ia32/runas.node`;
spawnAsync(npm, ['i', '--production', '--prefix', './dev'].concat(install_items))
.then(() => download(download_url, path.join(__dirname, '../dev/node_modules/runas/build/Release/runas.node'), true))
.then(() => {
console.log('Adding main fix to ipaddr.js');
const pkg_path = path.join(__dirname, '../dev/node_modules/ipaddr.js/package.json');
const ipaddr_pkg = require(pkg_path);
ipaddr_pkg.main = './lib/ipaddr.js';
fs.writeFileSync(pkg_path, JSON.stringify(ipaddr_pkg), null, 2);
})
.asCallback(cb);
});

Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2766,9 +2766,9 @@ ipaddr.js@1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"

ipaddr.js@1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.4.tgz#962263d9d26132956fc5c630b638a30d3cdffc14"
ipaddr.js@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"

irregular-plurals@^1.0.0:
version "1.3.0"
Expand Down

0 comments on commit bad77be

Please sign in to comment.