I have confirmed the code also merges and works fine in rel_3_2. I added 3.2 as a target, since the Angular 7 update fixes some compile errors that have recently popped up:
ERROR in ../ngx-cookie/ngx-cookie.ts(10,23): Error during template compile of 'CookieBackendService'
Could not resolve @nguniversal/express-engine/tokens relative to /home/berick/code/Evergreen/Open-ILS/src/eg2/node_modules/ngx-cookie/ngx-cookie.d.ts..
node_modules/rxjs/internal/types.d.ts(81,44): error TS1005: ';' expected.
node_modules/rxjs/internal/types.d.ts(81,74): error TS1005: ';' expected.
node_modules/rxjs/internal/types.d.ts(81,77): error TS1109: Expression expected.
I have confirmed the code also merges and works fine in rel_3_2. I added 3.2 as a target, since the Angular 7 update fixes some compile errors that have recently popped up:
ERROR in ../ngx- cookie/ ngx-cookie. ts(10,23) : Error during template compile of 'CookieBackendS ervice' express- engine/ tokens relative to /home/berick/ code/Evergreen/ Open-ILS/ src/eg2/ node_modules/ ngx-cookie/ ngx-cookie. d.ts.. rxjs/internal/ types.d. ts(81,44) : error TS1005: ';' expected. rxjs/internal/ types.d. ts(81,74) : error TS1005: ';' expected. rxjs/internal/ types.d. ts(81,77) : error TS1109: Expression expected.
Could not resolve @nguniversal/
node_modules/
node_modules/
node_modules/