Skip to content

Commit

Permalink
Add path resolver to get rid of relative imports
Browse files Browse the repository at this point in the history
  • Loading branch information
cvium committed Feb 24, 2019
1 parent f986f26 commit a99b272
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/apiclient.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import events from './events.js';
import events from 'events.js';

function redetectBitrate(instance) {
stopBitrateDetection(instance);
Expand Down
2 changes: 1 addition & 1 deletion src/apiclientex.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ApiClient from './apiclient';
import ApiClient from 'apiclient';

const localPrefix = 'local:';
const localViewPrefix = 'localview:';
Expand Down
2 changes: 1 addition & 1 deletion src/connectionmanager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import events from './events.js';
import events from 'events.js';

const defaultTimeout = 20000;

Expand Down
2 changes: 1 addition & 1 deletion src/credentials.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import events from './events.js';
import events from 'events.js';

function ensure(instance, data) {
if (!instance._credentials) {
Expand Down
8 changes: 4 additions & 4 deletions src/localassetmanager.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import filerepository from './sync/filerepository';
import itemrepository from './sync/itemrepository';
import useractionrepository from './sync/useractionrepository';
import transfermanager from './sync/transfermanager';
import filerepository from 'sync/filerepository';
import itemrepository from 'sync/itemrepository';
import useractionrepository from 'sync/useractionrepository';
import transfermanager from 'sync/transfermanager';

function getLocalItem(serverId, itemId) {

Expand Down
2 changes: 1 addition & 1 deletion src/sync/localsync.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MultiServerSync from './multiserversync.js';
import MultiServerSync from 'sync/multiserversync.js';

let isSyncing;

Expand Down
2 changes: 1 addition & 1 deletion src/sync/multiserversync.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ServerSync from './serversync';
import ServerSync from 'sync/serversync';

function syncNext(connectionManager, servers, index, options, resolve, reject) {
const length = servers.length;
Expand Down
4 changes: 2 additions & 2 deletions src/sync/serversync.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import MediaSync from './mediasync';
import localAssetManager from '../localassetmanager';
import MediaSync from 'sync/mediasync';
import localAssetManager from 'localassetmanager';

function performSync(connectionManager, server, options) {

Expand Down
24 changes: 15 additions & 9 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ const path = require('path');

module.exports = {
entry: {
apiclient: './src/apiclient.js',
apiclientex: './src/apiclientex.js',
'appstorage-localstorage': './src/appstorage-localstorage.js',
'appstorage-memory': './src/appstorage-memory.js',
connectionmanager: './src/connectionmanager.js',
credentials: './src/credentials.js',
events: './src/events.js',
localassetmanager: './src/localassetmanager.js',
serverdiscovery: './src/serverdiscovery.js'
apiclient: 'apiclient.js',
apiclientex: 'apiclientex.js',
'appstorage-localstorage': 'appstorage-localstorage.js',
'appstorage-memory': 'appstorage-memory.js',
connectionmanager: 'connectionmanager.js',
credentials: 'credentials.js',
events: 'events.js',
localassetmanager: 'localassetmanager.js',
serverdiscovery: 'serverdiscovery.js'
},
module: {
rules: [
Expand All @@ -24,6 +24,12 @@ module.exports = {
}
}
}
],
},
resolve: {
modules: [
path.resolve(__dirname, 'node_modules'),
path.resolve(__dirname, './src'),
]
},
output: {
Expand Down

0 comments on commit a99b272

Please sign in to comment.