Merge pull request #2068 from tidusjar/feature/dynamic-webpack-base

Added the dynamic webpack base, this should allow us to remove the need for the rewrite
pull/2069/head
Jamie 7 years ago committed by GitHub
commit 58c8b8e01b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,4 +1,5 @@
import { Component, OnInit } from "@angular/core"; import { PlatformLocation } from "@angular/common";
import { Component, OnInit } from "@angular/core";
import { NavigationStart, Router } from "@angular/router"; import { NavigationStart, Router } from "@angular/router";
import { TranslateService } from "@ngx-translate/core"; import { TranslateService } from "@ngx-translate/core";
import { AuthService } from "./auth/auth.service"; import { AuthService } from "./auth/auth.service";
@ -32,7 +33,14 @@ export class AppComponent implements OnInit {
private readonly settingsService: SettingsService, private readonly settingsService: SettingsService,
private readonly jobService: JobService, private readonly jobService: JobService,
public readonly translate: TranslateService, public readonly translate: TranslateService,
private readonly identityService: IdentityService) { private readonly identityService: IdentityService,
private readonly platformLocation: PlatformLocation) {
const base = this.platformLocation.getBaseHrefFromDOM();
if (base.length > 1) {
__webpack_public_path__ = base + "/dist/";
}
this.translate.addLangs(["en", "de", "fr","da","es","it","nl","sv","no"]); this.translate.addLangs(["en", "de", "fr","da","es","it","nl","sv","no"]);
// this language will be used as a fallback when a translation isn't found in the current language // this language will be used as a fallback when a translation isn't found in the current language
this.translate.setDefaultLang("en"); this.translate.setDefaultLang("en");

@ -5,6 +5,8 @@ declare var require: any;
declare var localStorage: any; declare var localStorage: any;
declare var introJs: any; declare var introJs: any;
declare var __webpack_public_path__: any;
declare module "pace-progress"; declare module "pace-progress";
declare module "webpack-bundle-analyzer"; declare module "webpack-bundle-analyzer";
declare module "uglifyjs-webpack-plugin"; declare module "uglifyjs-webpack-plugin";
Loading…
Cancel
Save