You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/11/04 12:46:14 UTC
[incubator-datalab] 08/11: Angular upd
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2123
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit c8bacd18c46592000e06206fd2bbaedbd2cc2945
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Nov 2 10:23:44 2020 +0200
Angular upd
---
.../src/main/resources/webapp/package-lock.json | 51 +++++++++++++++-------
.../src/main/resources/webapp/package.json | 7 ++-
.../webapp/src/app/shared/material.module.ts | 12 +----
.../src/main/resources/webapp/src/polyfills.ts | 15 +------
4 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json
index 588f446..c842155 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -332,11 +332,12 @@
}
},
"@angular/cdk": {
- "version": "9.2.4",
- "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.4.tgz",
- "integrity": "sha512-iw2+qHMXHYVC6K/fttHeNHIieSKiTEodVutZoOEcBu9rmRTGbLB26V/CRsfIRmA1RBk+uFYWc6UQZnMC3RdnJQ==",
+ "version": "10.2.6",
+ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-10.2.6.tgz",
+ "integrity": "sha512-7bvls1XiLejPirVC4ocdtmc/fgfPSG0BNwUvarl34g6ybj8mR+WDagMWnZMt0VXsnago2ImhGdD7YB9oJ3CpBQ==",
"requires": {
- "parse5": "^5.0.0"
+ "parse5": "^5.0.0",
+ "tslib": "^2.0.0"
},
"dependencies": {
"parse5": {
@@ -344,6 +345,11 @@
"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
"optional": true
+ },
+ "tslib": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+ "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
}
}
},
@@ -855,14 +861,34 @@
}
},
"@angular/material": {
- "version": "9.2.4",
- "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.4.tgz",
- "integrity": "sha512-LkoTXE6B0slvMhvfZDdPWaz4yaYLkaAp5VSPunI9pxGsPxzqEV9e210wC1/sjG/76Nk8Ep7/2z9XKac8Q9bMwA=="
+ "version": "10.2.6",
+ "resolved": "https://registry.npmjs.org/@angular/material/-/material-10.2.6.tgz",
+ "integrity": "sha512-xF+UoinJYrMuvyTRcFeg8DNDvykeIRbEpCwY4hYX4So7t6yr89W5D2htkbzilRkum3ZhhkGqjjCaI/B1B9J1Vg==",
+ "requires": {
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+ "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+ }
+ }
},
"@angular/material-moment-adapter": {
- "version": "9.2.4",
- "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.4.tgz",
- "integrity": "sha512-V5xkL+YUec3nDGRaJB72mJTUtdUvGaG9WCQEdr45viDWFGjQaEpS6msuScBLp0PwsN8Wt0n69eZg0ULgxPBa5g=="
+ "version": "10.2.6",
+ "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-10.2.6.tgz",
+ "integrity": "sha512-YzNV5+/858Z7bhcU5ayxHZyY1ZXQSVVKMIHG025HeRh0UQmhuz7KrvJlpHC36pshFb38An5MpCA7qU5LO/YO1g==",
+ "requires": {
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+ "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+ }
+ }
},
"@angular/platform-browser": {
"version": "10.2.1",
@@ -5835,11 +5861,6 @@
"pify": "^4.0.1"
}
},
- "hammerjs": {
- "version": "2.0.8",
- "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
- "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
- },
"handle-thing": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json
index 9143bb9..0be67c2 100644
--- a/services/self-service/src/main/resources/webapp/package.json
+++ b/services/self-service/src/main/resources/webapp/package.json
@@ -16,21 +16,20 @@
"private": true,
"dependencies": {
"@angular/animations": "^10.2.1",
- "@angular/cdk": "^9.2.4",
+ "@angular/cdk": "^10.2.6",
"@angular/common": "^10.2.1",
"@angular/compiler": "^10.2.1",
"@angular/core": "^10.2.1",
"@angular/forms": "^10.2.1",
"@angular/localize": "^10.2.1",
- "@angular/material": "^9.2.4",
- "@angular/material-moment-adapter": "^9.2.4",
+ "@angular/material": "^10.2.6",
+ "@angular/material-moment-adapter": "^10.2.6",
"@angular/platform-browser": "^10.2.1",
"@angular/platform-browser-dynamic": "^10.2.1",
"@angular/platform-server": "^10.2.1",
"@angular/router": "^10.2.1",
"core-js": "3.2.1",
"guacamole-common-js": "^1.2.0",
- "hammerjs": "^2.0.8",
"moment": "^2.29.1",
"moment-timezone": "^0.5.31",
"ng-daterangepicker": "^1.1.0",
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/material.module.ts b/services/self-service/src/main/resources/webapp/src/app/shared/material.module.ts
index 0eb5554..b8c0c03 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/material.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/material.module.ts
@@ -25,7 +25,7 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatChipsModule } from '@angular/material/chips';
-import {MAT_HAMMER_OPTIONS, MatNativeDateModule} from '@angular/material/core';
+import { MatNativeDateModule} from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatDialogModule } from '@angular/material/dialog';
import { MatExpansionModule } from '@angular/material/expansion';
@@ -88,15 +88,7 @@ import {STEPPER_GLOBAL_OPTIONS} from '@angular/cdk/stepper';
MatTableModule
],
providers: [
- {
- provide: MAT_HAMMER_OPTIONS,
- useValue: {
- cssProps: {
- userSelect: true
- }
- },
- },
- {
+ {
provide: STEPPER_GLOBAL_OPTIONS,
useValue: { displayDefaultIndicatorType: false }
}
diff --git a/services/self-service/src/main/resources/webapp/src/polyfills.ts b/services/self-service/src/main/resources/webapp/src/polyfills.ts
index 4358780..47f1965 100644
--- a/services/self-service/src/main/resources/webapp/src/polyfills.ts
+++ b/services/self-service/src/main/resources/webapp/src/polyfills.ts
@@ -75,17 +75,4 @@ import 'core-js/es/reflect';
/***************************************************************************************************
* Zone JS is required by Angular itself.
*/
-import 'zone.js/dist/zone'; // Included with Angular CLI.
-
-
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
-
-/**
- * Date, currency, decimal and percent pipes.
- * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
- */
-// import 'intl'; // Run `npm install --save intl`.
-import 'hammerjs';
\ No newline at end of file
+import 'zone.js/dist/zone';
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org