From 4293bbba831f15a48fb381393a1e540f41387030 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 10 Apr 2018 02:08:42 +0100 Subject: [PATCH] upgrade ng-packagr (#3156) * upgrade ng-packagr * restore js-api vesion * restore compiler version * revert demo shell update package --- demo-shell/package.json | 6 +++--- lib/content-services/ng-package.json | 3 +++ lib/core/ng-package.json | 1 + lib/insights/ng-package.json | 1 + lib/package.json | 6 +++--- lib/process-services/ng-package.json | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/demo-shell/package.json b/demo-shell/package.json index e6084cc364..771c923f23 100644 --- a/demo-shell/package.json +++ b/demo-shell/package.json @@ -8,7 +8,7 @@ "prestart": "npm run validate-config", "start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --proxy-config proxy.conf.js --app dist --open", "start:dev": " npm run lint && npm run server-versions && rimraf dist && npm run clean-lib-angular && concurrently \"ng serve --host 0.0.0.0 --disable-host-check --app dev pp-dev --proxy-config proxy.conf.js --open\" \"npm run style:dev --watch\" \"npm run copy:dev\" ", - "start:dist": "npm run server-versions && rimraf dist && node --max_old_space_size=30000 node_modules/.bin/ng serve --prod --sourcemaps --host 0.0.0.0 --disable-host-check --app dist", + "start:dist": "npm run server-versions && rimraf dist && node --max_old_space_size=30000 node_modules/.bin/ng serve --prod --host 0.0.0.0 --disable-host-check --app dist --proxy-config proxy.conf.js -open", "build": "npm run validate-config && npm run server-versions && rimraf dist && ng build --app dist", "build:dev": "npm run validate-config && npm run lint && npm run style:dev && npm run server-versions && rimraf dist && ng build --app dev", "build:dist": "npm run validate-config && npm run server-versions && rimraf dist && ng build --prod --app dist", @@ -78,8 +78,8 @@ "@angular/platform-browser": "5.1.1", "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", - "@mat-datetimepicker/core": "^1.0.1", - "@mat-datetimepicker/moment": "^1.0.1", + "@mat-datetimepicker/core": "1.0.4", + "@mat-datetimepicker/moment": "1.0.4", "@ngx-translate/core": "9.1.1", "alfresco-js-api": "2.3.0-beta7", "chart.js": "2.5.0", diff --git a/lib/content-services/ng-package.json b/lib/content-services/ng-package.json index dca9672374..aa14e21874 100644 --- a/lib/content-services/ng-package.json +++ b/lib/content-services/ng-package.json @@ -1,5 +1,6 @@ { "$schema": "./node_modules/ng-packagr/ng-package.schema.json", + "whitelistedNonPeerDependencies": [ "." ], "workingDirectory" : "./ng_work", "src": "../content-services/", "dest": "../dist/content-services/", @@ -14,6 +15,8 @@ "minimatch": "minimatch", "@angular/platform-browser/animations": "@angular/platform-browser/animations", "@angular/material": "@angular/material", + "@mat-datetimepicker/core": "@mat-datetimepicker/core", + "@mat-datetimepicker/moment": "@mat-datetimepicker/moment", "@angular/flex-layout": "@angular/flex-layout", "@alfresco/adf-core": "@alfresco/adf-core", "@angular/material-moment-adapter": "@angular/material-moment-adapter", diff --git a/lib/core/ng-package.json b/lib/core/ng-package.json index 3222faefdc..ceaf415625 100644 --- a/lib/core/ng-package.json +++ b/lib/core/ng-package.json @@ -1,5 +1,6 @@ { "$schema": "./node_modules/ng-packagr/ng-package.schema.json", + "whitelistedNonPeerDependencies": [ "." ], "workingDirectory" : "./ng_work", "src": "./core/", "dest": "../dist/core/", diff --git a/lib/insights/ng-package.json b/lib/insights/ng-package.json index 00d4388b9a..3062489c3e 100644 --- a/lib/insights/ng-package.json +++ b/lib/insights/ng-package.json @@ -1,5 +1,6 @@ { "$schema": "./node_modules/ng-packagr/ng-package.schema.json", + "whitelistedNonPeerDependencies": [ "." ], "workingDirectory" : "./ng_work", "src": "../insights/", "dest": "../dist/insights/", diff --git a/lib/package.json b/lib/package.json index 0158cbc196..b65af1ffcd 100644 --- a/lib/package.json +++ b/lib/package.json @@ -68,8 +68,8 @@ "@angular/platform-browser": "5.1.1", "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", - "@mat-datetimepicker/core": "^1.0.1", - "@mat-datetimepicker/moment": "^1.0.1", + "@mat-datetimepicker/core": "1.0.4", + "@mat-datetimepicker/moment": "1.0.4", "@ngx-translate/core": "9.1.1", "alfresco-js-api": "2.3.0-beta7", "chart.js": "2.5.0", @@ -131,7 +131,7 @@ "mdast-zone": "^3.0.1", "merge-stream": "1.0.1", "nconf": "^0.10.0", - "ng-packagr": "2.2.0", + "ng-packagr": "2.4.2", "node-sass": "4.5.3", "null-loader": "0.1.1", "raw-loader": "0.5.1", diff --git a/lib/process-services/ng-package.json b/lib/process-services/ng-package.json index 720f94e4ce..34991acbb3 100644 --- a/lib/process-services/ng-package.json +++ b/lib/process-services/ng-package.json @@ -1,5 +1,6 @@ { "$schema": "./node_modules/ng-packagr/ng-package.schema.json", + "whitelistedNonPeerDependencies": [ "." ], "workingDirectory": "./ng_work", "src": "../process-services/", "dest": "../dist/process-services/",