Skip to content

Commit ed593d5

Browse files
authored
Merge pull request DSpace#2000 from tdonohue/update_latest_angular13
Update to latest Angular 13 & Remove unused dependencies
2 parents 4915f10 + 85c8722 commit ed593d5

6 files changed

Lines changed: 2846 additions & 4814 deletions

File tree

angular.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@
2525
}
2626
},
2727
"allowedCommonJsDependencies": [
28-
"angular2-text-mask",
2928
"cerialize",
3029
"core-js",
3130
"lodash",
3231
"jwt-decode",
33-
"url-parse",
3432
"uuid",
3533
"webfontloader",
3634
"zone.js"

package.json

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@
5454
"ts-node": "10.2.1"
5555
},
5656
"dependencies": {
57-
"@angular/animations": "~13.2.6",
57+
"@angular/animations": "~13.3.12",
5858
"@angular/cdk": "^13.2.6",
59-
"@angular/common": "~13.2.6",
60-
"@angular/compiler": "~13.2.6",
61-
"@angular/core": "~13.2.6",
62-
"@angular/forms": "~13.2.6",
63-
"@angular/localize": "13.2.6",
64-
"@angular/platform-browser": "~13.2.6",
65-
"@angular/platform-browser-dynamic": "~13.2.6",
66-
"@angular/platform-server": "~13.2.6",
67-
"@angular/router": "~13.2.6",
68-
"@babel/runtime": "^7.17.2",
59+
"@angular/common": "~13.3.12",
60+
"@angular/compiler": "~13.3.12",
61+
"@angular/core": "~13.3.12",
62+
"@angular/forms": "~13.3.12",
63+
"@angular/localize": "13.3.12",
64+
"@angular/platform-browser": "~13.3.12",
65+
"@angular/platform-browser-dynamic": "~13.3.12",
66+
"@angular/platform-server": "~13.3.12",
67+
"@angular/router": "~13.3.12",
68+
"@babel/runtime": "7.17.2",
6969
"@kolkov/ngx-gallery": "^2.0.1",
7070
"@material-ui/core": "^4.11.0",
7171
"@material-ui/icons": "^4.9.1",
@@ -77,15 +77,15 @@
7777
"@ngrx/store": "^13.0.2",
7878
"@nguniversal/express-engine": "^13.0.2",
7979
"@ngx-translate/core": "^13.0.0",
80-
"@nicky-lenaers/ngx-scroll-to": "^9.0.0",
80+
"@nicky-lenaers/ngx-scroll-to": "^13.0.0",
8181
"@types/grecaptcha": "^3.0.4",
8282
"angular-idle-preload": "3.0.0",
8383
"angulartics2": "^12.0.0",
8484
"axios": "^0.27.2",
85-
"bootstrap": "4.3.1",
86-
"caniuse-lite": "^1.0.30001165",
85+
"bootstrap": "^4.6.1",
8786
"cerialize": "0.1.18",
8887
"cli-progress": "^3.8.0",
88+
"colors": "^1.4.0",
8989
"compression": "^1.7.4",
9090
"cookie-parser": "1.4.5",
9191
"core-js": "^3.7.0",
@@ -95,11 +95,8 @@
9595
"express": "^4.17.1",
9696
"express-rate-limit": "^5.1.3",
9797
"fast-json-patch": "^3.0.0-1",
98-
"file-saver": "^2.0.5",
9998
"filesize": "^6.1.0",
100-
"font-awesome": "4.7.0",
10199
"http-proxy-middleware": "^1.0.5",
102-
"https": "1.0.0",
103100
"js-cookie": "2.2.1",
104101
"js-yaml": "^4.1.0",
105102
"json5": "^2.1.3",
@@ -119,43 +116,38 @@
119116
"ngx-infinite-scroll": "^10.0.1",
120117
"ngx-pagination": "5.0.0",
121118
"ngx-sortablejs": "^11.1.0",
122-
"ngx-ui-switch": "^11.0.1",
119+
"ngx-ui-switch": "^13.0.2",
123120
"nouislider": "^14.6.3",
124121
"pem": "1.14.4",
125-
"postcss-cli": "^9.1.0",
126122
"prop-types": "^15.7.2",
127123
"react-copy-to-clipboard": "^5.0.1",
128124
"reflect-metadata": "^0.1.13",
129125
"rxjs": "^7.5.5",
130126
"sanitize-html": "^2.7.2",
131127
"sortablejs": "1.13.0",
132-
"tslib": "^2.0.0",
133-
"url-parse": "^1.5.6",
134128
"uuid": "^8.3.2",
135129
"webfontloader": "1.6.28",
136130
"zone.js": "~0.11.5"
137131
},
138132
"devDependencies": {
139133
"@angular-builders/custom-webpack": "~13.1.0",
140-
"@angular-devkit/build-angular": "~13.2.6",
134+
"@angular-devkit/build-angular": "~13.3.10",
141135
"@angular-eslint/builder": "13.1.0",
142136
"@angular-eslint/eslint-plugin": "13.1.0",
143137
"@angular-eslint/eslint-plugin-template": "13.1.0",
144138
"@angular-eslint/schematics": "13.1.0",
145139
"@angular-eslint/template-parser": "13.1.0",
146-
"@angular/cli": "~13.2.6",
147-
"@angular/compiler-cli": "~13.2.6",
148-
"@angular/language-service": "~13.2.6",
140+
"@angular/cli": "~13.3.10",
141+
"@angular/compiler-cli": "~13.3.12",
142+
"@angular/language-service": "~13.3.12",
149143
"@cypress/schematic": "^1.5.0",
150-
"@fortawesome/fontawesome-free": "^5.5.0",
144+
"@fortawesome/fontawesome-free": "^6.2.1",
151145
"@ngrx/store-devtools": "^13.0.2",
152146
"@ngtools/webpack": "^13.2.6",
153-
"@nguniversal/builders": "^13.0.2",
147+
"@nguniversal/builders": "^13.1.1",
154148
"@types/deep-freeze": "0.1.2",
155149
"@types/express": "^4.17.9",
156-
"@types/file-saver": "^2.0.1",
157150
"@types/jasmine": "~3.6.0",
158-
"@types/jasminewd2": "~2.0.8",
159151
"@types/js-cookie": "2.2.6",
160152
"@types/lodash": "^4.14.165",
161153
"@types/node": "^14.14.9",
@@ -166,53 +158,39 @@
166158
"compression-webpack-plugin": "^9.2.0",
167159
"copy-webpack-plugin": "^6.4.1",
168160
"cross-env": "^7.0.3",
169-
"css-loader": "^6.2.0",
170-
"css-minimizer-webpack-plugin": "^3.4.1",
171-
"cssnano": "^5.0.6",
172161
"cypress": "9.7.0",
173162
"cypress-axe": "^0.14.0",
174-
"debug-loader": "^0.0.1",
175163
"deep-freeze": "0.0.1",
176-
"dotenv": "^8.2.0",
177164
"eslint": "^8.2.0",
178165
"eslint-plugin-deprecation": "^1.3.2",
179166
"eslint-plugin-import": "^2.25.4",
180-
"eslint-plugin-jsdoc": "^39.3.6",
167+
"eslint-plugin-jsdoc": "^39.6.4",
181168
"eslint-plugin-lodash": "^7.4.0",
182169
"eslint-plugin-unused-imports": "^2.0.0",
183170
"express-static-gzip": "^2.1.5",
184-
"fork-ts-checker-webpack-plugin": "^6.0.3",
185-
"html-loader": "^1.3.2",
186171
"jasmine-core": "^3.8.0",
187172
"jasmine-marbles": "0.9.2",
188-
"jasmine-spec-reporter": "~5.0.0",
189173
"karma": "^6.3.14",
190174
"karma-chrome-launcher": "~3.1.0",
191175
"karma-coverage-istanbul-reporter": "~3.0.2",
192176
"karma-jasmine": "~4.0.0",
193177
"karma-jasmine-html-reporter": "^1.5.0",
194178
"karma-mocha-reporter": "2.2.5",
195179
"ngx-mask": "^13.1.7",
196-
"nodemon": "^2.0.15",
180+
"nodemon": "^2.0.20",
197181
"postcss": "^8.1",
198182
"postcss-apply": "0.12.0",
199183
"postcss-import": "^14.0.0",
200184
"postcss-loader": "^4.0.3",
201185
"postcss-preset-env": "^7.4.2",
202186
"postcss-responsive-type": "1.0.0",
203-
"protractor": "^7.0.0",
204-
"protractor-istanbul-plugin": "2.0.0",
205-
"raw-loader": "0.5.1",
206187
"react": "^16.14.0",
207188
"react-dom": "^16.14.0",
208189
"rimraf": "^3.0.2",
209190
"rxjs-spy": "^8.0.2",
210-
"sass": "~1.32.6",
191+
"sass": "~1.33.0",
211192
"sass-loader": "^12.6.0",
212193
"sass-resources-loader": "^2.1.1",
213-
"string-replace-loader": "^3.1.0",
214-
"terser-webpack-plugin": "^2.3.1",
215-
"ts-loader": "^5.2.0",
216194
"ts-node": "^8.10.2",
217195
"typescript": "~4.5.5",
218196
"webpack": "^5.69.1",

src/app/statistics-page/statistics-table/statistics-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h3 class="m-1">
1010
<tbody>
1111

1212
<tr>
13-
<th scope="col"></th>
13+
<td></td>
1414
<th scope="col"
1515
*ngFor="let header of headers"
1616
class="{{header}}-header">

src/app/thumbnail/thumbnail.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ img {
1212
display: block;
1313
content: "";
1414
width: 100%;
15-
padding-top: (297 / 210) * 100%; // A4 ratio
15+
padding-top: calc((297 / 210) * 100%); // A4 ratio
1616
}
1717
> .inner {
1818
position: absolute;

src/styles/_functions.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
@use 'sass:math';
2+
13
@function calculateRem($size) {
2-
$remSize: $size / 16px;
4+
$remSize: math.div($size, 16px);
35
@return $remSize;
46
}
57

68

79
@function strip-unit($number) {
810
@if type-of($number) == 'number' and not unitless($number) {
9-
@return $number / ($number * 0 + 1);
11+
@return math.div($number , ($number * 0 + 1));
1012
}
1113
@return $number;
1214
}

0 commit comments

Comments
 (0)