Skip to content

Commit

Permalink
Merge pull request #456 from guardian/revert-455-fp/upgrade-angular
Browse files Browse the repository at this point in the history
Revert "Upgrade angular to latest version of v1"
  • Loading branch information
davidfurey authored Sep 5, 2024
2 parents a8de01a + fd2a577 commit e981d30
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 36 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion public/components/date-time-picker/_date-time-picker.scss
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down
2 changes: 1 addition & 1 deletion public/components/date-time-picker/date-time-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
56 changes: 27 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]":
version "6.0.8"
resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-6.0.8.tgz#a1e919a4743be729751aafc4ce353d0dc0ffd26c"
integrity sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw==

"@webassemblyjs/[email protected]", "@webassemblyjs/ast@^1.12.1":
version "1.12.1"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
Expand Down Expand Up @@ -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==

[email protected]:
version "1.8.3"
resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.8.3.tgz#f88db37325de256f9144d1242ce3158134a9d72a"
integrity sha512-/LtTKvy5sD6MZbV0v+nHgOIpnFF0mrUp+j5WIxVprVhcrJriYpuCZf4S7Owj1o76De/J0eRzANUozNJ6hVepnQ==
[email protected]:
version "1.5.11"
resolved "https://registry.npmjs.org/angular-animate/-/angular-animate-1.5.11.tgz"
integrity sha512-onbcfyND0O42P15qtVvby2f3A2XlsKG2VzAhCjGCZoR9cow9s60fpVlnf8/Xx8wlqjukx/rd65QbxwPAnqSCyg==

[email protected]:
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"

[email protected]:
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==

[email protected]:
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"
[email protected]:
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==

[email protected]:
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==

[email protected]:
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"
Expand Down

0 comments on commit e981d30

Please sign in to comment.