From 1840c2f7c91f5f89602a3683d85b0a9df1454855 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 11 Jun 2017 15:19:43 +0200 Subject: Update webpack stack --- server/initializers/constants.ts | 2 +- server/initializers/database.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 6dcb4bb91..b476ef928 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -2,7 +2,7 @@ import * as config from 'config' import { join } from 'path' // Do not use barrels, remain constants as independent as possible -import { root, isTestInstance } from '../helpers/utils' +import { root, isTestInstance } from '../helpers/core-utils' // --------------------------------------------------------------------------- diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 78ca5ab84..0ab9e98db 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -5,7 +5,7 @@ import * as Sequelize from 'sequelize' import { CONFIG } from './constants' // Do not use barrel, we need to load database first import { logger } from '../helpers/logger' -import { isTestInstance } from '../helpers/utils' +import { isTestInstance } from '../helpers/core-utils' import { ApplicationModel, AuthorModel, @@ -80,9 +80,9 @@ database.init = function (silent: boolean, callback: (err: Error) => void) { files.filter(function (file) { // For all models but not utils.js if ( - file === 'index.js' || - file === 'utils.js' || - file.endsWith('-interface.js') || + file === 'index.js' || file === 'index.ts' || + file === 'utils.js' || file === 'utils.ts' || + file.endsWith('-interface.js') || file.endsWith('-interface.ts') || file.endsWith('.js.map') ) return false -- cgit v1.2.3