From 1ecd5d663b1651916293650d2ff4b089bdfaf7d6 Mon Sep 17 00:00:00 2001 From: Sean Engelhardt Date: Thu, 15 Aug 2019 12:01:09 +0200 Subject: [PATCH] Update NGrid and fix build errors Set NGrid fix to alpha 26, since travis has issues with 27 Uses high memory to build, since a JavaScript heap out of memory exception will now be thrown --- .travis.yml | 4 ++-- client/README.md | 4 ++-- client/package.json | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 225421756..2408c1705 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,7 +146,7 @@ matrix: install: - npm install script: - - npm run ng-high-memory -- build --prod --aot + - npm run build - language: node_js name: "Client: Production Build (ES2015)" @@ -163,4 +163,4 @@ matrix: install: - npm install script: - - npm run ng-high-memory -- build --prod --aot + - npm run build diff --git a/client/README.md b/client/README.md index c355206f1..469cc867c 100644 --- a/client/README.md +++ b/client/README.md @@ -75,8 +75,8 @@ OpenSlides uses the following software or parts of them: - [@ngx-pwa/local-storage@8.0.2](https://github.com/cyrilletuzi/angular-async-local-storage), License: MIT - [@ngx-translate/core@11.0.1](https://github.com/ngx-translate/core), License: MIT - [@ngx-translate/http-loader@4.0.0](https://github.com/ngx-translate/http-loader), License: MIT -- [@pebula/ngrid-material@1.0.0-alpha.26](https://github.com/shlomiassaf/ngrid), License: MIT -- [@pebula/ngrid@1.0.0-alpha.26](https://github.com/shlomiassaf/ngrid), License: MIT +- [@pebula/ngrid-material@1.0.0-alpha.27](https://github.com/shlomiassaf/ngrid), License: MIT +- [@pebula/ngrid@1.0.0-alpha.27](https://github.com/shlomiassaf/ngrid), License: MIT - [@pebula/utils@1.0.0-alpha.3](https://github.com/shlomiassaf/ngrid), License: MIT - [@tinymce/tinymce-angular@3.2.0](https://github.com/tinymce/tinymce-angular), License: Apache-2.0 - [acorn@6.1.1](https://github.com/acornjs/acorn), License: MIT diff --git a/client/package.json b/client/package.json index 65ef9b540..8d68d79be 100644 --- a/client/package.json +++ b/client/package.json @@ -12,7 +12,7 @@ "ng": "ng", "ng-high-memory": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng", "start": "ng serve --proxy-config proxy.conf.json --host=0.0.0.0", - "build": "ng build --prod", + "build": "npm run ng-high-memory -- build --prod", "test": "ng test", "lint-check": "ng lint", "lint-write": "ng lint --fix", @@ -29,8 +29,8 @@ }, "dependencies": { "@angular/animations": "^8.0.3", - "@angular/cdk": "^8.0.1", - "@angular/cdk-experimental": "^8.0.1", + "@angular/cdk": "8.1.2", + "@angular/cdk-experimental": "8.1.2", "@angular/common": "^8.0.3", "@angular/compiler": "^8.0.3", "@angular/core": "^8.0.3", @@ -44,9 +44,9 @@ "@ngx-pwa/local-storage": "^8.0.2", "@ngx-translate/core": "^11.0.1", "@ngx-translate/http-loader": "^4.0.0", - "@pebula/ngrid": "^1.0.0-alpha.26", - "@pebula/ngrid-material": "^1.0.0-alpha.26", - "@pebula/utils": "^1.0.0-alpha.3", + "@pebula/ngrid": "1.0.0-alpha.27", + "@pebula/ngrid-material": "1.0.0-alpha.27", + "@pebula/utils": "1.0.0-alpha.3", "@tinymce/tinymce-angular": "^3.2.0", "acorn": "^6.1.1", "core-js": "^3.0.1",