From efefa54601333a4736dcdcf1ddd38d2c552cc7b5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 11 Oct 2018 13:26:21 +0200 Subject: [PATCH] remove all bower logic in gulp + remove bower.json --- src/Umbraco.Web.UI.Client/bower.json | 31 -------------------------- src/Umbraco.Web.UI.Client/gulpfile.js | 13 +++-------- src/Umbraco.Web.UI.Client/package.json | 1 - 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/bower.json diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json deleted file mode 100644 index f2c436008d..0000000000 --- a/src/Umbraco.Web.UI.Client/bower.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "umbraco", - "version": "7", - "homepage": "https://github.com/umbraco/Umbraco-CMS", - "authors": [ - "Shannon " - ], - "description": "Umbraco CMS", - "license": "MIT", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - }, - "install": { - "path": "lib-bower", - "ignore": [ - "font-awesome", - "bootstrap", - "codemirror", - "ace-builds" - ], - "sources": { - } - } -} diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index 9fd029d970..c9eb6eaca1 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -105,7 +105,6 @@ var sources = { less: "./src/less/**/*.less", js: "./src/*.js", lib: "./lib/**/*", - bower: "./lib-bower/**/*", assets: "./src/assets/**" } }; @@ -318,8 +317,8 @@ gulp.task('dependencies', function () { "base": "./node_modules/jquery-validation-unobtrusive/dist" }, { - "name": "rgrove-lazyload", - "src": ["./node_modules/lazyload-js/lazyload.js"], + "name": "lazyload-js", + "src": ["./node_modules/lazyload-js/lazyload-min.js"], "base": "./node_modules/lazyload-js" }, // TODO: We can optimize here: @@ -375,18 +374,12 @@ gulp.task('dependencies', function () { ); }); - //copy over libs which are not on bower (/lib) and - //libraries that have been managed by bower-installer (/lib-bower) + //copy over libs which are not on npm (/lib) stream.add( gulp.src(sources.globs.lib) .pipe(gulp.dest(root + targets.lib)) ); - stream.add( - gulp.src(sources.globs.bower) - .pipe(gulp.dest(root + targets.lib)) - ); - //Copies all static assets into /root / assets folder //css, fonts and image files stream.add( diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 74a7029ed3..713a85ddc1 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -1,6 +1,5 @@ { "scripts": { - "install": "bower-installer", "test": "karma start test/config/karma.conf.js --singlerun", "build": "gulp" },