From 7132f0cc31e0e237767eaf83193931ba0b7d3abe Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Wed, 29 Jun 2016 12:44:22 +0300 Subject: [PATCH 01/10] Initial commit for combined js files for #6 and #7 core.js output looks fine, but the LoB file has comments all over the place for some reason. --- .gitignore | 3 +++ Gruntfile.js | 12 +++++++-- build/config/all/combined-files.json | 40 ++++++++++++++++++++++++++++ package.json | 3 ++- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 build/config/all/combined-files.json diff --git a/.gitignore b/.gitignore index 300d0b30a..c0a94ca68 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ bower_components # Optional REPL history .node_repl_history + +#Build output +dist/js \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 64ad27ca2..5bbc9aa60 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,7 +61,8 @@ module.exports = function (grunt) { clean: { jshint: ["jshint"], jscs: ["jscs"], - tests: ["qunit", "coverage", "instrumentedFiles"] + tests: ["qunit", "coverage", "instrumentedFiles"], + build: ["dist/js/**/*"] }, coveralls: { // LCOV coverage file (can be string, glob or array) @@ -73,7 +74,8 @@ module.exports = function (grunt) { // coveralls.io is down). Optional, defaults to false. force: false } - } + }, + uglify: grunt.file.readJSON('build/config/all/combined-files.json') }); grunt.loadNpmTasks("grunt-contrib-clean"); @@ -81,6 +83,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks("grunt-jscs"); grunt.loadNpmTasks("grunt-qunit-istanbul"); grunt.loadNpmTasks("grunt-coveralls"); + grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.option("force", true ); @@ -167,4 +170,9 @@ module.exports = function (grunt) { grunt.task.run("hint", "jscs", "test"); } }); + + grunt.task.registerTask("build", "Combine output files and prepare output", function() { + grunt.task.run("clean:build"); + grunt.task.run("uglify:combine"); + }); }; \ No newline at end of file diff --git a/build/config/all/combined-files.json b/build/config/all/combined-files.json new file mode 100644 index 000000000..9e8cbaed6 --- /dev/null +++ b/build/config/all/combined-files.json @@ -0,0 +1,40 @@ +{ + "options": { + "preserveComments": "some" + }, + "combine": { + "files": { + "./dist/js/i18n/infragistics-en.js": "./src/js/modules/i18n/*-en.js", + "./dist/js/infragistics.core.js": [ + "./dist/js/i18n/infragistics-en.js", + "./src/js/modules/infragistics.util.js", + "./src/js/modules/infragistics.dataSource.js", + "./src/js/modules/infragistics.templating.js", + "./src/js/modules/infragistics.shared.js", + "./src/js/modules/infragistics.scroll.js" + ], + "./dist/js/infragistics.lob-lite.js": [ + "./src/js/modules/infragistics.ui.combo.js", + "./src/js/modules/infragistics.ui.dialog.js", + "./src/js/modules/infragistics.ui.popover.js", + "./src/js/modules/infragistics.ui.notifier.js", + "./src/js/modules/infragistics.ui.editors.js", + "./src/js/modules/infragistics.ui.tree.js", + "./src/js/modules/infragistics.ui.layoutmanager.js", + "./src/js/modules/infragistics.ui.splitter.js", + "./src/js/modules/infragistics.ui.splitbutton.js", + "./src/js/modules/infragistics.ui.rating.js", + "./src/js/modules/infragistics.ui.toolbarbutton.js", + "./src/js/modules/infragistics.ui.colorpicker.js", + "./src/js/modules/infragistics.ui.colorpickersplitbutton.js", + "./src/js/modules/infragistics.ui.toolbar.js", + "./src/js/modules/infragistics.ui.tilemanager.js", + "./src/js/modules/infragistics.ui.upload.js", + "./src/js/modules/infragistics.ui.validator.js", + "./src/js/modules/infragistics.ui.htmleditor.js", + "./src/js/modules/infragistics.ui.videoplayer.js", + "./src/js/modules/infragistics.ui.zoombar.js" + ] + } + } +} \ No newline at end of file diff --git a/package.json b/package.json index 1b30e9569..e938037a5 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,14 @@ "name": "ignite-ui", "version": "0.0.1", "scripts": { - "postinstall" : "bower install" + "postinstall": "bower install" }, "dependencies": {}, "devDependencies": { "grunt": "^0.4.5", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-jshint": "^1.0.0", + "grunt-contrib-uglify": "^1.0.1", "grunt-coveralls": "^1.0.1", "grunt-jscs": "^3.0.1", "grunt-qunit-istanbul": "^0.6.0" From 22b259a56dc551bc1c1c0af8bffaa67127bde643 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Wed, 29 Jun 2016 20:35:09 +0300 Subject: [PATCH 02/10] Fixing combined files output, #6 #7 Adding all locales Renaming core to core-lite as well Had an issue with uglify output similar to https://github.com/gruntjs/grunt-contrib-uglify/issues/366 I've verified now output is identical to the uglifyjs command used so far --- Gruntfile.js | 2 +- ...{combined-files.json => combined-files.js} | 27 ++++++++++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) rename build/config/all/{combined-files.json => combined-files.js} (69%) diff --git a/Gruntfile.js b/Gruntfile.js index 5bbc9aa60..4d10ba20c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -75,7 +75,7 @@ module.exports = function (grunt) { force: false } }, - uglify: grunt.file.readJSON('build/config/all/combined-files.json') + uglify: require('./build/config/all/combined-files.js') }); grunt.loadNpmTasks("grunt-contrib-clean"); diff --git a/build/config/all/combined-files.json b/build/config/all/combined-files.js similarity index 69% rename from build/config/all/combined-files.json rename to build/config/all/combined-files.js index 9e8cbaed6..d8f9b38a5 100644 --- a/build/config/all/combined-files.json +++ b/build/config/all/combined-files.js @@ -1,17 +1,18 @@ -{ +module.exports = { "options": { - "preserveComments": "some" + "preserveComments": /(?:^!|@(?:license|preserve|cc_on))/, + "compress": false, + "mangle": false }, "combine": { "files": { - "./dist/js/i18n/infragistics-en.js": "./src/js/modules/i18n/*-en.js", - "./dist/js/infragistics.core.js": [ + "./dist/js/infragistics.core-lite.js": [ "./dist/js/i18n/infragistics-en.js", "./src/js/modules/infragistics.util.js", "./src/js/modules/infragistics.dataSource.js", "./src/js/modules/infragistics.templating.js", - "./src/js/modules/infragistics.shared.js", - "./src/js/modules/infragistics.scroll.js" + "./src/js/modules/infragistics.ui.shared.js", + "./src/js/modules/infragistics.ui.scroll.js" ], "./dist/js/infragistics.lob-lite.js": [ "./src/js/modules/infragistics.ui.combo.js", @@ -37,4 +38,16 @@ ] } } -} \ No newline at end of file +}; +/** + * Prepare bundles for each localization + */ +var locales = ["bg", "de", "en", "es", "fr", "ja", "ru"], newFiles = {}, i; +for (var i = 0; i < locales.length; i++) { + newFiles["./dist/js/i18n/infragistics-" + locales[i] + ".js"] = "./src/js/modules/i18n/*-en.js"; +} +// keep order +for (var key in module.exports.combine.files) { + newFiles[key] = module.exports.combine.files[key]; +} +module.exports.combine.files = newFiles; \ No newline at end of file From 754611108d23f3bcf4044446285bcce50b6d9378 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Wed, 29 Jun 2016 22:24:01 +0300 Subject: [PATCH 03/10] Prepare copy of src files in dist for modules, #6 #7 Copy before uglify to fix license info TODO: copy bower/package.json(?) --- .gitignore | 3 +- Gruntfile.js | 27 ++++++++++++-- build/config/all/combined-files.js | 58 ++++++++++++++++-------------- package.json | 1 + 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index c0a94ca68..c09777363 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,5 @@ bower_components .node_repl_history #Build output -dist/js \ No newline at end of file +dist/js +dist/css \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 4d10ba20c..698fd2e61 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,6 @@ -var config = { +var buildVersion = require("./package.json").version, + year = new Date().getFullYear(), + config = { scripts: "src/js/**/*.js", scriptsDir: "src/js", modulesDir: "src/js/modules", @@ -75,6 +77,25 @@ module.exports = function (grunt) { force: false } }, + copy: { + js: { + expand: true, + cwd: './src/', + src: 'js/**/*.js', + dest: './dist/', + options: { + process: function (content, srcpath) { + return content.replace("", buildVersion).replace("", year); + } + }, + }, + css: { + expand: true, + cwd: './src/', + src: 'css/**', + dest: './dist/', + } + }, uglify: require('./build/config/all/combined-files.js') }); @@ -83,6 +104,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks("grunt-jscs"); grunt.loadNpmTasks("grunt-qunit-istanbul"); grunt.loadNpmTasks("grunt-coveralls"); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.option("force", true ); @@ -173,6 +195,7 @@ module.exports = function (grunt) { grunt.task.registerTask("build", "Combine output files and prepare output", function() { grunt.task.run("clean:build"); - grunt.task.run("uglify:combine"); + grunt.task.run("copy"); + grunt.task.run("uglify:combine"); }); }; \ No newline at end of file diff --git a/build/config/all/combined-files.js b/build/config/all/combined-files.js index d8f9b38a5..54cd14798 100644 --- a/build/config/all/combined-files.js +++ b/build/config/all/combined-files.js @@ -1,5 +1,9 @@ +var locales = ["bg", "de", "en", "es", "fr", "ja", "ru"], newFiles = {}, i; + module.exports = { "options": { + + // use the general "keep some" regexp "preserveComments": /(?:^!|@(?:license|preserve|cc_on))/, "compress": false, "mangle": false @@ -8,43 +12,43 @@ module.exports = { "files": { "./dist/js/infragistics.core-lite.js": [ "./dist/js/i18n/infragistics-en.js", - "./src/js/modules/infragistics.util.js", - "./src/js/modules/infragistics.dataSource.js", - "./src/js/modules/infragistics.templating.js", - "./src/js/modules/infragistics.ui.shared.js", - "./src/js/modules/infragistics.ui.scroll.js" + "./dist/js/modules/infragistics.util.js", + "./dist/js/modules/infragistics.dataSource.js", + "./dist/js/modules/infragistics.templating.js", + "./dist/js/modules/infragistics.ui.shared.js", + "./dist/js/modules/infragistics.ui.scroll.js" ], "./dist/js/infragistics.lob-lite.js": [ - "./src/js/modules/infragistics.ui.combo.js", - "./src/js/modules/infragistics.ui.dialog.js", - "./src/js/modules/infragistics.ui.popover.js", - "./src/js/modules/infragistics.ui.notifier.js", - "./src/js/modules/infragistics.ui.editors.js", - "./src/js/modules/infragistics.ui.tree.js", - "./src/js/modules/infragistics.ui.layoutmanager.js", - "./src/js/modules/infragistics.ui.splitter.js", - "./src/js/modules/infragistics.ui.splitbutton.js", - "./src/js/modules/infragistics.ui.rating.js", - "./src/js/modules/infragistics.ui.toolbarbutton.js", - "./src/js/modules/infragistics.ui.colorpicker.js", - "./src/js/modules/infragistics.ui.colorpickersplitbutton.js", - "./src/js/modules/infragistics.ui.toolbar.js", - "./src/js/modules/infragistics.ui.tilemanager.js", - "./src/js/modules/infragistics.ui.upload.js", - "./src/js/modules/infragistics.ui.validator.js", - "./src/js/modules/infragistics.ui.htmleditor.js", - "./src/js/modules/infragistics.ui.videoplayer.js", - "./src/js/modules/infragistics.ui.zoombar.js" + "./dist/js/modules/infragistics.ui.combo.js", + "./dist/js/modules/infragistics.ui.dialog.js", + "./dist/js/modules/infragistics.ui.popover.js", + "./dist/js/modules/infragistics.ui.notifier.js", + "./dist/js/modules/infragistics.ui.editors.js", + "./dist/js/modules/infragistics.ui.tree.js", + "./dist/js/modules/infragistics.ui.layoutmanager.js", + "./dist/js/modules/infragistics.ui.splitter.js", + "./dist/js/modules/infragistics.ui.splitbutton.js", + "./dist/js/modules/infragistics.ui.rating.js", + "./dist/js/modules/infragistics.ui.toolbarbutton.js", + "./dist/js/modules/infragistics.ui.colorpicker.js", + "./dist/js/modules/infragistics.ui.colorpickersplitbutton.js", + "./dist/js/modules/infragistics.ui.toolbar.js", + "./dist/js/modules/infragistics.ui.tilemanager.js", + "./dist/js/modules/infragistics.ui.upload.js", + "./dist/js/modules/infragistics.ui.validator.js", + "./dist/js/modules/infragistics.ui.htmleditor.js", + "./dist/js/modules/infragistics.ui.videoplayer.js", + "./dist/js/modules/infragistics.ui.zoombar.js" ] } } }; + /** * Prepare bundles for each localization */ -var locales = ["bg", "de", "en", "es", "fr", "ja", "ru"], newFiles = {}, i; for (var i = 0; i < locales.length; i++) { - newFiles["./dist/js/i18n/infragistics-" + locales[i] + ".js"] = "./src/js/modules/i18n/*-en.js"; + newFiles["./dist/js/i18n/infragistics-" + locales[i] + ".js"] = "./dist/js/modules/i18n/*-en.js"; } // keep order for (var key in module.exports.combine.files) { diff --git a/package.json b/package.json index e938037a5..4b972b2c8 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "devDependencies": { "grunt": "^0.4.5", "grunt-contrib-clean": "^1.0.0", + "grunt-contrib-copy": "^1.0.0", "grunt-contrib-jshint": "^1.0.0", "grunt-contrib-uglify": "^1.0.1", "grunt-coveralls": "^1.0.1", From 2c2eb7e0e60b2fd1d06367a3675ac3e6089870e9 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Wed, 29 Jun 2016 23:02:36 +0300 Subject: [PATCH 04/10] adding css min and combine task, #6 #7 --- Gruntfile.js | 16 +++++++++++++++- package.json | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 698fd2e61..163034d18 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -64,7 +64,7 @@ module.exports = function (grunt) { jshint: ["jshint"], jscs: ["jscs"], tests: ["qunit", "coverage", "instrumentedFiles"], - build: ["dist/js/**/*"] + build: ["dist/js/**/*", "dist/css/**/*"] }, coveralls: { // LCOV coverage file (can be string, glob or array) @@ -96,6 +96,19 @@ module.exports = function (grunt) { dest: './dist/', } }, + cssmin: { + all: { + files: [{ + expand: true, + cwd: 'dist/css/', + src: ['**/*.css', '!**/*.min.css'], + dest: 'dist/css' + }, + { + 'dist/css/structure/infragistics.css': ['dist/css/structure/modules/*.css'] + }] + } + }, uglify: require('./build/config/all/combined-files.js') }); @@ -106,6 +119,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks("grunt-coveralls"); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.option("force", true ); diff --git a/package.json b/package.json index 4b972b2c8..fd9422c02 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "grunt": "^0.4.5", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-jshint": "^1.0.0", "grunt-contrib-uglify": "^1.0.1", "grunt-coveralls": "^1.0.1", From adcd9b4b8b39f7838642f633328a2abfcf45440f Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Thu, 30 Jun 2016 09:48:20 +0300 Subject: [PATCH 05/10] rebase image urls of combined structure css --- Gruntfile.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 163034d18..a83a0ff21 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -103,8 +103,14 @@ module.exports = function (grunt) { cwd: 'dist/css/', src: ['**/*.css', '!**/*.min.css'], dest: 'dist/css' + }] + }, + structure: { + options: { + // relativeTo: './dist/css/structure/', + rebase: true }, - { + files: [{ 'dist/css/structure/infragistics.css': ['dist/css/structure/modules/*.css'] }] } @@ -210,6 +216,7 @@ module.exports = function (grunt) { grunt.task.registerTask("build", "Combine output files and prepare output", function() { grunt.task.run("clean:build"); grunt.task.run("copy"); - grunt.task.run("uglify:combine"); + grunt.task.run("uglify:combine"); + grunt.task.run("cssmin"); }); }; \ No newline at end of file From 060813823d363a2003edca607e79ce6a1786b6dc Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Thu, 30 Jun 2016 15:30:44 +0300 Subject: [PATCH 06/10] copying bower.json to dist for #7 and some cleanup --- .gitignore | 3 ++- Gruntfile.js | 16 ++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c09777363..0dc8a57ed 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,5 @@ bower_components #Build output dist/js -dist/css \ No newline at end of file +dist/css +dist/bower.json \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index a83a0ff21..9fd377bd8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -64,18 +64,11 @@ module.exports = function (grunt) { jshint: ["jshint"], jscs: ["jscs"], tests: ["qunit", "coverage", "instrumentedFiles"], - build: ["dist/js/**/*", "dist/css/**/*"] + build: ["dist/js/**/*", "dist/css/**/*", "dist/bower.json"] }, coveralls: { // LCOV coverage file (can be string, glob or array) - src: './coverage/reportLCOV/*.info', - // Options relevant to all targets - options: { - // When true, grunt-coveralls will only print a warning rather than - // an error, to prevent CI builds from failing unnecessarily (e.g. if - // coveralls.io is down). Optional, defaults to false. - force: false - } + src: './coverage/reportLCOV/*.info' }, copy: { js: { @@ -94,6 +87,10 @@ module.exports = function (grunt) { cwd: './src/', src: 'css/**', dest: './dist/', + }, + resources: { + src: 'bower.json', + dest: './dist/' } }, cssmin: { @@ -107,7 +104,6 @@ module.exports = function (grunt) { }, structure: { options: { - // relativeTo: './dist/css/structure/', rebase: true }, files: [{ From bca48f818ab8922694d3c148c1035357eb87c703 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Thu, 30 Jun 2016 16:04:36 +0300 Subject: [PATCH 07/10] also running uglify on all copied js files in dist --- Gruntfile.js | 2 +- build/config/all/combined-files.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9fd377bd8..e0d7f1c32 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -212,7 +212,7 @@ module.exports = function (grunt) { grunt.task.registerTask("build", "Combine output files and prepare output", function() { grunt.task.run("clean:build"); grunt.task.run("copy"); - grunt.task.run("uglify:combine"); + grunt.task.run("uglify"); grunt.task.run("cssmin"); }); }; \ No newline at end of file diff --git a/build/config/all/combined-files.js b/build/config/all/combined-files.js index 54cd14798..825e6486d 100644 --- a/build/config/all/combined-files.js +++ b/build/config/all/combined-files.js @@ -41,6 +41,15 @@ module.exports = { "./dist/js/modules/infragistics.ui.zoombar.js" ] } + }, + "all": { + files: [{ + expand: true, + cwd: 'dist/', + src: ['**/*.js', '**/*-lite.js'], + dest: 'dist/' + } + ] } }; From d22d928710f14f2efc1d8d1177bb3cd3bf466fe1 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Thu, 30 Jun 2016 17:43:07 +0300 Subject: [PATCH 08/10] copy readme to dist, add package.json for npm (#6) Also updating general fields in package.json --- .gitignore | 3 ++- Gruntfile.js | 2 +- dist/package.json | 25 +++++++++++++++++++++++++ package.json | 14 ++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 dist/package.json diff --git a/.gitignore b/.gitignore index 0dc8a57ed..61244a442 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ bower_components #Build output dist/js dist/css -dist/bower.json \ No newline at end of file +dist/bower.json +dist/README.md \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index e0d7f1c32..cb485f69a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -89,7 +89,7 @@ module.exports = function (grunt) { dest: './dist/', }, resources: { - src: 'bower.json', + src: ['bower.json', "README.md"], dest: './dist/' } }, diff --git a/dist/package.json b/dist/package.json new file mode 100644 index 000000000..d57c2d248 --- /dev/null +++ b/dist/package.json @@ -0,0 +1,25 @@ +{ + "name": "ignite-ui", + "version": "0.0.2-alpha.0", + "description": "Ignite UI by Infragistics", + "homepage": "http://www.igniteui.com/", + "repository": { + "type": "git", + "url": "https://github.com/IgniteUI/ignite-ui.git" + }, + "keywords": [ + "igniteui", + "ignite ui", + "infragistics", + "jquery controls", + "jquery widgets" + ], + "bugs": { + "url": "https://github.com/IgniteUI/ignite-ui/issues" + }, + "license": "Apache-2.0", + "peerDependencies": { + "jquery": "^2.2.4", + "jquery-ui": "^1.10.5" + } +} diff --git a/package.json b/package.json index fd9422c02..cee4f423b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,20 @@ { "name": "ignite-ui", "version": "0.0.1", + "description": "Ignite UI by Infragistics", + "homepage": "http://www.igniteui.com/", + "repository": { + "type": "git", + "url": "https://github.com/IgniteUI/ignite-ui.git" + }, + "keywords": [ + "igniteui", + "ignite ui", + "infragistics", + "jquery controls", + "jquery widgets" + ], + "license": "Apache-2.0", "scripts": { "postinstall": "bower install" }, From 25a14ec4c9546b7b7cdd5981eb42fb3f157417b0 Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Thu, 30 Jun 2016 18:58:27 +0300 Subject: [PATCH 09/10] add travis setup for npm #6 --- .travis.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bab7dade..5e92c75a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,22 @@ language: node_js node_js: - - "4" +- "4" before_install: - - npm install -g bower +- npm install -g bower before_script: - - npm install -g grunt +- npm install -g grunt script: - - grunt verify - - grunt coveralls \ No newline at end of file +- grunt verify +- grunt coveralls +after_success: +- grunt build +before_deploy: "cd dist" +deploy: + provider: npm + skip_cleanup: true + email: igniteui@infragistics.com + api_key: + secure: JeRvlOs2mLvzJHqtpVLvEtTVrZZqB4kufmz7+4RNk9XgzcSwXVbp5ZCpdYkZy/2HypJTjyryN98FuqCQo4cnmnkVS2phiejA9b9YVl3uFtCeFxGJJ4st/98UT3f7OrDgqFIh4v+MtzIS76+Erv2YmV8RBtEgoOpfCpuO5aBpi3oJR49iw8TN2dZwfyvUtb2ytMfzyR1q7xsl+Q0qYzwhX00BxVxGY6UkKF1VaRjsfGYrfC4FkpAT4u5mD+KtUMwRHGpMyQm1LYusS99+ugwOloq4gFArham/J/06tLwCXXjW/xhVH4HyQRiMZE649rl7TI/j88vZrGUKw16SQT+K/0+3sw4/BtwwlEjNiD1UIr97lRL7oFTZp/NYBs1PgNHd+xYGLnWA34NuUWlo9pviUz5U/mVaRVPZ5u1oLKHjPYX2VElE/GgqjQuj08il8rtRr7UHP0O5y0MPJ+t1WgWnivc0ISs+AHe+edLPoGAMHiK7vEcsM10y8z7Lfx7BbuWLFfv2eoWeruO1B0kEP+jeuognOBcyjSD/zKMfmosW/L+muhHCCPI1yDSmtutq24HVzktq0ggF9i5g4jTpH9kORBGKOirXuMP1Hf412IvzeQ71LK4A9W9z+mKje+9ygqrPDrbyYaclDiCrwOrAi3IGrpoi5F5ACdY13ObZpKG71RA= + on: + tags: true + repo: IgniteUI/ignite-ui From 0fc06ff9ec1f40a0cf29324da2c8fcfb6a1f199e Mon Sep 17 00:00:00 2001 From: Damyan Petev Date: Fri, 1 Jul 2016 14:03:50 +0300 Subject: [PATCH 10/10] also copying LICENSE to dist --- .gitignore | 3 ++- Gruntfile.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 61244a442..786199608 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,5 @@ bower_components dist/js dist/css dist/bower.json -dist/README.md \ No newline at end of file +dist/README.md +dist/LICENSE \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index d5d0fd117..2313ec8ab 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -89,7 +89,7 @@ module.exports = function (grunt) { dest: './dist/', }, resources: { - src: ['bower.json', "README.md"], + src: ['bower.json', "README.md", "LICENSE"], dest: './dist/' } },