Skip to content

Commit

Permalink
Updating build tools, changing bower.json to include contents of /lib
Browse files Browse the repository at this point in the history
  • Loading branch information
avoidwork committed Jan 31, 2017
1 parent 6cf027c commit 58003e2
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 27 deletions.
30 changes: 22 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module.exports = function (grunt) {
" * @author <%= pkg.author %>\n" +
" * @copyright <%= grunt.template.today('yyyy') %>\n" +
" * @license <%= pkg.license %>\n" +
" * @link <%= pkg.homepage %>\n" +
" * @version <%= pkg.version %>\n" +
" */\n"
},
Expand Down Expand Up @@ -45,11 +44,26 @@ module.exports = function (grunt) {
nodeunit : {
all : ["test/*.js"]
},
sed : {
"version" : {
pattern : "{{VERSION}}",
replacement : "<%= pkg.version %>",
path : ["<%= concat.dist.dest %>"]
replace: {
dist: {
options: {
patterns: [
{
match: /{{VERSION}}/,
replacement: '<%= pkg.version %>'
}
]
},
files: [
{
expand: true,
flatten: true,
src: [
"lib/<%= pkg.name %>.es6.js"
],
dest: 'lib/'
}
]
}
},
uglify: {
Expand Down Expand Up @@ -93,16 +107,16 @@ module.exports = function (grunt) {
});

// tasks
grunt.loadNpmTasks("grunt-sed");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-nodeunit");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-babel");
grunt.loadNpmTasks("grunt-eslint");
grunt.loadNpmTasks("grunt-replace");

// aliases
grunt.registerTask("test", ["eslint", "nodeunit"]);
grunt.registerTask("build", ["concat", "sed", "babel", "uglify"]);
grunt.registerTask("build", ["concat", "replace", "babel", "uglify"]);
grunt.registerTask("default", ["build", "test"]);
};
9 changes: 6 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@
"**/.*",
"node_modules",
"bower_components",
"lib/haro.es6.js",
"lib/haro.min.*",
"src",
"test",
"tests"
"tests",
"benchmark.js",
"Gruntfile.js",
".eslintrc",
".travis.yml",
".npmignore"
]
}
5 changes: 2 additions & 3 deletions lib/haro.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
* @author Jason Mulligan <jason.mulligan@avoidwork.com>
* @copyright 2017
* @license BSD-3-Clause
* @link https://github.com/avoidwork/haro
* @version 3.1.6
* @version 3.1.7
*/
"use strict";

Expand Down Expand Up @@ -1156,7 +1155,7 @@
}

factory.transform = cast;
factory.version = "3.1.6";
factory.version = "3.1.7";

// Node, AMD & window supported
if (typeof exports !== "undefined") {
Expand Down
5 changes: 2 additions & 3 deletions lib/haro.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
* @author Jason Mulligan <jason.mulligan@avoidwork.com>
* @copyright 2017
* @license BSD-3-Clause
* @link https://github.com/avoidwork/haro
* @version 3.1.6
* @version 3.1.7
*/
"use strict";

Expand Down Expand Up @@ -1386,7 +1385,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}

factory.transform = cast;
factory.version = "3.1.6";
factory.version = "3.1.7";

// Node, AMD & window supported
if (typeof exports !== "undefined") {
Expand Down
2 changes: 1 addition & 1 deletion lib/haro.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/haro.min.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haro",
"version": "3.1.6",
"version": "3.1.7",
"description": "Harō is a modern immutable DataStore",
"main": "lib/haro.es6.js",
"scripts": {
Expand Down Expand Up @@ -30,18 +30,18 @@
"node": ">=6.0.0"
},
"devDependencies": {
"babel-preset-es2015": "~6.18.0",
"grunt": "~0.4.5",
"grunt-babel": "^6.0.0",
"grunt-cli": "^0.1.13",
"babel-preset-es2015": "~6.22.0",
"grunt": "~1.0.1",
"grunt-babel": "~6.0.0",
"grunt-cli": "~1.2.0",
"grunt-contrib-concat": "~1.0.1",
"grunt-contrib-nodeunit": "~1.0.0",
"grunt-contrib-uglify": "~2.0.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-eslint": "~19.0.0",
"grunt-sed": "^0.1.1",
"precise": "^1.0.1",
"tenso": "~4.3.7"
"grunt-replace": "~1.0.1",
"precise": "~1.0.1",
"tenso": "~4.3.8"
},
"dependencies": {
"Blob": "~0.10.0",
Expand Down

0 comments on commit 58003e2

Please sign in to comment.