From fd2a5779c1883e8cbf1d517ac0318949ec3155fd Mon Sep 17 00:00:00 2001 From: David Furey <david@furey.me.uk> Date: Thu, 5 Sep 2024 10:22:56 +0100 Subject: [PATCH] Revert "Upgrade angular to latest version of v1" --- package.json | 10 ++-- .../date-time-picker/_date-time-picker.scss | 2 +- .../date-time-picker/date-time-picker.js | 2 +- yarn.lock | 56 +++++++++---------- 4 files changed, 34 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index f54c3784c..6be741668 100644 --- a/package.json +++ b/package.json @@ -51,12 +51,12 @@ "@emotion/react": "^11.11.4", "@types/react": "^17.0.76", "@types/react-dom": "^17.0.9", - "angular": "1.8.3", - "angular-animate": "1.8.3", - "angularjs-bootstrap-datetimepicker": "1.1.4", + "angular": "1.5.11", + "angular-animate": "1.5.11", + "angular-bootstrap-datetimepicker": "1.1.4", "angular-bootstrap-temporary": "0.11.0", - "angular-mocks": "1.8.3", - "angular-ui-router": "1.0.30", + "angular-mocks": "1.5.11", + "angular-ui-router": "0.2.11", "bootstrap": "3.4.1", "chai": "^3.5.0", "jquery": "3.5.0", diff --git a/public/components/date-time-picker/_date-time-picker.scss b/public/components/date-time-picker/_date-time-picker.scss index d60221a41..e24f7ab59 100644 --- a/public/components/date-time-picker/_date-time-picker.scss +++ b/public/components/date-time-picker/_date-time-picker.scss @@ -1,4 +1,4 @@ -@import '~angularjs-bootstrap-datetimepicker/src/css/datetimepicker.css'; +@import '~angular-bootstrap-datetimepicker/src/css/datetimepicker.css'; .date-time-picker__help-text { font-size: 85%; diff --git a/public/components/date-time-picker/date-time-picker.js b/public/components/date-time-picker/date-time-picker.js index 283a7f703..b56b872cc 100644 --- a/public/components/date-time-picker/date-time-picker.js +++ b/public/components/date-time-picker/date-time-picker.js @@ -17,7 +17,7 @@ // 3rd party dependencies import angular from 'angular'; import moment from 'moment'; -import 'angularjs-bootstrap-datetimepicker'; +import 'angular-bootstrap-datetimepicker'; // local dependencies import 'lib/date-service'; diff --git a/yarn.lock b/yarn.lock index cb60bbac1..131c49854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1391,11 +1391,6 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== -"@uirouter/core@6.0.8": - version "6.0.8" - resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-6.0.8.tgz#a1e919a4743be729751aafc4ce353d0dc0ffd26c" - integrity sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw== - "@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": version "1.12.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" @@ -1662,41 +1657,44 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: resolved "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ== -angular-animate@1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.8.3.tgz#f88db37325de256f9144d1242ce3158134a9d72a" - integrity sha512-/LtTKvy5sD6MZbV0v+nHgOIpnFF0mrUp+j5WIxVprVhcrJriYpuCZf4S7Owj1o76De/J0eRzANUozNJ6hVepnQ== +angular-animate@1.5.11: + version "1.5.11" + resolved "https://registry.npmjs.org/angular-animate/-/angular-animate-1.5.11.tgz" + integrity sha512-onbcfyND0O42P15qtVvby2f3A2XlsKG2VzAhCjGCZoR9cow9s60fpVlnf8/Xx8wlqjukx/rd65QbxwPAnqSCyg== + +angular-bootstrap-datetimepicker@1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/angular-bootstrap-datetimepicker/-/angular-bootstrap-datetimepicker-1.1.4.tgz" + integrity sha512-v4gSyJgymRIwqt/opFfF5JmetEay/nnuJvLR7R7qlwXh8pe4Yy/n+jm1j1flAfNAsxZnK/2X8lbR+ELWrMLOqw== + dependencies: + angular "^1.6.3" + moment "^2.18.1" angular-bootstrap-temporary@0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/angular-bootstrap-temporary/-/angular-bootstrap-temporary-0.11.0.tgz" integrity sha512-FSbxag9Jv8rlRk46+4l0x2aJ/3HBOaiBvVS+Rhiu1nEh2CIXz5EDq7c6OHnPrIdXS5KjIr64Zg3EgXP9bBACNQ== -angular-mocks@1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.8.3.tgz#c0dd05e5c3fc014e07af6289b23f0e817d7a4724" - integrity sha512-vqsT6zwu80cZ8RY7qRQBZuy6Fq5X7/N5hkV9LzNT0c8b546rw4ErGK6muW1u2JnDKYa7+jJuaGM702bWir4HGw== +angular-mocks@1.5.11: + version "1.5.11" + resolved "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.5.11.tgz" + integrity sha512-eDVhiwiHlMEK6W47sIkiZh4We35Lqskg+G5rSTpUBPndwd2XM/uwuW+eklzOZhx+ODaFLuMsxeLY1h9rA3utIA== -angular-ui-router@1.0.30: - version "1.0.30" - resolved "https://registry.yarnpkg.com/angular-ui-router/-/angular-ui-router-1.0.30.tgz#de8a07fa1620fc5a979ee8448d0ded159792436f" - integrity sha512-8xMpxbOtCJbRnGR1fhbyZ5BhFXr3zs1L2ytXQiBACTJjot309QNFFCaWx0lDM2eVXp8qte4idigU9gwWdspmtQ== - dependencies: - "@uirouter/core" "6.0.8" +angular-ui-router@0.2.11: + version "0.2.11" + resolved "https://registry.npmjs.org/angular-ui-router/-/angular-ui-router-0.2.11.tgz" + integrity sha512-jmsIsFl03/pLqoWQp90qclreAYd27SXEEyGn69EZ4FZvFG+ZjAVI39QXe2fX5OYOLjQasgDMxI//emK0YaeE0w== + +angular@1.5.11: + version "1.5.11" + resolved "https://registry.npmjs.org/angular/-/angular-1.5.11.tgz" + integrity sha512-09DBOVVWo6rOQfdCBKGfEL0ZZIhf6P3fbeP3BU+ty5FU50DPiavVeDn8hQ4wXE8o4vKEEpzY1aRcRHJMCixWYA== -angular@1.8.3, angular@>=1.5.0, angular@^1.6.4: +angular@>=1.5.0, angular@^1.6.3: version "1.8.3" - resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.3.tgz#851ad75d5163c105a7e329555ef70c90aa706894" + resolved "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz" integrity sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw== -angularjs-bootstrap-datetimepicker@1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/angularjs-bootstrap-datetimepicker/-/angularjs-bootstrap-datetimepicker-1.1.4.tgz#88a4fea0e46fe8f4561e2ac32964ff589e5464a9" - integrity sha512-28Nsr4fUljVzabKAQb5mO6G8+5YI73+d5iRp3pOl9ywPVojiCZSsRPk5urb2vHxqABgIs2nR5ZQxOnuwLMy/MQ== - dependencies: - angular "^1.6.4" - moment "^2.18.1" - ansi-colors@^4.1.1, ansi-colors@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"