Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: quantumchainlabs/wavesplatform.core.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: AgateChain/Agate.core.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
7 contributors
Loading
84 changes: 7 additions & 77 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/*global module:false*/
module.exports = function (grunt) {

// Project configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
meta: {
@@ -10,7 +8,7 @@ module.exports = function (grunt) {
prod: ['src/**/*.js', '!src/**/*.spec.js'],
ordered: {
libraries: [
// this library doesn't work properly being included after angular
// This library doesn't work properly if included after Angular
'bower_components/js-sha3/src/sha3.js',

'bower_components/angular/angular.js',
@@ -27,9 +25,7 @@ module.exports = function (grunt) {
local: [
'src/vendor/blake2b.js',
'src/vendor/converters.js',
'src/vendor/extensions.js',

// project sources
'src/core/waves.money.js',
'src/core/core.module.js',
'src/core/core.constants.js',
@@ -43,6 +39,7 @@ module.exports = function (grunt) {
'src/core/crypto.service.js',
'src/core/asset.service.js',
'src/core/alias.request.service.js',
'src/core/unique.assets.request.service.js',
'src/core/leasing.request.service.js',
'src/core/api.service.js',
'src/core/utility.service.js',
@@ -57,14 +54,15 @@ module.exports = function (grunt) {
'src/core/matcher.api.service.js',
'src/core/datafeed.api.service.js',
'src/core/matcher.request.service.js',
'src/core/order.price.js'
'src/core/order.price.js',
'src/core/sign.service.js',
'src/core/validate.service.js'
]
}
},
editor: 'gedit --new-window -s ',
target: 'wavesplatform-core'
},
// Task configuration.
jshint: {
all: ['<%= meta.sources.all %>', '!src/vendor/*.js']
},
@@ -132,68 +130,9 @@ module.exports = function (grunt) {
}
}
},
clean: ['distr/**'],
bump: {
options: {
files: ['package.json', 'bower.json'],
updateConfigs: ['pkg'],
commit: true, // debug
push: 'branch', // debug
pushTo: 'origin',
createTag: false,
commitMessage: "chore(version): bumping version v%VERSION%",
}
},
shell: {
release: {
command: "<%= meta.editor %> distr/CHANGELOG.tmp"
}
},
conventionalChangelog: {
release: {
options: {
changelogOpts: {
// conventional-changelog options go here
preset: 'angular',
append: false,
releaseCount: 0
},
context: {
// context goes here
},
gitRawCommitsOpts: {
// git-raw-commits options go here
},
parserOpts: {
// conventional-commits-parser options go here
},
writerOpts: {
// conventional-changelog-writer options go here
}
},
src: 'distr/CHANGELOG.tmp'
}
},
"github-release": {
options: {
repository : "wavesplatform/wavesplatform.core.js",
auth: {
user: process.env["GITHUB_ACCESS_TOKEN"],
password: ''
},
release: {
tag_name: "v<%= pkg.version %>",
name: "v<%= pkg.version %>",
bodyFilename: 'distr/CHANGELOG.tmp',
draft: true,
prerelease: true
}
},
files: []
}
clean: ['distr/**']
});

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -203,18 +142,9 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-jscs');
grunt.loadNpmTasks('grunt-bump');
grunt.loadNpmTasks('waves-grunt-github-releaser');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-conventional-changelog');

grunt.registerTask('emptyChangelog', 'Creates an empty changelog', function() {
grunt.file.write('distr/CHANGELOG.tmp', '');
});

grunt.registerTask('distr', ['clean', 'build', 'emptyChangelog']);
grunt.registerTask('publish', ['distr', 'conventionalChangelog', 'shell', 'github-release']);
grunt.registerTask('distr', ['clean', 'build']);
grunt.registerTask('test', ['jshint', 'jscs', 'karma:development']);
grunt.registerTask('build', [
'jscs',
0 LICENSE → LICENSE.md
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# wavesplatform.core.js
Shared javascript components for access to waves nodes
### Shared Angular components for accessing the Agate nodes
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wavesplatform-core-js",
"version": "0.2.0",
"version": "0.3.0",
"dependencies": {
"angular": "~1.6.0",
"angular-loader": "~1.6.0",
Loading