Skip to content

Commit

Permalink
cleanup dependencies and fix versions (#5835)
Browse files Browse the repository at this point in the history
* remove core-js

* fix lib versions

* remove unused lib

* upgrade rxjs
  • Loading branch information
Denys Vuika authored Jul 3, 2020
1 parent 93d5dcb commit f691dc9
Show file tree
Hide file tree
Showing 13 changed files with 195 additions and 140 deletions.
19 changes: 0 additions & 19 deletions demo-shell/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,9 @@
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. */
import 'core-js/es6/symbol';
import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
import 'core-js/es6/parse-float';
import 'core-js/es6/number';
import 'core-js/es6/math';
import 'core-js/es6/string';
import 'core-js/es6/date';
import 'core-js/es6/array';
import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/set';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
import 'classlist.js'; // Run `npm install --save classlist.js`.

/** Evergreen browsers require these. */
import 'core-js/es6/reflect';
import 'core-js/es7/array';

/***************************************************************************************************
* Zone JS is required by Angular itself.
*/
Expand Down
10 changes: 0 additions & 10 deletions lib/content-services/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,15 @@ module.exports = function (config) {
basePath: '../../',

files: [
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
{pattern: 'node_modules/tslib/tslib.js', included: true, watched: false},

// pdf-js
{pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},

{
pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},

{pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false},

{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js.map', included: false, served: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/build/pdf.js.map', included: false, served: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js.map', included: false, served: true, watched: false},
{pattern: 'lib/content-services/src/lib/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: 'lib/content-services/src/lib/assets/images/**/*.svg', included: false, served: true, watched: false},
{pattern: 'lib/core/assets/images/ft_ic_folder.svg', included: false, served: true, watched: false},
Expand Down
12 changes: 0 additions & 12 deletions lib/core/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,16 @@ module.exports = function (config) {
basePath: '../../',

files: [
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
{pattern: 'node_modules/tslib/tslib.js', included: true, watched: false},

// pdf-js
{pattern: 'node_modules/pdfjs-dist/build/pdf.js.map', included: false, watched: false},
{pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},

{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false, served: true},
{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js.map', included: false, watched: false},
{pattern: 'node_modules/pdfjs-dist/build/pdf.worker.min.js', included: true, watched: false, served: true},

{pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
{pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js.map', served: true, included: false, watched: false},

{
pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},

{pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false},

{pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false},
{pattern: 'lib/core/**/*.ts', included: false, served: true, watched: false},
{pattern: 'lib/core/assets/**/*.svg', included: false, served: true, watched: false},
Expand Down
24 changes: 12 additions & 12 deletions lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@angular/animations": ">=9.1.9",
"@angular/cdk": ">=9.2.4",
"@angular/common": ">=9.1.9",
"@angular/core": ">=9.1.9",
"@angular/flex-layout": ">=9.0.0-beta.31",
"@angular/forms": ">=9.1.9",
"@angular/material": ">=9.2.4",
"@angular/material-moment-adapter": ">=9.2.4",
"@angular/router": ">=9.1.9",
"@angular/animations": ">=10.0.2",
"@angular/cdk": ">=10.0.1",
"@angular/common": ">=10.0.2",
"@angular/core": ">=10.0.2",
"@angular/flex-layout": ">=10.0.0-beta.32",
"@angular/forms": ">=10.0.2",
"@angular/material": ">=10.0.1",
"@angular/material-moment-adapter": ">=10.0.1",
"@angular/router": ">=10.0.2",
"@mat-datetimepicker/core": ">=4.1.0",
"@mat-datetimepicker/moment": ">=4.1.0",
"@alfresco/js-api": ">=3.8.0",
"@alfresco/adf-extensions": ">=3.8.0",
"@ngx-translate/core": ">=12.1.2",
"@alfresco/js-api": ">=3.9.0",
"@alfresco/adf-extensions": ">=3.9.0",
"@ngx-translate/core": ">=13.0.0",
"minimatch-browser": ">=1.0.0",
"moment": ">=2.22.2",
"pdfjs-dist": ">=2.3.200"
Expand Down
4 changes: 2 additions & 2 deletions lib/extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@angular/common": ">=9.1.9",
"@angular/core": ">=9.1.9",
"@angular/common": ">=10.0.2",
"@angular/core": ">=10.0.2",
"@alfresco/js-api": ">=3.9.0"
},
"keywords": [
Expand Down
14 changes: 7 additions & 7 deletions lib/insights/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@angular/common": ">=9.1.9",
"@angular/core": ">=9.1.9",
"@angular/flex-layout": ">=9.0.0-beta.31",
"@angular/forms": ">=9.1.9",
"@angular/material": ">=9.2.4",
"@alfresco/adf-core": ">=3.8.0",
"@ngx-translate/core": ">=12.1.2",
"@angular/common": ">=10.0.2",
"@angular/core": ">=10.0.2",
"@angular/flex-layout": ">=10.0.0-beta.32",
"@angular/forms": ">=10.0.2",
"@angular/material": ">=10.0.1",
"@alfresco/adf-core": ">=3.9.0",
"@ngx-translate/core": ">=13.0.0",
"chart.js": ">=2.9.3",
"moment": ">=2.22.2",
"ng2-charts": ">=2.3.2",
Expand Down
8 changes: 0 additions & 8 deletions lib/process-services-cloud/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@ module.exports = function (config) {
config.set({
basePath: '../../',
files: [
{ pattern: 'node_modules/core-js/client/core.js', included: true, watched: false },
{ pattern: 'node_modules/tslib/tslib.js', included: true, watched: false },

// pdf-js
{ pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false },
{ pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false },
{ pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false },

{
pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},

{ pattern: 'node_modules/chart.js/dist/Chart.js', included: true, watched: false },
{ pattern: 'node_modules/raphael/raphael.min.js', included: true, watched: false },
{
Expand All @@ -26,9 +20,7 @@ module.exports = function (config) {
served: true,
watched: false
},

{ pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false },

{ pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false },
{ pattern: 'lib/process-services-cloud/src/lib/i18n/*.json', included: false, served: true, watched: false },
{ pattern: 'lib/process-services-cloud/src/lib/mock/*.json', included: false, served: true, watched: false },
Expand Down
18 changes: 9 additions & 9 deletions lib/process-services-cloud/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@angular/animations": ">=9.1.9",
"@angular/common": ">=9.1.9",
"@angular/core": ">=9.1.9",
"@angular/animations": ">=10.0.2",
"@angular/common": ">=10.0.2",
"@angular/core": ">=10.0.2",
"@angular/flex-layout": ">=9.0.0-beta.31",
"@angular/forms": ">=9.1.9",
"@angular/material": ">=9.2.4",
"@alfresco/js-api": ">=3.8.0",
"@alfresco/adf-core": ">=3.8.0",
"@alfresco/adf-content-services": ">=3.8.0",
"@ngx-translate/core": ">=12.1.2",
"@angular/forms": ">=10.0.2",
"@angular/material": ">=10.0.1",
"@alfresco/js-api": ">=3.9.0",
"@alfresco/adf-core": ">=3.9.0",
"@alfresco/adf-content-services": ">=3.9.0",
"@ngx-translate/core": ">=13.0.0",
"moment": ">=2.22.2"
},
"keywords": [
Expand Down
8 changes: 0 additions & 8 deletions lib/process-services/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@ module.exports = function (config) {
config.set({
basePath: '../../',
files: [
{ pattern: 'node_modules/core-js/client/core.js', included: true, watched: false },
{ pattern: 'node_modules/tslib/tslib.js', included: true, watched: false },

// pdf-js
{ pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false },
{ pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false },
{ pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false },

{
pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
included: true,
watched: false
},

{ pattern: 'node_modules/chart.js/dist/Chart.js', included: true, watched: false },
{ pattern: 'node_modules/raphael/raphael.min.js', included: true, watched: false },
{
Expand All @@ -26,9 +20,7 @@ module.exports = function (config) {
served: true,
watched: false
},

{ pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false },

{ pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false },
{ pattern: 'lib/content-services/i18n/**/en.json', included: false, served: true, watched: false },
{ pattern: 'lib/process-services/i18n/**/en.json', included: false, served: true, watched: false },
Expand Down
22 changes: 11 additions & 11 deletions lib/process-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@angular/cdk": ">=9.2.4",
"@angular/common": ">=9.1.9",
"@angular/core": ">=9.1.9",
"@angular/flex-layout": ">=9.0.0-beta.31",
"@angular/forms": ">=9.1.9",
"@angular/material": ">=9.2.4",
"@angular/router": ">=9.1.9",
"@alfresco/js-api": ">=3.8.0",
"@alfresco/adf-core": ">=3.8.0",
"@alfresco/adf-content-services": ">=3.8.0",
"@ngx-translate/core": ">=12.1.2",
"@angular/cdk": ">=10.0.1",
"@angular/common": ">=10.0.2",
"@angular/core": ">=10.0.2",
"@angular/flex-layout": ">=10.0.0-beta.32",
"@angular/forms": ">=10.0.2",
"@angular/material": ">=10.0.1",
"@angular/router": ">=10.0.2",
"@alfresco/js-api": ">=3.9.0",
"@alfresco/adf-core": ">=3.9.0",
"@alfresco/adf-content-services": ">=3.9.0",
"@ngx-translate/core": ">=13.0.0",
"moment": ">=2.22.2"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion lib/testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@alfresco/js-api": ">=3.8.0"
"@alfresco/js-api": ">=3.9.0"
},
"keywords": [
"testing",
Expand Down
Loading

0 comments on commit f691dc9

Please sign in to comment.