From bd20518d507a56719e2cb336800f8148f6e26da4 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 11 Oct 2018 12:16:09 +0200 Subject: [PATCH] move the last dependencies --- src/Umbraco.Web.UI.Client/bower.json | 5 ----- src/Umbraco.Web.UI.Client/gulpfile.js | 10 ++++++++++ src/Umbraco.Web.UI.Client/package-lock.json | 10 ++++++++++ src/Umbraco.Web.UI.Client/package.json | 2 ++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index d0e72f620d..f2c436008d 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -16,7 +16,6 @@ "tests" ], "dependencies": { - "rgrove-lazyload": "*" }, "install": { "path": "lib-bower", @@ -27,10 +26,6 @@ "ace-builds" ], "sources": { - "rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js" } - }, - "devDependencies": { - "angular-mocks": "~1.7.2" } } diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index a099db5040..609b6751d2 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -230,6 +230,11 @@ gulp.task('dependencies', function () { "src": ["./node_modules/angular-messages/angular-messages.js"], "base": "./node_modules/angular-messages" }, + { + "name": "angular-mocks", + "src": ["./node_modules/angular/angular-mocks.js"], + "base": "./node_modules/angular-mocks" + }, { "name": "animejs", "src": ["./node_modules/animejs/anime.min.js"], @@ -312,6 +317,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": "rgrove-lazyload", + "src": ["./node_modules/lazyload-js/lazyload.js"], + "base": "./node_modules/lazyload-js" + }, // TODO: We can optimize here: // we don't have to ship with the moment-with-locales libraries // we lazyload the user locale diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index e9d187d32d..125c07ae21 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -1004,6 +1004,11 @@ "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.7.5.tgz", "integrity": "sha512-YDpJpFLyrIgZjE/sIAjgww1y6r3QqXBJbNDI0QjftD37vHXLkwvAOo3A4bxPw8BikyGLcJrFrgf6hRAzntJIWA==" }, + "angular-mocks": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.5.tgz", + "integrity": "sha512-I+Ue2Bkx6R9W5178DYrNvzjIdGh4wKKoCWsgz8dc7ysH4mA70Q3M9v5xRF0RUu7r+2CZj+nDeUecvh2paxcYvg==" + }, "angular-route": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.5.tgz", @@ -8919,6 +8924,11 @@ "dev": true, "optional": true }, + "lazyload-js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazyload-js/-/lazyload-js-1.0.0.tgz", + "integrity": "sha1-jBA5sbaRec1J/cMkICOvSM4IOSU=" + }, "lazystream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 0c85091ae9..f63f09cf13 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -13,6 +13,7 @@ "angular-i18n": "1.7.5", "angular-local-storage": "0.7.1", "angular-messages": "1.7.5", + "angular-mocks": "1.7.5", "angular-route": "1.7.5", "angular-sanitize": "1.7.5", "angular-touch": "1.7.5", @@ -29,6 +30,7 @@ "jquery-ui": "1.12.1", "jquery-validation": "1.17.0", "jquery-validation-unobtrusive": "3.2.10", + "lazyload-js": "1.0.0", "moment": "2.10.3", "ng-file-upload": "12.2.13", "npm": "^6.4.1",