Browse Source

update node/npm angular versions and fix linting errors

Jason Rivard 2 years ago
parent
commit
3e8a08ff60

+ 6 - 11
client/angular/package-lock.json

@@ -14208,15 +14208,13 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
             "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "ajv-keywords": {
             "version": "3.5.2",
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
             "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "angular": {
             "version": "1.8.3",
@@ -18385,7 +18383,7 @@
                 "console-browserify": "1.1.x",
                 "exit": "0.1.x",
                 "htmlparser2": "3.8.x",
-                "lodash": ">=4.17.21",
+                "lodash": "~4.17.21",
                 "minimatch": "~3.0.2",
                 "strip-json-comments": "1.0.x"
             },
@@ -18544,15 +18542,13 @@
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
             "integrity": "sha512-SENGE9DhlIIFTSZWiNq4eGeXL8G6z9cqHIOdkx9jh1qhhQqwEy3tAoLRyER0vOcHqdOlKmGpOuXk+HOipIy7sg==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "karma-jasmine-html-reporter": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.3.1.tgz",
             "integrity": "sha512-J8pUc58QeRhpHQ+sXBRZ016ZW9ZOjU4vjYA6Jah69WvBaqR7tGvXUzy7w/DoULbNrD8+hnZCpvdeEtqXtirY2g==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "karma-sourcemap-loader": {
             "version": "0.3.7",
@@ -24614,8 +24610,7 @@
             "version": "8.2.3",
             "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
             "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "xtend": {
             "version": "4.0.2",

+ 0 - 7
client/angular/src/modules/configeditor/configeditor.module.ts

@@ -29,10 +29,3 @@ import ConfigEditorController from './configeditor.controller';
 module('configeditor.module', ['textAngular'])
     .controller('ConfigEditorController', ConfigEditorController);
 
-// lowercase and uppercase have been removed from angular, but textAngular still hasn't caught up with the change. So
-// The following polyfills it for now:
-
-// @ts-ignore
-if (!angular.lowercase) angular.lowercase = (str) => str ? str.toLowerCase() : str;
-// @ts-ignore
-if (!angular.uppercase) angular.uppercase = (str) => str ? str.toUpperCase() : str;

+ 1 - 1
client/angular/src/modules/helpdesk/verifications-dialog.controller.ts

@@ -183,7 +183,7 @@ export default class VerificationsDialogController {
             })
             .catch((reason) => {
                 this.verificationStatus = STATUS_FAILED;
-            })
+            });
     }
 
     onTokenDestinationChanged() {

+ 3 - 3
client/angular/src/services/helpdesk.service.ts

@@ -78,16 +78,16 @@ export interface IVerificationOptions {
     verificationMethods: {
         optional: string[];
         required: string[];
-    },
+    };
     verificationForm: [{
         name: string;
         label: string;
-    }],
+    }];
     tokenDestinations: [{
         id: string;
         display: string;
         type: string;
-    }]
+    }];
 }
 
 export interface IVerificationStatus {

+ 1 - 1
client/angular/src/services/peoplesearch-config.service.ts

@@ -94,7 +94,7 @@ export default class PeopleSearchConfigService
                 maxExportDepth: results[3],
                 emailTeamEnabled: results[4],
                 maxEmailDepth: results[5]
-            }
+            };
         });
     }
 

+ 2 - 2
client/pom.xml

@@ -14,8 +14,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <node.version>v16.15.1</node.version>
-        <npm.version>8.12.1</npm.version>
+        <node.version>v16.17.1</node.version>
+        <npm.version>8.19.2</npm.version>
     </properties>
 
     <name>PWM Password Self Service: Angular Client JAR</name>

+ 3 - 3
webapp/pom.xml

@@ -252,17 +252,17 @@
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojo</artifactId>
-            <version>1.17.2</version>
+            <version>1.17.3</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dijit</artifactId>
-            <version>1.17.2</version>
+            <version>1.17.3</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>dojox</artifactId>
-            <version>1.17.2</version>
+            <version>1.17.3</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>