diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 77469f2ea7..66c5ca4827 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -17,15 +17,12 @@ ], "dependencies": { "rgrove-lazyload": "*", - "bootstrap-social": "~4.8.0", "angular-dynamic-locale": "~0.1.36", - "ng-file-upload": "~12.2.13", "tinymce": "~4.7.1", "codemirror": "~5.3.0", "angular-local-storage": "~0.7.1", "moment": "~2.10.3", "ace-builds": "~1.3.0", - "font-awesome": "~4.2", "angular-ui-sortable": "0.14.4" }, "install": { @@ -54,8 +51,7 @@ "tinymce": [ "bower_components/tinymce/tinymce.min.js" ], - "rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js", - "ng-file-upload": "bower_components/ng-file-upload/ng-file-upload.min.js" + "rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js" } }, "devDependencies": { diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index f71b37c7c8..6eaa01f822 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -157,14 +157,6 @@ gulp.task('dependencies', function () { { base: "./bower_components/tinymce/" }) .pipe(gulp.dest(root + targets.lib + "/tinymce")) ); - - //font-awesome - stream.add( - gulp.src(["./bower_components/font-awesome/fonts/*", - "./bower_components/font-awesome/css/font-awesome.min.css"], - { base: "./bower_components/font-awesome/" }) - .pipe(gulp.dest(root + targets.lib + "/font-awesome")) - ); // ace Editor stream.add( @@ -251,6 +243,11 @@ gulp.task('dependencies', function () { "src": ["./node_modules/animejs/anime.min.js"], "base": "./node_modules/animejs" }, + { + "name": "bootstrap-social", + "src": ["./node_modules/bootstrap-social/bootstrap-social.css"], + "base": "./node_modules/bootstrap-social" + }, { "name": "clipboard", "src": ["./node_modules/clipboard/dist/clipboard.min.js"], @@ -269,6 +266,14 @@ gulp.task('dependencies', function () { ], "base": "./node_modules/flatpickr/dist" }, + { + "name": "font-awesome", + "src": [ + "./node_modules/font-awesome/fonts/*", + "./node_modules/font-awesome/css/font-awesome.min.css" + ], + "base": "./node_modules/font-awesome" + }, { "name": "jquery", "src": [ @@ -285,7 +290,7 @@ gulp.task('dependencies', function () { { "name": "jquery-ui", "src": ["./node_modules/jquery-ui/jquery-ui.min.js"], - "base": "./node_modules/jquery" + "base": "./node_modules/jquery-ui" }, { "name": "jquery-validate", @@ -297,6 +302,11 @@ gulp.task('dependencies', function () { "src": ["./node_modules/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"], "base": "./node_modules/jquery-validation-unobtrusive/dist" }, + { + "name": "ng-file-upload", + "src": ["./node_modules/ng-file-upload/dist/ng-file-upload.min.js"], + "base": "./node_modules/ng-file-upload/dist" + }, { "name": "signalr", "src": ["./node_modules/signalr/jquery.signalR.js"], diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index a8b457b834..bc7f94c6e0 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -1733,6 +1733,27 @@ "hoek": "2.x.x" } }, + "bootstrap": { + "version": "3.3.7", + "resolved": "http://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + }, + "bootstrap-social": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/bootstrap-social/-/bootstrap-social-4.8.0.tgz", + "integrity": "sha1-ZtRj3JZtbbQH37mTNR1YxTSqLHo=", + "requires": { + "bootstrap": "~3", + "font-awesome": "~4.3" + }, + "dependencies": { + "font-awesome": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.3.0.tgz", + "integrity": "sha1-RO63kM35hmQnhvM/znhHZPGEHEA=" + } + } + }, "bower": { "version": "1.8.4", "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz", @@ -5279,6 +5300,11 @@ } } }, + "font-awesome": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.2.0.tgz", + "integrity": "sha1-RzOKGgF9pr75XOLhsOF2go/Yreo=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -10004,6 +10030,11 @@ "dev": true, "optional": true }, + "ng-file-upload": { + "version": "12.2.13", + "resolved": "https://registry.npmjs.org/ng-file-upload/-/ng-file-upload-12.2.13.tgz", + "integrity": "sha1-AYAPOHLlJvlTEPhHfpnk8S0NjRQ=" + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index ec40e64ece..ea36b3577b 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -14,14 +14,17 @@ "angular-sanitize": "1.7.5", "angular-touch": "1.7.5", "animejs": "2.2.0", + "bootstrap-social": "4.8.0", "clipboard": "2.0.0", "diff": "3.4.0", "flatpickr": "4.5.2", + "font-awesome": "4.2.0", "jquery": "2.2.4", "jquery-migrate": "1.4.0", "jquery-ui": "1.12.1", "jquery-validation": "1.17.0", "jquery-validation-unobtrusive": "3.2.10", + "ng-file-upload": "12.2.13", "npm": "^6.4.1", "signalr": "2.2.1", "typeahead.js": "0.10.5",