From 327de4d7145b0fc7cc7798301eb95449fb3aa66c Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 13 Oct 2018 23:29:54 -0400 Subject: [PATCH] update jslib --- jslib | 2 +- src/app/services/services.module.ts | 3 +-- tsconfig.json | 3 +++ webpack.main.js | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jslib b/jslib index 9fa99f3a..0d30a1a1 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 9fa99f3a6ecf7c4a14e5d7271562b3908cf64728 +Subproject commit 0d30a1a1c9bd2c323189069fe4ec233ab85c35fe diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index 95a854b5..7598be05 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -11,7 +11,6 @@ import { ElectronLogService } from 'jslib/electron/services/electronLog.service' import { ElectronPlatformUtilsService } from 'jslib/electron/services/electronPlatformUtils.service'; import { ElectronRendererMessagingService } from 'jslib/electron/services/electronRendererMessaging.service'; import { ElectronRendererSecureStorageService } from 'jslib/electron/services/electronRendererSecureStorage.service'; -import { isDev } from 'jslib/electron/utils'; import { AuthGuardService } from './auth-guard.service'; import { LaunchGuardService } from './launch-guard.service'; @@ -69,7 +68,7 @@ const apiService = new ApiService(tokenService, platformUtilsService, async (expired: boolean) => messagingService.send('logout', { expired: expired })); const environmentService = new EnvironmentService(apiService, storageService, null); const userService = new UserService(tokenService, storageService); -const containerService = new ContainerService(cryptoService, platformUtilsService); +const containerService = new ContainerService(cryptoService); const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, false); const configurationService = new ConfigurationService(storageService, secureStorageService); diff --git a/tsconfig.json b/tsconfig.json index c95cd8f9..2438d56c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,9 @@ "types": [], "baseUrl": ".", "paths": { + "tldjs": [ + "jslib/src/misc/tldjs.noop" + ], "jslib/*": [ "jslib/src/*" ], diff --git a/webpack.main.js b/webpack.main.js index 3453680e..ab1b1c37 100644 --- a/webpack.main.js +++ b/webpack.main.js @@ -24,6 +24,7 @@ const common = { extensions: ['.tsx', '.ts', '.js'], alias: { jslib: path.join(__dirname, 'jslib/src'), + tldjs: path.join(__dirname, 'jslib/src/misc/tldjs.noop'), }, }, output: {