ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update NGrid and fix build errors

Browse Source 
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
This commit is contained in:
Sean Engelhardt 2019-08-15 12:01:09 +02:00
parent ba5782a655
commit 1ecd5d663b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -146,7 +146,7 @@ matrix:
install: install:
- npm install - npm install
script: script:
- npm run ng-high-memory -- build --prod --aot - npm run build
- language: node_js - language: node_js
name: "Client: Production Build (ES2015)" name: "Client: Production Build (ES2015)"
@ -163,4 +163,4 @@ matrix:
install: install:
- npm install - npm install
script: script:
- npm run ng-high-memory -- build --prod --aot - npm run build

4
client/README.md
View File

@ -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-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/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 - [@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-material@1.0.0-alpha.27](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/ngrid@1.0.0-alpha.26](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 - [@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 - [@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 - [acorn@6.1.1](https://github.com/acornjs/acorn), License: MIT

12
client/package.json
View File

@ -12,7 +12,7 @@
"ng": "ng", "ng": "ng",
"ng-high-memory": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/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", "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", "test": "ng test",
"lint-check": "ng lint", "lint-check": "ng lint",
"lint-write": "ng lint --fix", "lint-write": "ng lint --fix",
@ -29,8 +29,8 @@
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^8.0.3", "@angular/animations": "^8.0.3",
"@angular/cdk": "^8.0.1", "@angular/cdk": "8.1.2",
"@angular/cdk-experimental": "^8.0.1", "@angular/cdk-experimental": "8.1.2",
"@angular/common": "^8.0.3", "@angular/common": "^8.0.3",
"@angular/compiler": "^8.0.3", "@angular/compiler": "^8.0.3",
"@angular/core": "^8.0.3", "@angular/core": "^8.0.3",
@ -44,9 +44,9 @@
"@ngx-pwa/local-storage": "^8.0.2", "@ngx-pwa/local-storage": "^8.0.2",
"@ngx-translate/core": "^11.0.1", "@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"@pebula/ngrid": "^1.0.0-alpha.26", "@pebula/ngrid": "1.0.0-alpha.27",
"@pebula/ngrid-material": "^1.0.0-alpha.26", "@pebula/ngrid-material": "1.0.0-alpha.27",
"@pebula/utils": "^1.0.0-alpha.3", "@pebula/utils": "1.0.0-alpha.3",
"@tinymce/tinymce-angular": "^3.2.0", "@tinymce/tinymce-angular": "^3.2.0",
"acorn": "^6.1.1", "acorn": "^6.1.1",
"core-js": "^3.0.1", "core-js": "^3.0.1",