From f86fc57f0bc739975eb7244456ef4183e10c4b96 Mon Sep 17 00:00:00 2001 From: rars Date: Tue, 14 Feb 2017 21:34:29 +0000 Subject: [PATCH 1/2] Remove bower dependencies from build process and move to package.json. --- bower.json | 8 +------- karma.conf.js | 12 ++++++------ package.json | 10 +++++++++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bower.json b/bower.json index 41a747d..32041ce 100644 --- a/bower.json +++ b/bower.json @@ -21,11 +21,5 @@ "bower_components", "Gruntfile.js", "test" - ], - "devDependencies": { - "angular-mocks": "~1.3.21", - "ckeditor": "#full/4.4.6", - "jquery": "~2.1.4", - "lodash": "~3.10.1" - } + ] } diff --git a/karma.conf.js b/karma.conf.js index 1bfee02..6b9f39f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -12,20 +12,20 @@ module.exports = function (config) { reporters: ['dots'], browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'], files: [ - 'bower_components/jquery/dist/jquery.js', - 'bower_components/angular/angular.js', - 'bower_components/ckeditor/ckeditor.js', + 'node_modules/jquery/dist/jquery.js', + 'node_modules/angular/angular.js', + 'node_modules/ckeditor/ckeditor.js', { - pattern: 'bower_components/ckeditor/**/*', + pattern: 'node_modules/ckeditor/**/*', watched: false, included: false, served: true }, - 'bower_components/lodash/lodash.js', + 'node_modules/lodash/index.js', 'node_modules/underscore.string/dist/underscore.string.js', - 'bower_components/angular-mocks/angular-mocks.js', + 'node_modules/angular-mocks/angular-mocks.js', 'node_modules/chai/chai.js', 'node_modules/chai-jquery/chai-jquery.js', 'node_modules/sinon/pkg/sinon.js', diff --git a/package.json b/package.json index 14679d3..604e79f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "description": "CKEditor directive for Angular.", "main": "angular-ckeditor.js", "scripts": { - "install": "bower install", "test": "./node_modules/karma/bin/karma start --single-run" }, "repository": { @@ -22,16 +21,25 @@ "url": "https://github.com/lemonde/angular-ckeditor/issues" }, "homepage": "https://github.com/lemonde/angular-ckeditor", + "peerDependencies": { + "angular": "1.x", + "ckeditor": "4.x" + }, "devDependencies": { + "angular": "^1.6.2", + "angular-mocks": "^1.6.2", "bower": "~1.7.2", "chai": "~3.4.1", "chai-jquery": "~2.0.0", + "ckeditor": "^4.6.2", "grunt": "~0.4.4", "grunt-contrib-uglify": "~0.11.0", + "jquery": "^3.1.1", "karma": "~0.13.18", "karma-chrome-launcher": "~0.2.2", "karma-firefox-launcher": "~0.1.7", "karma-mocha": "~0.2.1", + "lodash": "^3.10.1", "mocha": "~2.3.4", "sinon": "~1.17.2", "sinon-chai": "~2.8", From bc6474e08444bcfc2404994633c05de0de32622a Mon Sep 17 00:00:00 2001 From: rars Date: Tue, 14 Feb 2017 21:40:26 +0000 Subject: [PATCH 2/2] Updated dev dependencies versions. --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 604e79f..ae02ece 100644 --- a/package.json +++ b/package.json @@ -28,21 +28,21 @@ "devDependencies": { "angular": "^1.6.2", "angular-mocks": "^1.6.2", - "bower": "~1.7.2", - "chai": "~3.4.1", + "bower": "^1.8.0", + "chai": "^3.5.0", "chai-jquery": "~2.0.0", "ckeditor": "^4.6.2", - "grunt": "~0.4.4", - "grunt-contrib-uglify": "~0.11.0", + "grunt": "^1.0.1", + "grunt-contrib-uglify": "^2.1.0", "jquery": "^3.1.1", - "karma": "~0.13.18", - "karma-chrome-launcher": "~0.2.2", - "karma-firefox-launcher": "~0.1.7", - "karma-mocha": "~0.2.1", + "karma": "^1.4.1", + "karma-chrome-launcher": "^2.0.0", + "karma-firefox-launcher": "^1.0.0", + "karma-mocha": "^1.3.0", "lodash": "^3.10.1", - "mocha": "~2.3.4", + "mocha": "^3.2.0", "sinon": "~1.17.2", "sinon-chai": "~2.8", - "underscore.string": "~3.2.2" + "underscore.string": "^3.3.4" } }