Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dependency on npm #1269

Merged
merged 2 commits into from
Feb 8, 2020
Merged

Remove dependency on npm #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e26762
Remove dependency on npm
Hirse Jan 31, 2020
87261bf
Fix testing api
Hirse Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 27 additions & 33 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const Bluebird = require('bluebird');
const browserify = require('browserify');
const childProcess = require('child_process');
const cliColor = require('ansi-color');
const electronPackager = require('electron-packager');
const path = require('path');
const fs = require('./source/utils/fs-async');
const npm = require('npm');
const pkgVersions = require('pkg-versions');
const semver = require('semver');
const browserify = require('browserify');
const electronPackager = require('electron-packager');
const Bluebird = require('bluebird');
const cliColor = require('ansi-color');
const fs = require('./source/utils/fs-async');
const maxConcurrency = 5;

module.exports = (grunt) => {
Expand Down Expand Up @@ -302,21 +302,17 @@ module.exports = (grunt) => {
});

const bumpDependency = (packageJson, packageName) => {
return new Bluebird((resolve, reject) => {
const dependencyType = packageJson['dependencies'][packageName] ? 'dependencies' : 'devDependencies';
let currentVersion = packageJson[dependencyType][packageName];
if (currentVersion[0] == '~' || currentVersion[0] == '^') currentVersion = currentVersion.slice(1);
npm.commands.show([packageName, 'versions'], true, (err, data) => {
if(err) reject(err);
const versions = data[Object.keys(data)[0]].versions.filter((v) => {
return v.indexOf('alpha') == -1;
});
const latestVersion = versions[versions.length - 1];
if (semver.gt(latestVersion, currentVersion)) {
packageJson[dependencyType][packageName] = '~' + latestVersion;
}
resolve();
const dependencyType = packageJson['dependencies'][packageName] ? 'dependencies' : 'devDependencies';
let currentVersion = packageJson[dependencyType][packageName];
if (currentVersion[0] == '~' || currentVersion[0] == '^') currentVersion = currentVersion.slice(1);
return pkgVersions(packageName).then((versionSet) => {
const versions = Array.from(versionSet).reverse();
const latestVersion = versions.find((version) => {
return semver.prerelease(version) === null;
});
if (semver.gt(latestVersion, currentVersion)) {
packageJson[dependencyType][packageName] = '~' + latestVersion;
}
});
};

Expand Down Expand Up @@ -400,22 +396,20 @@ module.exports = (grunt) => {
grunt.registerTask('bumpdependencies', 'Bump dependencies to their latest versions.', function() {
const done = this.async();
grunt.log.writeln('Bumping dependencies...');
npm.load(() => {
const tempPackageJson = JSON.parse(JSON.stringify(packageJson));
const keys = Object.keys(tempPackageJson.dependencies).concat(Object.keys(tempPackageJson.devDependencies));

const bumps = Bluebird.map(keys, (dep) => {
// winston 3.x has different API
if (dep == 'winston') return;
const tempPackageJson = JSON.parse(JSON.stringify(packageJson));
const keys = Object.keys(tempPackageJson.dependencies).concat(Object.keys(tempPackageJson.devDependencies));

return bumpDependency(tempPackageJson, dep);
});
const bumps = Bluebird.map(keys, (dep) => {
// winston 3.x has different API
if (dep == 'winston') return;

Bluebird.all(bumps).then(() => {
fs.writeFileSync('package.json', `${JSON.stringify(tempPackageJson, null, 2)}\n`);
grunt.log.writeln('Dependencies bumped, run npm install to install latest versions.');
}).then(() => { done(); }).catch(done);
return bumpDependency(tempPackageJson, dep);
});

Bluebird.all(bumps).then(() => {
fs.writeFileSync('package.json', `${JSON.stringify(tempPackageJson, null, 2)}\n`);
grunt.log.writeln('Dependencies bumped, run npm install to install latest versions.');
}).then(() => { done(); }).catch(done);
});

grunt.registerMultiTask('electron', 'Package Electron apps', function() {
Expand Down
Loading