From 37d14f7413d6fa568ea365c0d03fa498345017a2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 11 Oct 2018 09:46:23 +0200 Subject: [PATCH] moving moments + angular-dynamic-locale --- src/Umbraco.Web.UI.Client/bower.json | 12 ------------ src/Umbraco.Web.UI.Client/gulpfile.js | 21 +++++++++++++++++++++ src/Umbraco.Web.UI.Client/package-lock.json | 18 ++++++++++++++++++ src/Umbraco.Web.UI.Client/package.json | 2 ++ 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 66c5ca4827..93d580e1ec 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -17,11 +17,9 @@ ], "dependencies": { "rgrove-lazyload": "*", - "angular-dynamic-locale": "~0.1.36", "tinymce": "~4.7.1", "codemirror": "~5.3.0", "angular-local-storage": "~0.7.1", - "moment": "~2.10.3", "ace-builds": "~1.3.0", "angular-ui-sortable": "0.14.4" }, @@ -34,16 +32,6 @@ "ace-builds" ], "sources": { - "moment": [ - "bower_components/moment/min/moment.min.js", - "bower_components/moment/min/moment-with-locales.js", - "bower_components/moment/min/moment-with-locales.min.js", - "bower_components/moment/locale/*.js" - ], - "angular-dynamic-locale": [ - "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js", - "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js.map" - ], "angular-local-storage": [ "bower_components/angular-local-storage/dist/angular-local-storage.min.js", "bower_components/angular-local-storage/dist/angular-local-storage.min.js.map" diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index 6eaa01f822..66fa20206a 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -205,6 +205,14 @@ gulp.task('dependencies', function () { "src": ["./node_modules/angular-cookies/angular-cookies.js"], "base": "./node_modules/angular-cookies" }, + { + "name": "angular-dynamic-locale", + "src": [ + "./node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js", + "./node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js.map" + ], + "base": "./node_modules/angular-dynamic-locale/dist" + }, { "name": "angular-sanitize", "src": ["./node_modules/angular-sanitize/angular-sanitize.js"], @@ -302,6 +310,19 @@ gulp.task('dependencies', function () { "src": ["./node_modules/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.min.js"], "base": "./node_modules/jquery-validation-unobtrusive/dist" }, + // TODO: We can optimize here: + // we don't have to ship with the moment-with-locales libraries + // we lazyload the user locale + { + "name": "moment", + "src": [ + "./node_modules/moment/min/moment.min.js", + "./node_modules/moment/min/moment-with-locales.js", + "./node_modules/moment/min/moment-with-locales.min.js", + "./node_modules/moment/src/locale/*.js" + ], + "base": "./node_modules/moment/min" + }, { "name": "ng-file-upload", "src": ["./node_modules/ng-file-upload/dist/ng-file-upload.min.js"], diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index bc7f94c6e0..24922b24ed 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -807,6 +807,11 @@ "to-fast-properties": "^2.0.0" } }, + "@types/angular": { + "version": "1.6.51", + "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.51.tgz", + "integrity": "sha512-wYU+/zlJWih7ZmonWVjGQ18tG7GboI9asMNjRBM5fpIFJWXSioQttCTw9qGL44cP82ghM8sCV9apEqm1zBDq2w==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -971,6 +976,14 @@ "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.5.tgz", "integrity": "sha512-/8xvvSl/Z9Vwu8ChRm+OQE3vmli8Icwl8uTYkHqD7j7cknJP9kNaf7SgsENlsLVtOqLE/I7TCFYrSx3bmSeNQA==" }, + "angular-dynamic-locale": { + "version": "0.1.36", + "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.36.tgz", + "integrity": "sha512-pM4BhBPzLDZRx7iIOYvdqVs5DfBGtXLrAzjUFQQfzr4sCrPMGF6sA0Qw1siP5Gu8rlXbDMQ6/60VE61JHID4Nw==", + "requires": { + "@types/angular": "^1.6.25" + } + }, "angular-i18n": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.7.5.tgz", @@ -9918,6 +9931,11 @@ "minimist": "0.0.8" } }, + "moment": { + "version": "2.10.3", + "resolved": "http://registry.npmjs.org/moment/-/moment-2.10.3.tgz", + "integrity": "sha1-CruZ8wf2UhgwjGk17+KcV7Ggon8=" + }, "morgan": { "version": "1.6.1", "resolved": "http://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index ea36b3577b..bc4cbaea55 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -8,6 +8,7 @@ "angular": "1.7.5", "angular-animate": "1.7.5", "angular-cookies": "1.7.5", + "angular-dynamic-locale": "0.1.36", "angular-i18n": "1.7.5", "angular-messages": "1.7.5", "angular-route": "1.7.5", @@ -24,6 +25,7 @@ "jquery-ui": "1.12.1", "jquery-validation": "1.17.0", "jquery-validation-unobtrusive": "3.2.10", + "moment": "2.10.3", "ng-file-upload": "12.2.13", "npm": "^6.4.1", "signalr": "2.2.1",