Commit e53e5e2b by Tuukka Kivilahti

Merge remote-tracking branch 'origin/master' into graphql-for-frontend

2 parents f1eee794 6ee7b5b9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"angular-cli": {}, "angular-cli": {},
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config=moyaproxy.conf.json --base-href=/", "start": "ng serve --proxy-config=moyaproxy.conf.json --base-href=/ && ng lint",
"build": "ng build", "build": "ng build",
"aot": "ng build --aot", "aot": "ng build --aot",
"test": "ng test", "test": "ng test",
......
...@@ -91,7 +91,7 @@ export class LocaleService { ...@@ -91,7 +91,7 @@ export class LocaleService {
} }
return this.selectLocale(DEFAULT_LOCALE); return this.selectLocale(DEFAULT_LOCALE);
}),); }), );
} }
......
...@@ -87,7 +87,7 @@ export class CacheService { ...@@ -87,7 +87,7 @@ export class CacheService {
const hotSource = source.pipe( const hotSource = source.pipe(
tap(val => this.cache.set(cacheName, new CachedItem(moduleName, cachePath, val))), tap(val => this.cache.set(cacheName, new CachedItem(moduleName, cachePath, val))),
publishLast(),refCount(),); publishLast(), refCount(), );
this.cache.set(cacheName, new CachedItem(moduleName, cachePath, hotSource, true)); this.cache.set(cacheName, new CachedItem(moduleName, cachePath, hotSource, true));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!